diff options
314 files changed, 29447 insertions, 7519 deletions
@@ -1,29 +1,69 @@ +Alexander Holland <alexander.holland@live.de> +Alexander Holland <alexander.holland@live.de> <alexander.holland@haw-hamburg.de> +Alexander Holland <alexander.holland@live.de> <AlexHolly> Andrea Catania <info@andreacatania.com> Andreas Haas <liu.gam3@gmail.com> -Andreas Haas <Hinsbart@users.noreply.github.com> -Andreas Haas <entenflugstuhl@gmail.com> +Andreas Haas <liu.gam3@gmail.com> <hinsbart@gmail.com> +Andreas Haas <liu.gam3@gmail.com> <hinsbart@users.noreply.github.com> +Andreas Haas <liu.gam3@gmail.com> <entenflugstuhl@gmail.com> Ariel Manzur <ariel@godotengine.org> -Ariel Manzur <ariel@okamstudio.com> +Ariel Manzur <ariel@godotengine.org> <punto@godotengine.org> +Ariel Manzur <ariel@godotengine.org> <ariel@okamstudio.com> +Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini.local> +Ariel Manzur <ariel@godotengine.org> <punto@Ariels-Mac-mini-2.local> Bastiaan Olij <mux213@gmail.com> -Bernhard Liebl <poke1024@gmx.de> -Bernhard Liebl <poke1024@gmx.org> +Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.de> +Bernhard Liebl <Bernhard.Liebl@gmx.org> <poke1024@gmx.org> +Chris Bradfield <chris@kidscancode.org> <cb@scribe.net> +Clay John <claynjohn@gmail.com> +Clay John <claynjohn@gmail.com> <clayjohn@shaw.ca> +Dana Olson <dana@shineuponthee.com> <adolson@gmail.com> +Daniel J. Ramirez <djrmuv@gmail.com> +Ferenc Arn <tagcup@yahoo.com> +Ferenc Arn <tagcup@yahoo.com> <tagcup@users.noreply.github.com> Geequlim <geequlim@gmail.com> -Hugo Locurcio <hugo.locurcio@hugo.pro> +Gilles Roudiere <gilles.roudiere@gmail.com> +Gilles Roudiere <gilles.roudiere@gmail.com> <gilles.roudiere@laas.fr> +Guilherme Felipe <guilhermefelipecgs@gmail.com> Hugo Locurcio <hugo.locurcio@hugo.pro> <hugo.l@openmailbox.org> Hugo Locurcio <hugo.locurcio@hugo.pro> <Calinou@users.noreply.github.com> +Hugo Locurcio <hugo.locurcio@hugo.pro> Calinou <calinou@opmbx.org> +Ian Bishop <ianb96@gmail.com> Ignacio Etcheverry <ignalfonsore@gmail.com> +Ignacio Etcheverry <ignalfonsore@gmail.com> <neikeq@users.noreply.github.com> Indah Sylvia <ISylvox@yahoo.com> +J08nY <johny@neuromancer.sk> <jancar.jj@gmail.com> +J08nY <johny@neuromancer.sk> <J08nY@users.noreply.github.com> Jakub Grzesik <kubecz3k@gmail.com> +Jérôme Gully <jerome.gully0@gmail.com> Juan Linietsky <reduzio@gmail.com> -Juan Linietsky <juan@okamstudio.com> -Juan Linietsky <reduz@Juans-MBP.fibertel.com.ar> +Juan Linietsky <reduzio@gmail.com> <juan@godotengine.org> +Juan Linietsky <reduzio@gmail.com> <juan@okamstudio.com> +Juan Linietsky <reduzio@gmail.com> <reduz@Juans-MBP.fibertel.com.ar> +Juan Linietsky <reduzio@gmail.com> <red@kyoko> Julian Murgia <the.straton@gmail.com> -Leon Krause <eska@eska.me> -Leon Krause <eska@eska.me> <eska014@users.noreply.github.com> +Kelly Thomas <kelly.thomas@hotmail.com.au> +Leon Krause <lk@leonkrause.com> <eska@eska.me> +Leon Krause <lk@leonkrause.com> <eska014@users.noreply.github.com> Marcelo Fernandez <marcelofg55@gmail.com> +Marcin Zawiejski <dragmz@gmail.com> Mariano Javier Suligoy <marianognu.easyrpg@gmail.com> +Mario Schlack <m4r10.5ch14ck@gmail.com> +Max Hilbrunner <m.hilbrunner@gmail.com> +Max Hilbrunner <m.hilbrunner@gmail.com> <mhilbrunner@users.noreply.github.com> +Nathan Warden <nathan@nathanwarden.com> <nathanwardenlee@icloud.com> +Nuno Donato <nunodonato@gmail.com> <n.donato@estrelasustentavel.pt> +Pedro J. Estébanez <pedrojrulez@gmail.com> <RandomShaper@users.noreply.github.com> Paul Batty <p_batty@hotmail.co.uk> +Paul Batty <p_batty@hotmail.co.uk> <Paulb23@users.noreply.github.com> +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> +Rémi Verschelde <rverschelde@gmail.com> <remi@verschelde.fr> +Ruslan Mustakov <r.mustakov@gmail.com> <ruslan.mustakov@xored.com> Saracen <SaracenOne@gmail.com> +Theo Hallenius <redsymbzone@hotmail.com> Thomas Herzog <therzog@mail.de> +Thomas Herzog <therzog@mail.de> <thomas.herzog@mail.com> +Thomas Herzog <therzog@mail.de> <thomas.herzog@simedis.com> Zher Huei Lee <lee.zh.92@gmail.com> diff --git a/AUTHORS.md b/AUTHORS.md index 7859a3cd37..b7eca2d9b1 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -25,16 +25,16 @@ name is available. ## Developers -(in alphabetical order, with 10 commits or more excluding merges) +(in alphabetical order, with over 10 commits excluding merges) Aaron Franke (aaronfranke) Alexander Holland (AlexHolly) - Alexey Velikiy (jonyrock) Alket Rexhepi (alketii) Andrea Catania (AndreaCatania) Andreas Haas (Hinsbart) Andrii Doroshenko (Xrayez) Andy Moss (MillionOstrich) + Anish Bhobe (KidRigger) Anton Yabchinskiy (a12n) Aren Villanueva (kurikaesu) Ariel Manzur (punto-) @@ -46,6 +46,7 @@ name is available. Bojidar Marinov (bojidar-bg) bruvzg Carl Olsson (not-surt) + Carter Anderson (cart) Chris Bradfield (cbscribe) Clay John (clayjohn) Dana Olson (adolson) @@ -61,13 +62,13 @@ name is available. Ferenc Arn (tagcup) Franklin Sobrinho (TheHX) Geequlim - Gen (dbsGen) George Marques (vnen) Gerrit Großkopf (Grosskopf) Gilles Roudiere (groud) Guilherme Felipe de C. G. da Silva (guilhermefelipecgs) Hein-Pieter van Braam (hpvb) Hiroshi Ogawa (hi-ogawa) + homer666 Hubert Jarosz (Marqin) Hugo Locurcio (Calinou) Ian Bishop (ianb96) @@ -76,7 +77,7 @@ name is available. Indah Sylvia (ISylvox) J08nY Jakub Grzesik (kubecz3k) - Jérôme GULLY (Nutriz) + Jérôme Gully (Nutriz) Joan Fons Sanchez (JFonS) Johan Manuel (29jm) Joshua Grams (JoshuaGrams) @@ -94,6 +95,7 @@ name is available. Mariano Javier Suligoy (MarianoGnu) Mario Schlack (hurikhan) Martin Capitanio (capnm) + Martin LiÅ¡ka (marxin) Martin Sjursen (binbitten) marynate Masoud BH (masoudbh3) @@ -124,6 +126,7 @@ name is available. Saniko (sanikoyes) SaracenOne sersoong + Simon Wenner (swenner) Theo Hallenius (TheoXD) Thomas Herzog (karroffel) Timo (toger5) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index be03fb44c5..8b263a2d2c 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -44,7 +44,7 @@ Source: https://github.com/godotengine/godot Files: * Comment: Godot Engine Copyright: 2007-2019, Juan Linietsky, Ariel Manzur. - 2014-2019, Godot Engine contributors. + 2014-2019, Godot Engine contributors. License: Expat Files: ./icon.png @@ -77,8 +77,8 @@ Files: ./platform/android/power_android.cpp ./platform/x11/power_x11.cpp Comment: Simple DirectMedia Layer Copyright: 1997-2017, Sam Lantinga - 2007-2019, Juan Linietsky, Ariel Manzur. - 2014-2019, Godot Engine contributors. + 2007-2019, Juan Linietsky, Ariel Manzur. + 2014-2019, Godot Engine contributors. License: Expat and Zlib Files: ./scene/animation/tween_interpolaters.cpp @@ -98,27 +98,27 @@ Files: ./servers/physics/gjk_epa.cpp ./servers/physics/joints/slider_joint_sw.h Comment: Bullet Continuous Collision Detection and Physics Library Copyright: 2003-2008, Erwin Coumans - 2007-2019, Juan Linietsky, Ariel Manzur. - 2014-2019, Godot Engine contributors. + 2007-2019, Juan Linietsky, Ariel Manzur. + 2014-2019, Godot Engine contributors. License: Expat and Zlib Files: ./servers/physics/joints/cone_twist_joint_sw.cpp ./servers/physics/joints/cone_twist_joint_sw.h Comment: Bullet Continuous Collision Detection and Physics Library Copyright: 2007, Starbreeze Studios - 2007-2019, Juan Linietsky, Ariel Manzur. - 2014-2019, Godot Engine contributors. + 2007-2019, Juan Linietsky, Ariel Manzur. + 2014-2019, Godot Engine contributors. License: Expat and Zlib Files: ./thirdparty/b2d_convexdecomp/ Comment: Box2D (ConvexDecomp) Copyright: 2007, Eric Jordan - 2006-2009, Erin Catto + 2006-2009, Erin Catto License: Zlib Files: ./thirdparty/bullet/ Comment: Bullet Continuous Collision Detection and Physics Library -Copyright: 2003-2008, Erwin Coumans +Copyright: 2003-2013, Erwin Coumans License: Zlib Files: ./thirdparty/certs/ca-certificates.crt @@ -129,7 +129,7 @@ License: MPL-2.0 Files: ./thirdparty/cvtt/ Comment: Convection Texture Tools Stand-Alone Kernels Copyright: 2018, Eric Lasota - 2018, Microsoft Corp. + 2018, Microsoft Corp. License: Expat Files: ./thirdparty/enet/ @@ -160,12 +160,12 @@ License: Expat and Bitstream Vera Fonts Copyright Files: ./thirdparty/freetype/ Comment: The FreeType Project -Copyright: 1996-2017, David Turner, Robert Wilhelm, and Werner Lemberg. +Copyright: 1996-2018, David Turner, Robert Wilhelm, and Werner Lemberg. License: FTL Files: ./thirdparty/glad/ Comment: glad -Copyright: 2013, David Herberth +Copyright: 2013-2018, David Herberth License: Expat Files: ./thirdparty/jpeg_compressor/ @@ -180,9 +180,11 @@ License: BSD-3-clause Files: ./thirdparty/libpng/ Comment: libpng -Copyright: 1995-1996, Guy Eric Schalnat, Group 42, Inc. - 1996-1997, Andreas Dilger - 1998-2018, Glenn Randers-Pehrson +Copyright: 1995-2018, The PNG Reference Library Authors. + 2018, Cosmin Truta. + 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + 1996-1997, Andreas Dilger. + 1995-1996, Guy Eric Schalnat, Group 42, Inc. License: Zlib Files: ./thirdparty/libsimplewebm/ @@ -223,24 +225,24 @@ License: BSD-3-clause Files: ./thirdparty/libwebsockets/ Comment: libwebsockets -Copyright: 2010-2017, Andy Green +Copyright: 2010-2018, Andy Green License: LGPL-2.1+SLE (libwebsockets) Files: ./thirdparty/mbedtls/ Comment: Mbed TLS -Copyright: 2006-2015, ARM Limited +Copyright: 2006-2018, Arm Limited (or its affiliates) License: Apache-2.0 Files: ./thirdparty/miniupnpc/ Comment: MiniUPnPc -Copyright: 2005-2016, Thomas Bernard +Copyright: 2005-2018, Thomas Bernard License: BSD-3-clause Files: ./thirdparty/minizip/ Comment: MiniZip Copyright: 1998-2010, Gilles Vollant - 2007-2008, Even Rouault - 2009-2010, Mathias Svensson + 2007-2008, Even Rouault + 2009-2010, Mathias Svensson License: Zlib Files: ./thirdparty/misc/aes256.cpp @@ -348,8 +350,8 @@ License: BSD-3-clause Files: ./thirdparty/pcre2/ Comment: PCRE2 -Copyright: 1997-2017, University of Cambridge, - 2009-2017, Zoltan Herczeg +Copyright: 1997-2018, University of Cambridge, + 2009-2018, Zoltan Herczeg License: BSD-3-clause Files: ./thirdparty/pvrtccompressor/ @@ -385,7 +387,7 @@ License: Zlib Files: ./thirdparty/zstd/ Comment: Zstandard -Copyright: 2016-2018, Facebook, Inc. +Copyright: 2016-2019, Facebook, Inc. License: BSD-3-clause @@ -18,10 +18,12 @@ generous deed immortalized in the next stable release of Godot Engine. Gamblify <https://www.gamblify.com> Image Campus <https://www.imagecampus.edu.ar> + Yakaz.com <https://yakaz.com> ## Mini sponsors Alan Beauchamp + Anandarup Mallik Andrew Dunai Arda Erol Brandon Lamb @@ -36,7 +38,6 @@ generous deed immortalized in the next stable release of Godot Engine. Jay Sistar Justin Arnold Kyle Szklenski - Leona Eden Leonard Meagher Ludosity AB Matthieu Huvé @@ -45,7 +46,6 @@ generous deed immortalized in the next stable release of Godot Engine. Nathan Warden Neal Gompa (Conan Kudo) Patrick Aarstad - Pers "Rainway " Ruslan Mustakov Slobodan Milnovic @@ -54,6 +54,7 @@ generous deed immortalized in the next stable release of Godot Engine. Stoney Meyerhoeffer thechris VilliHaukka + Zashi ## Gold donors @@ -61,17 +62,15 @@ generous deed immortalized in the next stable release of Godot Engine. Brandon Waite cheese65536 David Gehrig - Edward E Florian Krick + Jakub Grzesik K9Kraken Manuele Finocchiaro Nathanael Beisiegel Officine Pixel S.n.c. Retro Village - Zashi Zaven Muradyan - 13MHz Allen Schade Andreas Schüle Asher Glick @@ -79,6 +78,7 @@ generous deed immortalized in the next stable release of Godot Engine. Daniel James Daniel Lynn David Giardi + Edward E Florian Breisch Gary Oberbrunner Gero @@ -113,10 +113,9 @@ generous deed immortalized in the next stable release of Godot Engine. Dean Harmon Ivan Trombley Joan Fons - John Krzysztof Jankowski + Lord Bloodhound Lucas Ferreira Franca - Markus Wiesner Nathan Lundquist Pascal Grüter Petr Malac @@ -128,10 +127,10 @@ generous deed immortalized in the next stable release of Godot Engine. Thomas Bjarnelöf Wojciech Chojnacki Xavier PATRICELLI - Zaq Poi Alessandra Pereyra Alexey Dyadchenko + Andrew Bowen Benjamin W Flint Chau Siu Hung Chris Goddard @@ -159,10 +158,12 @@ generous deed immortalized in the next stable release of Godot Engine. Jose Malheiro Juan T Chen Juraj Móza + Kasper Jeppesen Klavdij Voncina Leandro Voltolino Lukáš Rendvanský Marius Kamm + Markus Wiesner Martin Eigel Marvin Matt Eunson @@ -170,6 +171,8 @@ generous deed immortalized in the next stable release of Godot Engine. Nick Nikitin Oliver Dick oziatek + Paul Hocker + Paul Von Zimmerman Pete Goodwin Ranoller ray-tracer @@ -199,16 +202,17 @@ generous deed immortalized in the next stable release of Godot Engine. Anthony Bongiovanni Arbor Interactive Arthur S. Muszynski - Artur Barichello Aubrey Falconer Avencherus Bailey + Balázs Batári Bastian Böhm Benedikt Ben Vercammen Bernd Jänichen Blair Allen Brandon + Brandon Schaffer Bryan Stevenson Carl Winder Carwyn Edwards @@ -226,7 +230,7 @@ generous deed immortalized in the next stable release of Godot Engine. David Cravens David May Dominik Wetzel - DOXA + Duobix Edward Herbert Egon Elbre Elmeri '- Duy Kevin Nguyen @@ -238,13 +242,13 @@ generous deed immortalized in the next stable release of Godot Engine. fengjiongmax Foomf G3Dev sà rl - George Lesica Gerrit Großkopf Grant Clarke Greg Olson Guldoman Haley Aycock Heribert Hirth + Hiroshi Naruo Hunter Jones ialex32x Igor Buzatovic @@ -254,13 +258,11 @@ generous deed immortalized in the next stable release of Godot Engine. Jeff Hungerford Jeremy Kahn Jesse Dubay - Joao Senerchia Joel Fivat Johannes Wuensch Jonas Rudlang Jonas Yamazaki Jonathan G - Jonathan Martin Jonathan Nieto Jonathon Jon Bonazza @@ -270,6 +272,7 @@ generous deed immortalized in the next stable release of Godot Engine. Juan Negrier Judd Julian Murgia + Kajornthep Piyanun KC Chan Kevin Boyer Kiyohiro Kawamura (kyorohiro) @@ -278,6 +281,7 @@ generous deed immortalized in the next stable release of Godot Engine. KsyTek Games Kuan Cheang kycho + Levi Lindsey Linus Lind Lundgren Luis Moraes Macil @@ -288,21 +292,26 @@ generous deed immortalized in the next stable release of Godot Engine. Matthias Grandis Matt Welke Maxwell + medecau Mertcan Mermerkaya + mhilbrunner Michael Dürwald Michael Gringauz Michael Labbe Mikael Olsson + Mikayla Hutchinson MoM Moritz Laass Moritz Weissenberger Natrim nee Neil Blakey-Milner + Nerdforge Nick Pavlica Niclas Eriksen Nicolás Montaña Nicolas SAN AGUSTIN + Oscar Norlander Pan Ip Patrick Nafarrete Paul Gieske @@ -331,7 +340,6 @@ generous deed immortalized in the next stable release of Godot Engine. Simon Wenner Sootstone Theo Cranmore - Théo Hay Thibault Barbaroux Thomas Bell Thomas Holmes diff --git a/core/error_macros.h b/core/error_macros.h index 3aa8ed4596..ca5ccd24cf 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -310,6 +310,16 @@ extern bool _err_error_exists; _err_error_exists = false; \ } +#define ERR_PRINT_ONCE(m_string) \ + { \ + static bool first_print = true; \ + if (first_print) { \ + _err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_string); \ + _err_error_exists = false; \ + first_print = false; \ + } \ + } + /** Print a warning string. */ @@ -325,6 +335,16 @@ extern bool _err_error_exists; _err_error_exists = false; \ } +#define WARN_PRINT_ONCE(m_string) \ + { \ + static bool first_print = true; \ + if (first_print) { \ + _err_print_error(FUNCTION_STR, __FILE__, __LINE__, m_string, ERR_HANDLER_WARNING); \ + _err_error_exists = false; \ + first_print = false; \ + } \ + } + #define WARN_DEPRECATED \ { \ static volatile bool warning_shown = false; \ diff --git a/core/io/resource_importer.cpp b/core/io/resource_importer.cpp index 69907a710a..b5fa412576 100644 --- a/core/io/resource_importer.cpp +++ b/core/io/resource_importer.cpp @@ -183,6 +183,11 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_ } } +bool ResourceFormatImporter::exists(const String &p_path) const { + + return FileAccess::exists(p_path + ".import"); +} + bool ResourceFormatImporter::recognize_path(const String &p_path, const String &p_for_type) const { return FileAccess::exists(p_path + ".import"); diff --git a/core/io/resource_importer.h b/core/io/resource_importer.h index 1d27d4dec3..1c146c33d7 100644 --- a/core/io/resource_importer.h +++ b/core/io/resource_importer.h @@ -68,6 +68,8 @@ public: virtual Variant get_resource_metadata(const String &p_path) const; virtual bool is_import_valid(const String &p_path) const; virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false); + virtual bool is_imported(const String &p_path) const { return recognize_path(p_path); } + virtual bool exists(const String &p_path) const; virtual bool can_be_imported(const String &p_path) const; virtual int get_import_order(const String &p_path) const; diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 98309048bb..c917b9ba28 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -633,6 +633,31 @@ bool ResourceLoader::is_import_valid(const String &p_path) { return false; //not found } +bool ResourceLoader::is_imported(const String &p_path) { + + String path = _path_remap(p_path); + + String local_path; + if (path.is_rel_path()) + local_path = "res://" + path; + else + local_path = ProjectSettings::get_singleton()->localize_path(path); + + for (int i = 0; i < loader_count; i++) { + + if (!loader[i]->recognize_path(local_path)) + continue; + /* + if (p_type_hint!="" && !loader[i]->handles_type(p_type_hint)) + continue; + */ + + return loader[i]->is_imported(p_path); + } + + return false; //not found +} + void ResourceLoader::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) { String path = _path_remap(p_path); diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index 70eb1a3de0..ca7610a0d2 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -79,6 +79,7 @@ public: virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false); virtual Error rename_dependencies(const String &p_path, const Map<String, String> &p_map); virtual bool is_import_valid(const String &p_path) const { return true; } + virtual bool is_imported(const String &p_path) const { return false; } virtual int get_import_order(const String &p_path) const { return 0; } virtual ~ResourceFormatLoader() {} @@ -154,6 +155,7 @@ public: static void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false); static Error rename_dependencies(const String &p_path, const Map<String, String> &p_map); static bool is_import_valid(const String &p_path); + static bool is_imported(const String &p_path); static int get_import_order(const String &p_path); static void set_timestamp_on_load(bool p_timestamp) { timestamp_on_load = p_timestamp; } diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index 12c88f43b3..194a6f6352 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -31,6 +31,7 @@ #include "geometry.h" #include "core/print_string.h" +#include "thirdparty/misc/triangulator.h" /* this implementation is very inefficient, commenting unless bugs happen. See the other one. bool Geometry::is_point_in_polygon(const Vector2 &p_point, const Vector<Vector2> &p_polygon) { @@ -737,6 +738,40 @@ PoolVector<Face3> Geometry::wrap_geometry(PoolVector<Face3> p_array, real_t *p_e return wrapped_faces; } +Vector<Vector<Vector2> > Geometry::decompose_polygon_in_convex(Vector<Point2> polygon) { + Vector<Vector<Vector2> > decomp; + List<TriangulatorPoly> in_poly, out_poly; + + TriangulatorPoly inp; + inp.Init(polygon.size()); + for (int i = 0; i < polygon.size(); i++) { + inp.GetPoint(i) = polygon[i]; + } + inp.SetOrientation(TRIANGULATOR_CCW); + in_poly.push_back(inp); + TriangulatorPartition tpart; + if (tpart.ConvexPartition_HM(&in_poly, &out_poly) == 0) { //failed! + ERR_PRINT("Convex decomposing failed!"); + return decomp; + } + + decomp.resize(out_poly.size()); + int idx = 0; + for (List<TriangulatorPoly>::Element *I = out_poly.front(); I; I = I->next()) { + TriangulatorPoly &tp = I->get(); + + decomp.write[idx].resize(tp.GetNumPoints()); + + for (int i = 0; i < tp.GetNumPoints(); i++) { + decomp.write[idx].write[i] = tp.GetPoint(i); + } + + idx++; + } + + return decomp; +} + Geometry::MeshData Geometry::build_convex_mesh(const PoolVector<Plane> &p_planes) { MeshData mesh; diff --git a/core/math/geometry.h b/core/math/geometry.h index f927a63ed5..4b478b6b16 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -950,6 +950,8 @@ public: return H; } + static Vector<Vector<Vector2> > decompose_polygon_in_convex(Vector<Point2> polygon); + static MeshData build_convex_mesh(const PoolVector<Plane> &p_planes); static PoolVector<Plane> build_sphere_planes(real_t p_radius, int p_lats, int p_lons, Vector3::Axis p_axis = Vector3::AXIS_Z); static PoolVector<Plane> build_box_planes(const Vector3 &p_extents); diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp index bc2b4e6fe0..fc2eb1454d 100644 --- a/core/math/quick_hull.cpp +++ b/core/math/quick_hull.cpp @@ -36,8 +36,6 @@ uint32_t QuickHull::debug_stop_after = 0xFFFFFFFF; Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_mesh) { - static const real_t over_tolerance = 0.0001; - /* CREATE AABB VOLUME */ AABB aabb; @@ -180,6 +178,8 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me faces.push_back(f); } + real_t over_tolerance = 3 * UNIT_EPSILON * (aabb.size.x + aabb.size.y + aabb.size.z); + /* COMPUTE AVAILABLE VERTICES */ for (int i = 0; i < p_points.size(); i++) { diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h index 2e659cab6e..a445a47cbe 100644 --- a/core/math/quick_hull.h +++ b/core/math/quick_hull.h @@ -64,7 +64,7 @@ public: struct Face { Plane plane; - int vertices[3]; + uint32_t vertices[3]; Vector<int> points_over; bool operator<(const Face &p_face) const { diff --git a/core/object.cpp b/core/object.cpp index c46ecc5193..8b693f039c 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -832,23 +832,22 @@ void Object::setvar(const Variant &p_key, const Variant &p_value, bool *r_valid) } Variant Object::callv(const StringName &p_method, const Array &p_args) { + const Variant **argptrs = NULL; - if (p_args.size() == 0) { - return call(p_method); - } - - Vector<Variant> args; - args.resize(p_args.size()); - Vector<const Variant *> argptrs; - argptrs.resize(p_args.size()); - - for (int i = 0; i < p_args.size(); i++) { - args.write[i] = p_args[i]; - argptrs.write[i] = &args[i]; + if (p_args.size() > 0) { + argptrs = (const Variant **)alloca(sizeof(Variant *) * p_args.size()); + for (int i = 0; i < p_args.size(); i++) { + argptrs[i] = &p_args[i]; + } } Variant::CallError ce; - return call(p_method, (const Variant **)argptrs.ptr(), p_args.size(), ce); + Variant ret = call(p_method, argptrs, p_args.size(), ce); + if (ce.error != Variant::CallError::CALL_OK) { + ERR_EXPLAIN("Error calling method from 'callv': " + Variant::get_call_error_text(this, p_method, argptrs, p_args.size(), ce)); + ERR_FAIL_V(Variant()); + } + return ret; } Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) { diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index d1f8236898..39d9f45bd7 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -409,6 +409,23 @@ int FileAccess::get_buffer(uint8_t *p_dst, int p_length) const { return i; } +String FileAccess::get_as_utf8_string() const { + PoolVector<uint8_t> sourcef; + int len = get_len(); + sourcef.resize(len + 1); + + PoolVector<uint8_t>::Write w = sourcef.write(); + int r = get_buffer(w.ptr(), len); + ERR_FAIL_COND_V(r != len, String()); + w[len] = 0; + + String s; + if (s.parse_utf8((const char *)w.ptr())) { + return String(); + } + return s; +} + void FileAccess::store_16(uint16_t p_dest) { uint8_t a, b; diff --git a/core/os/file_access.h b/core/os/file_access.h index 7bfbf6e7f0..c65b75369c 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -113,6 +113,7 @@ public: virtual String get_line() const; virtual String get_token() const; virtual Vector<String> get_csv_line(const String &p_delim = ",") const; + virtual String get_as_utf8_string() const; /**< use this for files WRITTEN in _big_ endian machines (ie, amiga/mac) * It's not about the current CPU type but file formats. diff --git a/core/os/input.cpp b/core/os/input.cpp index cf11ba3c6d..caa9fb1493 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -91,6 +91,7 @@ void Input::_bind_methods() { ClassDB::bind_method(D_METHOD("set_default_cursor_shape", "shape"), &Input::set_default_cursor_shape, DEFVAL(CURSOR_ARROW)); ClassDB::bind_method(D_METHOD("set_custom_mouse_cursor", "image", "shape", "hotspot"), &Input::set_custom_mouse_cursor, DEFVAL(CURSOR_ARROW), DEFVAL(Vector2())); ClassDB::bind_method(D_METHOD("parse_input_event", "event"), &Input::parse_input_event); + ClassDB::bind_method(D_METHOD("set_use_accumulated_input", "enable"), &Input::set_use_accumulated_input); BIND_ENUM_CONSTANT(MOUSE_MODE_VISIBLE); BIND_ENUM_CONSTANT(MOUSE_MODE_HIDDEN); diff --git a/core/os/input.h b/core/os/input.h index b354acd961..c8b80b28d0 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -132,6 +132,9 @@ public: virtual int get_joy_axis_index_from_string(String p_axis) = 0; virtual void parse_input_event(const Ref<InputEvent> &p_event) = 0; + virtual void accumulate_input_event(const Ref<InputEvent> &p_event) = 0; + virtual void flush_accumulated_events() = 0; + virtual void set_use_accumulated_input(bool p_enable) = 0; Input(); }; diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 24ec8a1963..40308f4f7d 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -122,6 +122,8 @@ void InputEvent::_bind_methods() { ClassDB::bind_method(D_METHOD("is_action_type"), &InputEvent::is_action_type); + ClassDB::bind_method(D_METHOD("accumulate", "with_event"), &InputEvent::accumulate); + ClassDB::bind_method(D_METHOD("xformed_by", "xform", "local_ofs"), &InputEvent::xformed_by, DEFVAL(Vector2())); ADD_PROPERTY(PropertyInfo(Variant::INT, "device"), "set_device", "get_device"); @@ -620,6 +622,44 @@ String InputEventMouseMotion::as_text() const { return "InputEventMouseMotion : button_mask=" + button_mask_string + ", position=(" + String(get_position()) + "), relative=(" + String(get_relative()) + "), speed=(" + String(get_speed()) + ")"; } +bool InputEventMouseMotion::accumulate(const Ref<InputEvent> &p_event) { + + Ref<InputEventMouseMotion> motion = p_event; + if (motion.is_null()) + return false; + + if (is_pressed() != motion->is_pressed()) { + return false; + } + + if (get_button_mask() != motion->get_button_mask()) { + return false; + } + + if (get_shift() != motion->get_shift()) { + return false; + } + + if (get_control() != motion->get_control()) { + return false; + } + + if (get_alt() != motion->get_alt()) { + return false; + } + + if (get_metakey() != motion->get_metakey()) { + return false; + } + + set_position(motion->get_position()); + set_global_position(motion->get_global_position()); + set_speed(motion->get_speed()); + relative += motion->get_relative(); + + return true; +} + void InputEventMouseMotion::_bind_methods() { ClassDB::bind_method(D_METHOD("set_relative", "relative"), &InputEventMouseMotion::set_relative); diff --git a/core/os/input_event.h b/core/os/input_event.h index a6a7012298..47f9293a7f 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -186,6 +186,7 @@ public: virtual bool shortcut_match(const Ref<InputEvent> &p_event) const; virtual bool is_action_type() const; + virtual bool accumulate(const Ref<InputEvent> &p_event) { return false; } InputEvent(); }; @@ -351,6 +352,8 @@ public: virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const; virtual String as_text() const; + virtual bool accumulate(const Ref<InputEvent> &p_event); + InputEventMouseMotion(); }; diff --git a/core/os/os.h b/core/os/os.h index d6541034fd..ebfe7d20dc 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -518,6 +518,7 @@ public: bool is_restart_on_exit_set() const; List<String> get_restart_on_exit_arguments() const; + virtual void process_and_drop_events() {} OS(); virtual ~OS(); }; diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index 3ed25f118d..e7ff7a3aef 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -311,6 +311,7 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script, bool p_can_continue) } else { OS::get_singleton()->delay_usec(10000); + OS::get_singleton()->process_and_drop_events(); } } diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 00894b41d8..9a10e0585d 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -239,6 +239,10 @@ void UndoRedo::_pop_history_tail() { } } +bool UndoRedo::is_commiting_action() const { + return commiting > 0; +} + void UndoRedo::commit_action() { ERR_FAIL_COND(action_level <= 0); @@ -321,10 +325,13 @@ bool UndoRedo::redo() { if ((current_action + 1) >= actions.size()) return false; //nothing to redo + + commiting++; current_action++; _process_operation_list(actions.write[current_action].do_ops.front()); version++; + commiting--; return true; } @@ -334,10 +341,11 @@ bool UndoRedo::undo() { ERR_FAIL_COND_V(action_level > 0, false); if (current_action < 0) return false; //nothing to redo + commiting++; _process_operation_list(actions.write[current_action].undo_ops.front()); current_action--; version--; - + commiting--; return true; } @@ -386,6 +394,7 @@ void UndoRedo::set_property_notify_callback(PropertyNotifyCallback p_property_ca UndoRedo::UndoRedo() { + commiting = 0; version = 1; action_level = 0; current_action = -1; @@ -484,6 +493,7 @@ void UndoRedo::_bind_methods() { ClassDB::bind_method(D_METHOD("create_action", "name", "merge_mode"), &UndoRedo::create_action, DEFVAL(MERGE_DISABLE)); ClassDB::bind_method(D_METHOD("commit_action"), &UndoRedo::commit_action); + ClassDB::bind_method(D_METHOD("is_commiting_action"), &UndoRedo::is_commiting_action); //ClassDB::bind_method(D_METHOD("add_do_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_do_method); //ClassDB::bind_method(D_METHOD("add_undo_method","p_object", "p_method", "VARIANT_ARG_LIST"),&UndoRedo::add_undo_method); diff --git a/core/undo_redo.h b/core/undo_redo.h index 4ee64dbfcf..b626149ce6 100644 --- a/core/undo_redo.h +++ b/core/undo_redo.h @@ -94,6 +94,8 @@ private: MethodNotifyCallback method_callback; PropertyNotifyCallback property_callback; + int commiting; + protected: static void _bind_methods(); @@ -107,6 +109,7 @@ public: void add_do_reference(Object *p_object); void add_undo_reference(Object *p_object); + bool is_commiting_action() const; void commit_action(); bool redo(); diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 26851e4c23..b40b6ce4a6 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -3656,11 +3656,55 @@ void Variant::interpolate(const Variant &a, const Variant &b, float c, Variant & } return; case POOL_INT_ARRAY: { - r_dst = a; + const PoolVector<int> *arr_a = reinterpret_cast<const PoolVector<int> *>(a._data._mem); + const PoolVector<int> *arr_b = reinterpret_cast<const PoolVector<int> *>(b._data._mem); + int sz = arr_a->size(); + if (sz == 0 || arr_b->size() != sz) { + + r_dst = a; + } else { + + PoolVector<int> v; + v.resize(sz); + { + PoolVector<int>::Write vw = v.write(); + PoolVector<int>::Read ar = arr_a->read(); + PoolVector<int>::Read br = arr_b->read(); + + Variant va; + for (int i = 0; i < sz; i++) { + Variant::interpolate(ar[i], br[i], c, va); + vw[i] = va; + } + } + r_dst = v; + } } return; case POOL_REAL_ARRAY: { - r_dst = a; + const PoolVector<real_t> *arr_a = reinterpret_cast<const PoolVector<real_t> *>(a._data._mem); + const PoolVector<real_t> *arr_b = reinterpret_cast<const PoolVector<real_t> *>(b._data._mem); + int sz = arr_a->size(); + if (sz == 0 || arr_b->size() != sz) { + + r_dst = a; + } else { + + PoolVector<real_t> v; + v.resize(sz); + { + PoolVector<real_t>::Write vw = v.write(); + PoolVector<real_t>::Read ar = arr_a->read(); + PoolVector<real_t>::Read br = arr_b->read(); + + Variant va; + for (int i = 0; i < sz; i++) { + Variant::interpolate(ar[i], br[i], c, va); + vw[i] = va; + } + } + r_dst = v; + } } return; case POOL_STRING_ARRAY: { @@ -3717,7 +3761,27 @@ void Variant::interpolate(const Variant &a, const Variant &b, float c, Variant & } return; case POOL_COLOR_ARRAY: { - r_dst = a; + const PoolVector<Color> *arr_a = reinterpret_cast<const PoolVector<Color> *>(a._data._mem); + const PoolVector<Color> *arr_b = reinterpret_cast<const PoolVector<Color> *>(b._data._mem); + int sz = arr_a->size(); + if (sz == 0 || arr_b->size() != sz) { + + r_dst = a; + } else { + + PoolVector<Color> v; + v.resize(sz); + { + PoolVector<Color>::Write vw = v.write(); + PoolVector<Color>::Read ar = arr_a->read(); + PoolVector<Color>::Read br = arr_b->read(); + + for (int i = 0; i < sz; i++) { + vw[i] = ar[i].linear_interpolate(br[i], c); + } + } + r_dst = v; + } } return; default: { diff --git a/doc/classes/Font.xml b/doc/classes/Font.xml index 3e47b167ef..6cb5e0b17a 100644 --- a/doc/classes/Font.xml +++ b/doc/classes/Font.xml @@ -4,7 +4,7 @@ Internationalized font and text drawing support. </brief_description> <description> - Font contains a unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. TODO check wikipedia for graph of ascent/baseline/descent/height/etc. + Font contains a unicode compatible character set, as well as the ability to draw it with variable width, ascent, descent and kerning. For creating fonts from TTF files (or other font formats), see the editor support for fonts. </description> <tutorials> </tutorials> diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml index a4fade6ab2..83abd723d0 100644 --- a/doc/classes/KinematicBody.xml +++ b/doc/classes/KinematicBody.xml @@ -91,7 +91,7 @@ Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [code]KinematicBody[/code] or [RigidBody], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes. [code]linear_velocity[/code] is the velocity vector (typically meters per second). Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. [code]floor_normal[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector3(0, 0, 0)[/code], everything is considered a wall. This is useful for topdown games. - [i]TODO: Update for new stop_on_slode argument.[/i] If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. + If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. Returns the movement that remained when the body stopped. To get more detailed information about collisions that occurred, use [method get_slide_collision]. diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index b94304b9a8..d5bfc91f66 100644 --- a/doc/classes/KinematicBody2D.xml +++ b/doc/classes/KinematicBody2D.xml @@ -91,7 +91,7 @@ Moves the body along a vector. If the body collides with another, it will slide along the other body rather than stop immediately. If the other body is a [code]KinematicBody2D[/code] or [RigidBody2D], it will also be affected by the motion of the other body. You can use this to make moving or rotating platforms, or to make nodes push other nodes. [code]linear_velocity[/code] is the velocity vector in pixels per second. Unlike in [method move_and_collide], you should [i]not[/i] multiply it by [code]delta[/code] — the physics engine handles applying the velocity. [code]floor_normal[/code] is the up direction, used to determine what is a wall and what is a floor or a ceiling. If set to the default value of [code]Vector2(0, 0)[/code], everything is considered a wall. This is useful for topdown games. - [i]TODO: Update for stop_on_slope argument.[/i] If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. + If the body is standing on a slope and the horizontal speed (relative to the floor's speed) goes below [code]slope_stop_min_velocity[/code], the body will stop completely. This prevents the body from sliding down slopes when you include gravity in [code]linear_velocity[/code]. When set to lower values, the body will not be able to stand still on steep slopes. If the body collides, it will change direction a maximum of [code]max_slides[/code] times before it stops. [code]floor_max_angle[/code] is the maximum angle (in radians) where a slope is still considered a floor (or a ceiling), rather than a wall. The default value equals 45 degrees. Returns the [code]linear_velocity[/code] vector, rotated and/or scaled if a slide collision occurred. To get more detailed information about collisions that occurred, use [method get_slide_collision]. @@ -138,7 +138,7 @@ If the body is at least this close to another body, this body will consider them to be colliding. </member> <member name="motion/sync_to_physics" type="bool" setter="set_sync_to_physics" getter="is_sync_to_physics_enabled"> - If [code]true[/code], the body's movement will be synchronized to the physics frame. This is useful when animating movement via [AnimationPlayer], for example on moving platforms. + If [code]true[/code], the body's movement will be synchronized to the physics frame. This is useful when animating movement via [AnimationPlayer], for example on moving platforms. Do [b]not[/b] use together with [method move_and_slide] or [method move_and_collide] functions. </member> </members> <constants> diff --git a/doc/classes/SpotLight.xml b/doc/classes/SpotLight.xml index 11f914aac2..56ba2fc5b9 100644 --- a/doc/classes/SpotLight.xml +++ b/doc/classes/SpotLight.xml @@ -4,7 +4,7 @@ Spotlight [Light], such as a reflector spotlight or a lantern. </brief_description> <description> - A SpotLight light is a type of [Light] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. TODO: Image of a spotlight. + A SpotLight light is a type of [Light] node that emits lights in a specific direction, in the shape of a cone. The light is attenuated through the distance and this attenuation can be configured by changing the energy, radius and attenuation parameters of [Light]. </description> <tutorials> <link>https://docs.godotengine.org/en/latest/tutorials/3d/lights_and_shadows.html</link> diff --git a/doc/classes/Tween.xml b/doc/classes/Tween.xml index c3af586b21..f5f50a75b1 100644 --- a/doc/classes/Tween.xml +++ b/doc/classes/Tween.xml @@ -13,7 +13,7 @@ Tween.TRANS_LINEAR, Tween.EASE_IN_OUT) tween.start() [/codeblock] - Many methods require a property name, such as "position" above. You can find the correct property name by hovering over the property in the Inspector. + Many methods require a property name, such as "position" above. You can find the correct property name by hovering over the property in the Inspector. You can also provide the components of a property directly by using "property:component" (eg. [code]position:x[/code]), where it would only apply to that particular component. Many of the methods accept [code]trans_type[/code] and [code]ease_type[/code]. The first accepts an [enum TransitionType] constant, and refers to the way the timing of the animation is handled (see [code]http://easings.net/[/code] for some examples). The second accepts an [enum EaseType] constant, and controls the where [code]trans_type[/code] is applied to the interpolation (in the beginning, the end, or both). If you don't know which transition and easing to pick, you can try different [enum TransitionType] constants with [code]EASE_IN_OUT[/code], and use the one that looks best. </description> <tutorials> diff --git a/doc/tools/makerst.py b/doc/tools/makerst.py index 22c0b5d1fd..4b5785f604 100755 --- a/doc/tools/makerst.py +++ b/doc/tools/makerst.py @@ -950,6 +950,12 @@ def make_method_signature(class_def, method_def, make_ref, state): # type: (Cla if arg.default_value is not None: out += '=' + arg.default_value + if isinstance(method_def, MethodDef) and method_def.qualifiers is not None and 'vararg' in method_def.qualifiers: + if len(method_def.parameters) > 0: + out += ', ...' + else: + out += '...' + out += ' **)**' if isinstance(method_def, MethodDef) and method_def.qualifiers is not None: diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 214da82819..ddf4d1d85c 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -461,6 +461,7 @@ public: RID skeleton_create() { return RID(); } void skeleton_allocate(RID p_skeleton, int p_bones, bool p_2d_skeleton = false) {} void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) {} + void skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform) {} int skeleton_get_bone_count(RID p_skeleton) const { return 0; } void skeleton_bone_set_transform(RID p_skeleton, int p_bone, const Transform &p_transform) {} Transform skeleton_bone_get_transform(RID p_skeleton, int p_bone) const { return Transform(); } diff --git a/drivers/gles2/rasterizer_canvas_gles2.cpp b/drivers/gles2/rasterizer_canvas_gles2.cpp index 5d336d2a25..3671679b49 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.cpp +++ b/drivers/gles2/rasterizer_canvas_gles2.cpp @@ -202,12 +202,12 @@ RasterizerStorageGLES2::Texture *RasterizerCanvasGLES2::_bind_canvas_texture(con } else { - texture = texture->get_ptr(); - if (texture->redraw_if_visible) { VisualServerRaster::redraw_request(); } + texture = texture->get_ptr(); + if (texture->render_target) { texture->render_target->used_in_frame = true; } @@ -244,12 +244,12 @@ RasterizerStorageGLES2::Texture *RasterizerCanvasGLES2::_bind_canvas_texture(con } else { - normal_map = normal_map->get_ptr(); - if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies VisualServerRaster::redraw_request(); } + normal_map = normal_map->get_ptr(); + glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 2); glBindTexture(GL_TEXTURE_2D, normal_map->tex_id); state.current_normal = p_normal_map; @@ -1412,6 +1412,10 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons continue; } + if (t->redraw_if_visible) { + VisualServerRaster::redraw_request(); + } + t = t->get_ptr(); #ifdef TOOLS_ENABLED @@ -1422,10 +1426,6 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons if (t->render_target) t->render_target->used_in_frame = true; - if (t->redraw_if_visible) { - VisualServerRaster::redraw_request(); - } - glBindTexture(t->target, t->tex_id); } @@ -2029,6 +2029,7 @@ void RasterizerCanvasGLES2::initialize() { state.using_light = NULL; state.using_transparent_rt = false; + state.using_skeleton = false; } void RasterizerCanvasGLES2::finalize() { diff --git a/drivers/gles2/rasterizer_scene_gles2.cpp b/drivers/gles2/rasterizer_scene_gles2.cpp index ebaa66824a..5e006b7527 100644 --- a/drivers/gles2/rasterizer_scene_gles2.cpp +++ b/drivers/gles2/rasterizer_scene_gles2.cpp @@ -83,7 +83,11 @@ void RasterizerSceneGLES2::shadow_atlas_set_size(RID p_atlas, int p_size) { // erase the old atlast if (shadow_atlas->fbo) { - glDeleteTextures(1, &shadow_atlas->depth); + if (storage->config.use_rgba_3d_shadows) { + glDeleteRenderbuffers(1, &shadow_atlas->depth); + } else { + glDeleteTextures(1, &shadow_atlas->depth); + } glDeleteFramebuffers(1, &shadow_atlas->fbo); if (shadow_atlas->color) { glDeleteTextures(1, &shadow_atlas->color); @@ -111,18 +115,15 @@ void RasterizerSceneGLES2::shadow_atlas_set_size(RID p_atlas, int p_size) { // create a depth texture glActiveTexture(GL_TEXTURE0); - glGenTextures(1, &shadow_atlas->depth); - glBindTexture(GL_TEXTURE_2D, shadow_atlas->depth); - glTexImage2D(GL_TEXTURE_2D, 0, storage->config.depth_internalformat, shadow_atlas->size, shadow_atlas->size, 0, GL_DEPTH_COMPONENT, storage->config.depth_type, NULL); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + if (storage->config.use_rgba_3d_shadows) { - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, shadow_atlas->depth, 0); + //maximum compatibility, renderbuffer and RGBA shadow + glGenRenderbuffers(1, &shadow_atlas->depth); + glBindRenderbuffer(GL_RENDERBUFFER, directional_shadow.depth); + glRenderbufferStorage(GL_RENDERBUFFER, storage->config.depth_internalformat, shadow_atlas->size, shadow_atlas->size); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, shadow_atlas->depth); - if (storage->config.use_rgba_3d_shadows) { glGenTextures(1, &shadow_atlas->color); glBindTexture(GL_TEXTURE_2D, shadow_atlas->color); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, shadow_atlas->size, shadow_atlas->size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); @@ -131,6 +132,18 @@ void RasterizerSceneGLES2::shadow_atlas_set_size(RID p_atlas, int p_size) { glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, shadow_atlas->color, 0); + } else { + //just depth texture + glGenTextures(1, &shadow_atlas->depth); + glBindTexture(GL_TEXTURE_2D, shadow_atlas->depth); + glTexImage2D(GL_TEXTURE_2D, 0, storage->config.depth_internalformat, shadow_atlas->size, shadow_atlas->size, 0, GL_DEPTH_COMPONENT, storage->config.depth_type, NULL); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, shadow_atlas->depth, 0); } glViewport(0, 0, shadow_atlas->size, shadow_atlas->size); @@ -475,7 +488,8 @@ RID RasterizerSceneGLES2::reflection_probe_instance_create(RID p_probe) { glGenTextures(1, &rpi->color[i]); } - glGenTextures(1, &rpi->depth); + glGenRenderbuffers(1, &rpi->depth); + rpi->cubemap = 0; //glGenTextures(1, &rpi->cubemap); @@ -524,8 +538,8 @@ bool RasterizerSceneGLES2::reflection_probe_instance_begin_render(RID p_instance glActiveTexture(GL_TEXTURE0); - glBindTexture(GL_TEXTURE_2D, rpi->depth); - glTexImage2D(GL_TEXTURE_2D, 0, storage->config.depth_internalformat, size, size, 0, GL_DEPTH_COMPONENT, storage->config.depth_type, NULL); + glBindRenderbuffer(GL_RENDERBUFFER, rpi->depth); + glRenderbufferStorage(GL_RENDERBUFFER, storage->config.depth_internalformat, size, size); if (rpi->cubemap != 0) { glDeleteTextures(1, &rpi->cubemap); @@ -547,7 +561,7 @@ bool RasterizerSceneGLES2::reflection_probe_instance_begin_render(RID p_instance glBindTexture(GL_TEXTURE_2D, rpi->color[i]); glTexImage2D(GL_TEXTURE_2D, 0, internal_format, size, size, 0, format, type, NULL); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rpi->color[i], 0); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, rpi->depth, 0); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rpi->depth); GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); ERR_CONTINUE(status != GL_FRAMEBUFFER_COMPLETE); } @@ -566,8 +580,6 @@ bool RasterizerSceneGLES2::reflection_probe_instance_begin_render(RID p_instance //adjust framebuffer glBindFramebuffer(GL_FRAMEBUFFER, rpi->fbo[i]); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, _cube_side_enum[i], rpi->cubemap, 0); - glBindRenderbuffer(GL_RENDERBUFFER, rpi->depth); - glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT, size, size); // Note: used to be _DEPTH_COMPONENT24_OES. GL_DEPTH_COMPONENT untested. glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rpi->depth); #ifdef DEBUG_ENABLED @@ -1300,12 +1312,12 @@ bool RasterizerSceneGLES2::_setup_material(RasterizerStorageGLES2::Material *p_m continue; } - t = t->get_ptr(); - if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies VisualServerRaster::redraw_request(); } + t = t->get_ptr(); + #ifdef TOOLS_ENABLED if (t->detect_3d) { t->detect_3d(t->detect_3d_ud); @@ -1659,11 +1671,10 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) { if (c.texture.is_valid() && storage->texture_owner.owns(c.texture)) { RasterizerStorageGLES2::Texture *t = storage->texture_owner.get(c.texture); - t = t->get_ptr(); - if (t->redraw_if_visible) { VisualServerRaster::redraw_request(); } + t = t->get_ptr(); #ifdef TOOLS_ENABLED if (t->detect_3d) { @@ -2475,6 +2486,12 @@ void RasterizerSceneGLES2::_render_render_list(RenderList::Element **p_elements, state.scene_shader.set_uniform(SceneShaderGLES2::WORLD_TRANSFORM, e->instance->transform); + if (skeleton) { + state.scene_shader.set_uniform(SceneShaderGLES2::SKELETON_IN_WORLD_COORDS, skeleton->use_world_transform); + state.scene_shader.set_uniform(SceneShaderGLES2::SKELETON_TRANSFORM, skeleton->world_transform); + state.scene_shader.set_uniform(SceneShaderGLES2::SKELETON_TRANSFORM_INVERSE, skeleton->world_transform_inverse); + } + if (use_lightmap_capture) { //this is per instance, must be set always if present glUniform4fv(state.scene_shader.get_uniform_location(SceneShaderGLES2::LIGHTMAP_CAPTURES), 12, (const GLfloat *)e->instance->lightmap_capture_data.ptr()); state.scene_shader.set_uniform(SceneShaderGLES2::LIGHTMAP_CAPTURE_SKY, false); @@ -2511,6 +2528,7 @@ void RasterizerSceneGLES2::_render_render_list(RenderList::Element **p_elements, state.scene_shader.set_conditional(SceneShaderGLES2::FOG_DEPTH_ENABLED, false); state.scene_shader.set_conditional(SceneShaderGLES2::FOG_HEIGHT_ENABLED, false); state.scene_shader.set_conditional(SceneShaderGLES2::USE_RADIANCE_MAP, false); + state.scene_shader.set_conditional(SceneShaderGLES2::USE_DEPTH_PREPASS, false); } void RasterizerSceneGLES2::_draw_sky(RasterizerStorageGLES2::Sky *p_sky, const CameraMatrix &p_projection, const Transform &p_transform, bool p_vflip, float p_custom_fov, float p_energy, const Basis &p_sky_orientation) { @@ -2977,7 +2995,7 @@ void RasterizerSceneGLES2::render_shadow(RID p_light, RID p_shadow_atlas, int p_ if (light->type == VS::LIGHT_OMNI) { // cubemap only - if (light->omni_shadow_mode == VS::LIGHT_OMNI_SHADOW_CUBE && storage->config.support_write_depth) { + if (light->omni_shadow_mode == VS::LIGHT_OMNI_SHADOW_CUBE && storage->config.support_shadow_cubemaps) { int cubemap_index = shadow_cubemaps.size() - 1; // find an appropriate cubemap to render to @@ -3075,7 +3093,7 @@ void RasterizerSceneGLES2::render_shadow(RID p_light, RID p_shadow_atlas, int p_ state.scene_shader.set_conditional(SceneShaderGLES2::RENDER_DEPTH_DUAL_PARABOLOID, false); // convert cubemap to dual paraboloid if needed - if (light->type == VS::LIGHT_OMNI && (light->omni_shadow_mode == VS::LIGHT_OMNI_SHADOW_CUBE && storage->config.support_write_depth) && p_pass == 5) { + if (light->type == VS::LIGHT_OMNI && (light->omni_shadow_mode == VS::LIGHT_OMNI_SHADOW_CUBE && storage->config.support_shadow_cubemaps) && p_pass == 5) { ShadowAtlas *shadow_atlas = shadow_atlas_owner.getornull(p_shadow_atlas); glBindFramebuffer(GL_FRAMEBUFFER, shadow_atlas->fbo); @@ -3172,7 +3190,7 @@ bool RasterizerSceneGLES2::free(RID p_rid) { if (reflection_instance->cubemap != 0) { glDeleteTextures(1, &reflection_instance->cubemap); } - glDeleteTextures(1, &reflection_instance->depth); + glDeleteRenderbuffers(1, &reflection_instance->depth); reflection_probe_release_atlas_index(p_rid); reflection_probe_instance_owner.free(p_rid); @@ -3253,7 +3271,7 @@ void RasterizerSceneGLES2::initialize() { } // cubemaps for shadows - if (storage->config.support_write_depth) { //not going to be used + if (storage->config.support_shadow_cubemaps) { //not going to be used int max_shadow_cubemap_sampler_size = 512; int cube_size = max_shadow_cubemap_sampler_size; @@ -3302,19 +3320,13 @@ void RasterizerSceneGLES2::initialize() { glGenFramebuffers(1, &directional_shadow.fbo); glBindFramebuffer(GL_FRAMEBUFFER, directional_shadow.fbo); - glGenTextures(1, &directional_shadow.depth); - glBindTexture(GL_TEXTURE_2D, directional_shadow.depth); - - glTexImage2D(GL_TEXTURE_2D, 0, storage->config.depth_internalformat, directional_shadow.size, directional_shadow.size, 0, GL_DEPTH_COMPONENT, storage->config.depth_type, NULL); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, directional_shadow.depth, 0); - if (storage->config.use_rgba_3d_shadows) { + //maximum compatibility, renderbuffer and RGBA shadow + glGenRenderbuffers(1, &directional_shadow.depth); + glBindRenderbuffer(GL_RENDERBUFFER, directional_shadow.depth); + glRenderbufferStorage(GL_RENDERBUFFER, storage->config.depth_internalformat, directional_shadow.size, directional_shadow.size); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, directional_shadow.depth); + glGenTextures(1, &directional_shadow.color); glBindTexture(GL_TEXTURE_2D, directional_shadow.color); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, directional_shadow.size, directional_shadow.size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); @@ -3323,6 +3335,19 @@ void RasterizerSceneGLES2::initialize() { glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, directional_shadow.color, 0); + } else { + //just a depth buffer + glGenTextures(1, &directional_shadow.depth); + glBindTexture(GL_TEXTURE_2D, directional_shadow.depth); + + glTexImage2D(GL_TEXTURE_2D, 0, storage->config.depth_internalformat, directional_shadow.size, directional_shadow.size, 0, GL_DEPTH_COMPONENT, storage->config.depth_type, NULL); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, directional_shadow.depth, 0); } GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); diff --git a/drivers/gles2/rasterizer_scene_gles2.h b/drivers/gles2/rasterizer_scene_gles2.h index fbb8b7e9e5..f23e45b52f 100644 --- a/drivers/gles2/rasterizer_scene_gles2.h +++ b/drivers/gles2/rasterizer_scene_gles2.h @@ -475,7 +475,7 @@ public: virtual void light_instance_set_transform(RID p_light_instance, const Transform &p_transform); virtual void light_instance_set_shadow_transform(RID p_light_instance, const CameraMatrix &p_projection, const Transform &p_transform, float p_far, float p_split, int p_pass, float p_bias_scale = 1.0); virtual void light_instance_mark_visible(RID p_light_instance); - virtual bool light_instances_can_render_shadow_cube() const { return storage->config.support_write_depth; } + virtual bool light_instances_can_render_shadow_cube() const { return storage->config.support_shadow_cubemaps; } LightInstance **render_light_instances; int render_directional_lights; diff --git a/drivers/gles2/rasterizer_storage_gles2.cpp b/drivers/gles2/rasterizer_storage_gles2.cpp index c8650462aa..11ab8438df 100644 --- a/drivers/gles2/rasterizer_storage_gles2.cpp +++ b/drivers/gles2/rasterizer_storage_gles2.cpp @@ -44,8 +44,31 @@ GLuint RasterizerStorageGLES2::system_fbo = 0; #define _EXT_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 #define _EXT_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 +#define _EXT_COMPRESSED_RED_RGTC1_EXT 0x8DBB +#define _EXT_COMPRESSED_RED_RGTC1 0x8DBB +#define _EXT_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC +#define _EXT_COMPRESSED_RG_RGTC2 0x8DBD +#define _EXT_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE +#define _EXT_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC +#define _EXT_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD +#define _EXT_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE #define _EXT_ETC1_RGB8_OES 0x8D64 +#define _EXT_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00 +#define _EXT_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01 +#define _EXT_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02 +#define _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 + +#define _EXT_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54 +#define _EXT_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55 +#define _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56 +#define _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57 + +#define _EXT_COMPRESSED_RGBA_BPTC_UNORM 0x8E8C +#define _EXT_COMPRESSED_SRGB_ALPHA_BPTC_UNORM 0x8E8D +#define _EXT_COMPRESSED_RGB_BPTC_SIGNED_FLOAT 0x8E8E +#define _EXT_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT 0x8E8F + #ifdef GLES_OVER_GL #define _GL_HALF_FLOAT_OES 0x140B #else @@ -231,41 +254,130 @@ Ref<Image> RasterizerStorageGLES2::_get_gl_image_and_format(const Ref<Image> &p_ } break; case Image::FORMAT_RGTC_R: { - need_decompress = true; + if (config.rgtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RED_RGTC1_EXT; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } } break; case Image::FORMAT_RGTC_RG: { - need_decompress = true; + if (config.rgtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RED_GREEN_RGTC2_EXT; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + } else { + + need_decompress = true; + } } break; case Image::FORMAT_BPTC_RGBA: { - need_decompress = true; + if (config.bptc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGBA_BPTC_UNORM; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } } break; case Image::FORMAT_BPTC_RGBF: { - need_decompress = true; + if (config.bptc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGB_BPTC_SIGNED_FLOAT; + r_gl_format = GL_RGB; + r_gl_type = GL_FLOAT; + r_compressed = true; + } else { + + need_decompress = true; + } } break; case Image::FORMAT_BPTC_RGBFU: { + if (config.bptc_supported) { - need_decompress = true; + r_gl_internal_format = _EXT_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT; + r_gl_format = GL_RGB; + r_gl_type = GL_FLOAT; + r_compressed = true; + } else { + + need_decompress = true; + } } break; case Image::FORMAT_PVRTC2: { - need_decompress = true; + if (config.pvrtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGB_PVRTC_2BPPV1_IMG; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } } break; case Image::FORMAT_PVRTC2A: { - need_decompress = true; + if (config.pvrtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } + } break; case Image::FORMAT_PVRTC4: { - need_decompress = true; + if (config.pvrtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGB_PVRTC_4BPPV1_IMG; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } + } break; case Image::FORMAT_PVRTC4A: { - need_decompress = true; + if (config.pvrtc_supported) { + + r_gl_internal_format = _EXT_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG; + r_gl_format = GL_RGBA; + r_gl_type = GL_UNSIGNED_BYTE; + r_compressed = true; + + } else { + + need_decompress = true; + } + } break; case Image::FORMAT_ETC: { @@ -317,7 +429,6 @@ Ref<Image> RasterizerStorageGLES2::_get_gl_image_and_format(const Ref<Image> &p_ if (!image.is_null()) { image = image->duplicate(); - print_line("decompressing..."); image->decompress(); ERR_FAIL_COND_V(image->is_compressed(), image); switch (image->get_format()) { @@ -1223,8 +1334,6 @@ void RasterizerStorageGLES2::_update_shader(Shader *p_shader) const { switch (p_shader->mode) { - // TODO - case VS::SHADER_CANVAS_ITEM: { p_shader->canvas_item.light_mode = Shader::CanvasItem::LIGHT_MODE_NORMAL; @@ -1308,7 +1417,11 @@ void RasterizerStorageGLES2::_update_shader(Shader *p_shader) const { actions->uniforms = &p_shader->uniforms; if (p_shader->spatial.uses_screen_texture && p_shader->spatial.uses_depth_texture) { - WARN_PRINT("Using both SCREEN_TEXTURE and DEPTH_TEXTURE is not supported in GLES2"); + ERR_PRINT_ONCE("Using both SCREEN_TEXTURE and DEPTH_TEXTURE is not supported in GLES2"); + } + + if (p_shader->spatial.uses_depth_texture && !config.support_depth_texture) { + ERR_PRINT_ONCE("Using DEPTH_TEXTURE is not permitted on this hardware, operation will fail."); } } break; @@ -2254,14 +2367,19 @@ void RasterizerStorageGLES2::mesh_add_surface(RID p_mesh, uint32_t p_format, VS: surface->aabb = p_aabb; surface->max_bone = p_bone_aabbs.size(); - +#ifdef TOOLS_ENABLED + surface->blend_shape_data = p_blend_shapes; + if (surface->blend_shape_data.size()) { + ERR_PRINT_ONCE("Blend shapes are not supported in OpenGL ES 2.0"); + } surface->data = array; surface->index_data = p_index_array; +#endif surface->total_data_size += surface->array_byte_size + surface->index_array_byte_size; for (int i = 0; i < surface->skeleton_bone_used.size(); i++) { - surface->skeleton_bone_used.write[i] = surface->skeleton_bone_aabb[i].size.x < 0 || surface->skeleton_bone_aabb[i].size.y < 0 || surface->skeleton_bone_aabb[i].size.z < 0; + surface->skeleton_bone_used.write[i] = !(surface->skeleton_bone_aabb[i].size.x < 0 || surface->skeleton_bone_aabb[i].size.y < 0 || surface->skeleton_bone_aabb[i].size.z < 0); } for (int i = 0; i < VS::ARRAY_MAX; i++) { @@ -2326,12 +2444,12 @@ void RasterizerStorageGLES2::mesh_set_blend_shape_count(RID p_mesh, int p_amount ERR_FAIL_COND(p_amount < 0); mesh->blend_shape_count = p_amount; + mesh->instance_change_notify(true, false); } int RasterizerStorageGLES2::mesh_get_blend_shape_count(RID p_mesh) const { const Mesh *mesh = mesh_owner.getornull(p_mesh); ERR_FAIL_COND_V(!mesh, 0); - return mesh->blend_shape_count; } @@ -2417,7 +2535,9 @@ PoolVector<uint8_t> RasterizerStorageGLES2::mesh_surface_get_array(RID p_mesh, i ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), PoolVector<uint8_t>()); Surface *surface = mesh->surfaces[p_surface]; - +#ifndef TOOLS_ENABLED + ERR_PRINT("OpenGL ES 2.0 does not allow retrieving mesh array data"); +#endif return surface->data; } @@ -2457,7 +2577,14 @@ AABB RasterizerStorageGLES2::mesh_surface_get_aabb(RID p_mesh, int p_surface) co } Vector<PoolVector<uint8_t> > RasterizerStorageGLES2::mesh_surface_get_blend_shapes(RID p_mesh, int p_surface) const { - return Vector<PoolVector<uint8_t> >(); + const Mesh *mesh = mesh_owner.getornull(p_mesh); + ERR_FAIL_COND_V(!mesh, Vector<PoolVector<uint8_t> >()); + ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Vector<PoolVector<uint8_t> >()); +#ifndef TOOLS_ENABLED + ERR_PRINT("OpenGL ES 2.0 does not allow retrieving mesh array data"); +#endif + + return mesh->surfaces[p_surface]->blend_shape_data; } Vector<AABB> RasterizerStorageGLES2::mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const { const Mesh *mesh = mesh_owner.getornull(p_mesh); @@ -2476,7 +2603,7 @@ void RasterizerStorageGLES2::mesh_remove_surface(RID p_mesh, int p_surface) { Surface *surface = mesh->surfaces[p_surface]; if (surface->material.is_valid()) { - // TODO _material_remove_geometry(surface->material, mesh->surfaces[p_surface]); + _material_remove_geometry(surface->material, mesh->surfaces[p_surface]); } glDeleteBuffers(1, &surface->vertex_id); @@ -2524,16 +2651,110 @@ AABB RasterizerStorageGLES2::mesh_get_aabb(RID p_mesh, RID p_skeleton) const { if (mesh->custom_aabb != AABB()) return mesh->custom_aabb; - // TODO handle skeletons + Skeleton *sk = NULL; + if (p_skeleton.is_valid()) { + sk = skeleton_owner.get(p_skeleton); + } AABB aabb; - if (mesh->surfaces.size() >= 1) { - aabb = mesh->surfaces[0]->aabb; - } + if (sk && sk->size != 0) { - for (int i = 0; i < mesh->surfaces.size(); i++) { - aabb.merge_with(mesh->surfaces[i]->aabb); + for (int i = 0; i < mesh->surfaces.size(); i++) { + + AABB laabb; + if ((mesh->surfaces[i]->format & VS::ARRAY_FORMAT_BONES) && mesh->surfaces[i]->skeleton_bone_aabb.size()) { + + int bs = mesh->surfaces[i]->skeleton_bone_aabb.size(); + const AABB *skbones = mesh->surfaces[i]->skeleton_bone_aabb.ptr(); + const bool *skused = mesh->surfaces[i]->skeleton_bone_used.ptr(); + + int sbs = sk->size; + ERR_CONTINUE(bs > sbs); + const float *texture = sk->bone_data.ptr(); + + bool first = true; + if (sk->use_2d) { + for (int j = 0; j < bs; j++) { + + if (!skused[j]) + continue; + + int base_ofs = j * 2 * 4; + + Transform mtx; + + mtx.basis[0].x = texture[base_ofs + 0]; + mtx.basis[0].y = texture[base_ofs + 1]; + mtx.origin.x = texture[base_ofs + 3]; + base_ofs += 4; + mtx.basis[1].x = texture[base_ofs + 0]; + mtx.basis[1].y = texture[base_ofs + 1]; + mtx.origin.y = texture[base_ofs + 3]; + + AABB baabb = mtx.xform(skbones[j]); + + if (first) { + laabb = baabb; + first = false; + } else { + laabb.merge_with(baabb); + } + } + } else { + for (int j = 0; j < bs; j++) { + + if (!skused[j]) + continue; + + int base_ofs = j * 3 * 4; + + Transform mtx; + + mtx.basis[0].x = texture[base_ofs + 0]; + mtx.basis[0].y = texture[base_ofs + 1]; + mtx.basis[0].z = texture[base_ofs + 2]; + mtx.origin.x = texture[base_ofs + 3]; + base_ofs += 4; + mtx.basis[1].x = texture[base_ofs + 0]; + mtx.basis[1].y = texture[base_ofs + 1]; + mtx.basis[1].z = texture[base_ofs + 2]; + mtx.origin.y = texture[base_ofs + 3]; + base_ofs += 4; + mtx.basis[2].x = texture[base_ofs + 0]; + mtx.basis[2].y = texture[base_ofs + 1]; + mtx.basis[2].z = texture[base_ofs + 2]; + mtx.origin.z = texture[base_ofs + 3]; + + AABB baabb = mtx.xform(skbones[j]); + if (first) { + laabb = baabb; + first = false; + } else { + laabb.merge_with(baabb); + } + } + } + + } else { + + laabb = mesh->surfaces[i]->aabb; + } + + if (i == 0) + aabb = laabb; + else + aabb.merge_with(laabb); + } + } else { + + for (int i = 0; i < mesh->surfaces.size(); i++) { + + if (i == 0) + aabb = mesh->surfaces[i]->aabb; + else + aabb.merge_with(mesh->surfaces[i]->aabb); + } } return aabb; @@ -3227,7 +3448,6 @@ void RasterizerStorageGLES2::skeleton_allocate(RID p_skeleton, int p_bones, bool skeleton->size = p_bones; skeleton->use_2d = p_2d_skeleton; - // TODO use float texture for vertex shader if (config.float_texture_supported) { glGenTextures(1, &skeleton->tex_id); @@ -3378,6 +3598,23 @@ void RasterizerStorageGLES2::skeleton_set_base_transform_2d(RID p_skeleton, cons skeleton->base_transform_2d = p_base_transform; } +void RasterizerStorageGLES2::skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform) { + + Skeleton *skeleton = skeleton_owner.getornull(p_skeleton); + + ERR_FAIL_COND(skeleton->use_2d); + + skeleton->world_transform = p_world_transform; + skeleton->use_world_transform = p_enable; + if (p_enable) { + skeleton->world_transform_inverse = skeleton->world_transform.affine_inverse(); + } + + if (!skeleton->update_list.in_list()) { + skeleton_update_list.add(&skeleton->update_list); + } +} + void RasterizerStorageGLES2::_update_skeleton_transform_buffer(const PoolVector<float> &p_data, size_t p_size) { glBindBuffer(GL_ARRAY_BUFFER, resources.skeleton_transform_buffer); @@ -4306,24 +4543,36 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) { // depth - glGenTextures(1, &rt->depth); - glBindTexture(GL_TEXTURE_2D, rt->depth); + if (config.support_depth_texture) { + glGenTextures(1, &rt->depth); + glBindTexture(GL_TEXTURE_2D, rt->depth); + glTexImage2D(GL_TEXTURE_2D, 0, config.depth_internalformat, rt->width, rt->height, 0, GL_DEPTH_COMPONENT, config.depth_type, NULL); - glTexImage2D(GL_TEXTURE_2D, 0, config.depth_internalformat, rt->width, rt->height, 0, GL_DEPTH_COMPONENT, config.depth_type, NULL); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, rt->depth, 0); + } else { + glGenRenderbuffers(1, &rt->depth); + glBindRenderbuffer(GL_RENDERBUFFER, rt->depth); + + glRenderbufferStorage(GL_RENDERBUFFER, config.depth_internalformat, rt->width, rt->height); - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, rt->depth, 0); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rt->depth); + } GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); if (status != GL_FRAMEBUFFER_COMPLETE) { glDeleteFramebuffers(1, &rt->fbo); - glDeleteTextures(1, &rt->depth); + if (config.support_depth_texture) { + glDeleteTextures(1, &rt->depth); + } else { + glDeleteRenderbuffers(1, &rt->depth); + } glDeleteTextures(1, &rt->color); rt->fbo = 0; rt->width = 0; @@ -4395,7 +4644,12 @@ void RasterizerStorageGLES2::_render_target_clear(RenderTarget *rt) { } if (rt->depth) { - glDeleteTextures(1, &rt->depth); + if (config.support_depth_texture) { + glDeleteTextures(1, &rt->depth); + } else { + glDeleteRenderbuffers(1, &rt->depth); + } + rt->depth = 0; } @@ -4533,17 +4787,10 @@ RID RasterizerStorageGLES2::canvas_light_shadow_buffer_create(int p_width) { glGenFramebuffers(1, &cls->fbo); glBindFramebuffer(GL_FRAMEBUFFER, cls->fbo); - glGenTextures(1, &cls->depth); - glBindTexture(GL_TEXTURE_2D, cls->depth); - - glTexImage2D(GL_TEXTURE_2D, 0, config.depth_internalformat, cls->size, cls->height, 0, GL_DEPTH_COMPONENT, config.depth_type, NULL); - - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - - glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, cls->depth, 0); + glGenRenderbuffers(1, &cls->depth); + glBindRenderbuffer(GL_RENDERBUFFER, cls->depth); + glRenderbufferStorage(GL_RENDERBUFFER, config.depth_internalformat, cls->size, cls->height); + glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, cls->depth); glGenTextures(1, &cls->distance); glBindTexture(GL_TEXTURE_2D, cls->distance); @@ -4908,7 +5155,7 @@ bool RasterizerStorageGLES2::free(RID p_rid) { CanvasLightShadow *cls = canvas_light_shadow_owner.get(p_rid); glDeleteFramebuffers(1, &cls->fbo); - glDeleteTextures(1, &cls->depth); + glDeleteRenderbuffers(1, &cls->depth); glDeleteTextures(1, &cls->distance); canvas_light_shadow_owner.free(p_rid); memdelete(cls); @@ -4986,21 +5233,17 @@ void RasterizerStorageGLES2::initialize() { config.pvrtc_supported = config.extensions.has("IMG_texture_compression_pvrtc"); config.support_npot_repeat_mipmap = config.extensions.has("GL_OES_texture_npot"); - if (config.extensions.has("GL_OES_depth24")) { - config.depth_internalformat = _DEPTH_COMPONENT24_OES; - config.depth_type = GL_UNSIGNED_INT; - } else { - config.depth_internalformat = GL_DEPTH_COMPONENT16; - config.depth_type = GL_UNSIGNED_SHORT; - } - #endif #ifdef GLES_OVER_GL config.use_rgba_2d_shadows = false; + config.support_depth_texture = true; config.use_rgba_3d_shadows = false; + config.support_depth_cubemaps = true; #else config.use_rgba_2d_shadows = !(config.float_texture_supported && config.extensions.has("GL_EXT_texture_rg")); - config.use_rgba_3d_shadows = config.extensions.has("GL_OES_depth_texture"); + config.support_depth_texture = config.extensions.has("GL_OES_depth_texture"); + config.use_rgba_3d_shadows = !config.support_depth_texture; + config.support_depth_cubemaps = config.extensions.has("GL_OES_depth_texture_cube_map"); #endif #ifdef GLES_OVER_GL @@ -5024,6 +5267,58 @@ void RasterizerStorageGLES2::initialize() { config.support_half_float_vertices = true; #endif + config.rgtc_supported = config.extensions.has("GL_EXT_texture_compression_rgtc") || config.extensions.has("GL_ARB_texture_compression_rgtc") || config.extensions.has("EXT_texture_compression_rgtc"); + config.bptc_supported = config.extensions.has("GL_ARB_texture_compression_bptc"); + + //determine formats for depth textures (or renderbuffers) + if (config.support_depth_texture) { + // Will use texture for depth + // have to manually see if we can create a valid framebuffer texture using UNSIGNED_INT, + // as there is no extension to test for this. + GLuint fbo; + glGenFramebuffers(1, &fbo); + glBindFramebuffer(GL_FRAMEBUFFER, fbo); + GLuint depth; + glGenTextures(1, &depth); + glBindTexture(GL_TEXTURE_2D, depth); + glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, 32, 32, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL); + + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + + glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depth, 0); + + GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); + + if (status == GL_FRAMEBUFFER_COMPLETE) { + config.depth_internalformat = GL_DEPTH_COMPONENT; + config.depth_type = GL_UNSIGNED_INT; + } else { + config.depth_internalformat = GL_DEPTH_COMPONENT16; + config.depth_type = GL_UNSIGNED_SHORT; + } + + glBindFramebuffer(GL_FRAMEBUFFER, system_fbo); + glDeleteFramebuffers(1, &fbo); + glBindTexture(GL_TEXTURE_2D, 0); + glDeleteTextures(1, &depth); + + } else { + // Will use renderbuffer for depth + if (config.extensions.has("GL_OES_depth24")) { + config.depth_internalformat = _DEPTH_COMPONENT24_OES; + config.depth_type = GL_UNSIGNED_INT; + } else { + config.depth_internalformat = GL_DEPTH_COMPONENT16; + config.depth_type = GL_UNSIGNED_SHORT; + } + } + + //picky requirements for these + config.support_shadow_cubemaps = config.support_depth_texture && config.support_write_depth && config.support_depth_cubemaps; + frame.count = 0; frame.delta = 0; frame.current_rt = NULL; diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index 89f4381bed..8f5565c96f 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -73,6 +73,8 @@ public: bool s3tc_supported; bool etc1_supported; bool pvrtc_supported; + bool rgtc_supported; + bool bptc_supported; bool keep_original_textures; @@ -85,6 +87,10 @@ public: bool support_write_depth; bool support_half_float_vertices; bool support_npot_repeat_mipmap; + bool support_depth_texture; + bool support_depth_cubemaps; + + bool support_shadow_cubemaps; GLuint depth_internalformat; GLuint depth_type; @@ -631,6 +637,7 @@ public: PoolVector<uint8_t> data; PoolVector<uint8_t> index_data; + Vector<PoolVector<uint8_t> > blend_shape_data; int total_data_size; @@ -857,12 +864,16 @@ public: Set<RasterizerScene::InstanceBase *> instances; Transform2D base_transform_2d; + Transform world_transform; + Transform world_transform_inverse; + bool use_world_transform; Skeleton() : use_2d(false), size(0), tex_id(0), - update_list(this) { + update_list(this), + use_world_transform(false) { } }; @@ -880,6 +891,7 @@ public: virtual void skeleton_bone_set_transform_2d(RID p_skeleton, int p_bone, const Transform2D &p_transform); virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton, int p_bone) const; virtual void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform); + virtual void skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform); void _update_skeleton_transform_buffer(const PoolVector<float> &p_data, size_t p_size); diff --git a/drivers/gles2/shader_gles2.cpp b/drivers/gles2/shader_gles2.cpp index 6856035470..df7b170bf4 100644 --- a/drivers/gles2/shader_gles2.cpp +++ b/drivers/gles2/shader_gles2.cpp @@ -839,7 +839,7 @@ void ShaderGLES2::use_material(void *p_material) { } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } else if (E->get().default_value.size()) { @@ -970,7 +970,126 @@ void ShaderGLES2::use_material(void *p_material) { // Nothing to do? } break; default: { - ERR_PRINT("type missing, bug?"); + ERR_PRINT("ShaderNode type missing, bug?"); + } break; + } + } else { //zero + + switch (E->get().type) { + case ShaderLanguage::TYPE_BOOL: { + glUniform1i(location, GL_FALSE); + } break; + + case ShaderLanguage::TYPE_BVEC2: { + glUniform2i(location, GL_FALSE, GL_FALSE); + } break; + + case ShaderLanguage::TYPE_BVEC3: { + glUniform3i(location, GL_FALSE, GL_FALSE, GL_FALSE); + } break; + + case ShaderLanguage::TYPE_BVEC4: { + glUniform4i(location, GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); + } break; + + case ShaderLanguage::TYPE_INT: { + glUniform1i(location, 0); + } break; + + case ShaderLanguage::TYPE_IVEC2: { + glUniform2i(location, 0, 0); + } break; + + case ShaderLanguage::TYPE_IVEC3: { + glUniform3i(location, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_IVEC4: { + glUniform4i(location, 0, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_UINT: { + glUniform1i(location, 0); + } break; + + case ShaderLanguage::TYPE_UVEC2: { + glUniform2i(location, 0, 0); + } break; + + case ShaderLanguage::TYPE_UVEC3: { + glUniform3i(location, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_UVEC4: { + glUniform4i(location, 0, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_FLOAT: { + glUniform1f(location, 0); + } break; + + case ShaderLanguage::TYPE_VEC2: { + glUniform2f(location, 0, 0); + } break; + + case ShaderLanguage::TYPE_VEC3: { + glUniform3f(location, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_VEC4: { + glUniform4f(location, 0, 0, 0, 0); + } break; + + case ShaderLanguage::TYPE_MAT2: { + GLfloat mat[4] = { 0, 0, 0, 0 }; + + glUniformMatrix2fv(location, 1, GL_FALSE, mat); + } break; + + case ShaderLanguage::TYPE_MAT3: { + GLfloat mat[9] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + glUniformMatrix3fv(location, 1, GL_FALSE, mat); + + } break; + + case ShaderLanguage::TYPE_MAT4: { + GLfloat mat[16] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; + + glUniformMatrix4fv(location, 1, GL_FALSE, mat); + + } break; + + case ShaderLanguage::TYPE_SAMPLER2D: { + + } break; + + case ShaderLanguage::TYPE_ISAMPLER2D: { + + } break; + + case ShaderLanguage::TYPE_USAMPLER2D: { + + } break; + + case ShaderLanguage::TYPE_SAMPLERCUBE: { + + } break; + + case ShaderLanguage::TYPE_SAMPLER2DARRAY: + case ShaderLanguage::TYPE_ISAMPLER2DARRAY: + case ShaderLanguage::TYPE_USAMPLER2DARRAY: + case ShaderLanguage::TYPE_SAMPLER3D: + case ShaderLanguage::TYPE_ISAMPLER3D: + case ShaderLanguage::TYPE_USAMPLER3D: { + // Not implemented in GLES2 + } break; + + case ShaderLanguage::TYPE_VOID: { + // Nothing to do? + } break; + default: { + ERR_PRINT("ShaderNode type missing, bug?"); } break; } } diff --git a/drivers/gles2/shaders/canvas.glsl b/drivers/gles2/shaders/canvas.glsl index b13801946f..f72a0d288b 100644 --- a/drivers/gles2/shaders/canvas.glsl +++ b/drivers/gles2/shaders/canvas.glsl @@ -162,6 +162,9 @@ VERTEX_SHADER_CODE #ifdef USE_PIXEL_SNAP outvec.xy = floor(outvec + 0.5).xy; + // precision issue on some hardware creates artifacts within texture + // offset uv by a small amount to avoid + uv += 1e-5; #endif #ifdef USE_SKELETON diff --git a/drivers/gles2/shaders/scene.glsl b/drivers/gles2/shaders/scene.glsl index 371ea8498a..3b0bca982d 100644 --- a/drivers/gles2/shaders/scene.glsl +++ b/drivers/gles2/shaders/scene.glsl @@ -59,6 +59,10 @@ uniform ivec2 skeleton_texture_size; #endif +uniform highp mat4 skeleton_transform; +uniform highp mat4 skeleton_transform_inverse; +uniform bool skeleton_in_world_coords; + #endif #ifdef USE_INSTANCING @@ -404,7 +408,13 @@ void main() { #endif - world_matrix = bone_transform * world_matrix; + if (skeleton_in_world_coords) { + bone_transform = skeleton_transform * (bone_transform * skeleton_transform_inverse); + world_matrix = bone_transform * world_matrix; + } else { + world_matrix = world_matrix * bone_transform; + } + #endif #ifdef USE_INSTANCING diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 227445ae5b..4f4608dca0 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -222,12 +222,12 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasGLES3::_bind_canvas_texture(con } else { - texture = texture->get_ptr(); - if (texture->redraw_if_visible) { //check before proxy, because this is usually used with proxies VisualServerRaster::redraw_request(); } + texture = texture->get_ptr(); + if (texture->render_target) texture->render_target->used_in_frame = true; @@ -263,12 +263,12 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasGLES3::_bind_canvas_texture(con } else { - normal_map = normal_map->get_ptr(); - if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies VisualServerRaster::redraw_request(); } + normal_map = normal_map->get_ptr(); + glActiveTexture(GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, normal_map->tex_id); state.current_normal = p_normal_map; @@ -1402,12 +1402,12 @@ void RasterizerCanvasGLES3::canvas_render_items(Item *p_item_list, int p_z, cons continue; } - t = t->get_ptr(); - if (t->redraw_if_visible) { //check before proxy, because this is usually used with proxies VisualServerRaster::redraw_request(); } + t = t->get_ptr(); + if (storage->config.srgb_decode_supported && t->using_srgb) { //no srgb in 2D glTexParameteri(t->target, _TEXTURE_SRGB_DECODE_EXT, _SKIP_DECODE_EXT); diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index e645e39f3f..0c7d8c53d4 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -1199,12 +1199,12 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m if (t) { - t = t->get_ptr(); //resolve for proxies - if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies VisualServerRaster::redraw_request(); } + t = t->get_ptr(); //resolve for proxies + #ifdef TOOLS_ENABLED if (t->detect_3d) { t->detect_3d(t->detect_3d_ud); @@ -1629,11 +1629,10 @@ void RasterizerSceneGLES3::_render_geometry(RenderList::Element *e) { RasterizerStorageGLES3::Texture *t = storage->texture_owner.get(c.texture); - t = t->get_ptr(); //resolve for proxies - if (t->redraw_if_visible) { VisualServerRaster::redraw_request(); } + t = t->get_ptr(); //resolve for proxies #ifdef TOOLS_ENABLED if (t->detect_3d) { @@ -2044,7 +2043,7 @@ void RasterizerSceneGLES3::_render_list(RenderList::Element **p_elements, int p_ int current_blend_mode = -1; int prev_shading = -1; - RID prev_skeleton; + RasterizerStorageGLES3::Skeleton *prev_skeleton = NULL; state.scene_shader.set_conditional(SceneShaderGLES3::SHADELESS, true); //by default unshaded (easier to set) @@ -2058,7 +2057,10 @@ void RasterizerSceneGLES3::_render_list(RenderList::Element **p_elements, int p_ RenderList::Element *e = p_elements[i]; RasterizerStorageGLES3::Material *material = e->material; - RID skeleton = e->instance->skeleton; + RasterizerStorageGLES3::Skeleton *skeleton = NULL; + if (e->instance->skeleton.is_valid()) { + skeleton = storage->skeleton_owner.getornull(e->instance->skeleton); + } bool rebind = first; @@ -2205,15 +2207,14 @@ void RasterizerSceneGLES3::_render_list(RenderList::Element **p_elements, int p_ } if (prev_skeleton != skeleton) { - if (prev_skeleton.is_valid() != skeleton.is_valid()) { - state.scene_shader.set_conditional(SceneShaderGLES3::USE_SKELETON, skeleton.is_valid()); + if ((prev_skeleton == NULL) != (skeleton == NULL)) { + state.scene_shader.set_conditional(SceneShaderGLES3::USE_SKELETON, skeleton != NULL); rebind = true; } - if (skeleton.is_valid()) { - RasterizerStorageGLES3::Skeleton *sk = storage->skeleton_owner.getornull(skeleton); + if (skeleton) { glActiveTexture(GL_TEXTURE0 + storage->config.max_texture_image_units - 1); - glBindTexture(GL_TEXTURE_2D, sk->texture); + glBindTexture(GL_TEXTURE_2D, skeleton->texture); } } @@ -2240,6 +2241,11 @@ void RasterizerSceneGLES3::_render_list(RenderList::Element **p_elements, int p_ _set_cull(e->sort_key & RenderList::SORT_KEY_MIRROR_FLAG, e->sort_key & RenderList::SORT_KEY_CULL_DISABLED_FLAG, p_reverse_cull); + if (skeleton) { + state.scene_shader.set_uniform(SceneShaderGLES3::SKELETON_TRANSFORM, skeleton->world_transform); + state.scene_shader.set_uniform(SceneShaderGLES3::SKELETON_IN_WORLD_COORDS, skeleton->use_world_transform); + } + state.scene_shader.set_uniform(SceneShaderGLES3::WORLD_TRANSFORM, e->instance->transform); _render_geometry(e); @@ -4250,7 +4256,7 @@ void RasterizerSceneGLES3::render_scene(const Transform &p_cam_transform, const } else { - use_mrt = env && (state.used_sss || env->ssao_enabled || env->ssr_enabled); //only enable MRT rendering if any of these is enabled + use_mrt = env && (state.used_sss || env->ssao_enabled || env->ssr_enabled || env->dof_blur_far_enabled || env->dof_blur_near_enabled); //only enable MRT rendering if any of these is enabled //effects disabled and transparency also prevent using MRTs use_mrt = use_mrt && !storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_TRANSPARENT]; use_mrt = use_mrt && !storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_NO_3D_EFFECTS]; diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index ccd5fff99f..3a6204b731 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -702,14 +702,18 @@ void RasterizerStorageGLES3::texture_allocate(RID p_texture, int p_width, int p_ int mipmaps = 0; - while (width != 1 && height != 1) { - glTexImage3D(texture->target, 0, internal_format, width, height, depth, 0, format, type, NULL); + while (width > 0 || height > 0 || (p_type == VS::TEXTURE_TYPE_3D && depth > 0)) { + width = MAX(1, width); + height = MAX(1, height); + depth = MAX(1, depth); - width = MAX(1, width / 2); - height = MAX(1, height / 2); + glTexImage3D(texture->target, mipmaps, internal_format, width, height, depth, 0, format, type, NULL); + + width /= 2; + height /= 2; if (p_type == VS::TEXTURE_TYPE_3D) { - depth = MAX(1, depth / 2); + depth /= 2; } mipmaps++; @@ -926,6 +930,9 @@ void RasterizerStorageGLES3::texture_set_data(RID p_texture, const Ref<Image> &p h = MAX(1, h >> 1); } + // Handle array and 3D textures, as those set their data per layer. + tsize *= MAX(texture->alloc_depth, 1); + info.texture_mem -= texture->total_data_size; texture->total_data_size = tsize; info.texture_mem += texture->total_data_size; @@ -1496,7 +1503,7 @@ void RasterizerStorageGLES3::texture_debug_usage(List<VS::TextureInfo> *r_info) tinfo.format = t->format; tinfo.width = t->alloc_width; tinfo.height = t->alloc_height; - tinfo.depth = 0; + tinfo.depth = t->alloc_depth; tinfo.bytes = t->total_data_size; r_info->push_back(tinfo); } @@ -3634,6 +3641,7 @@ void RasterizerStorageGLES3::mesh_set_blend_shape_count(RID p_mesh, int p_amount ERR_FAIL_COND(p_amount < 0); mesh->blend_shape_count = p_amount; + mesh->instance_change_notify(true, false); } int RasterizerStorageGLES3::mesh_get_blend_shape_count(RID p_mesh) const { @@ -5134,6 +5142,20 @@ void RasterizerStorageGLES3::skeleton_set_base_transform_2d(RID p_skeleton, cons skeleton->base_transform_2d = p_base_transform; } +void RasterizerStorageGLES3::skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform) { + + Skeleton *skeleton = skeleton_owner.getornull(p_skeleton); + + ERR_FAIL_COND(skeleton->use_2d); + + skeleton->world_transform = p_world_transform; + skeleton->use_world_transform = p_enable; + + if (!skeleton->update_list.in_list()) { + skeleton_update_list.add(&skeleton->update_list); + } +} + void RasterizerStorageGLES3::update_dirty_skeletons() { glActiveTexture(GL_TEXTURE0); @@ -5438,6 +5460,8 @@ RID RasterizerStorageGLES3::reflection_probe_create() { reflection_probe->intensity = 1.0; reflection_probe->interior_ambient = Color(); reflection_probe->interior_ambient_energy = 1.0; + reflection_probe->interior_ambient_probe_contrib = 0.0; + reflection_probe->max_distance = 0; reflection_probe->extents = Vector3(1, 1, 1); reflection_probe->origin_offset = Vector3(0, 0, 0); diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index d1e02e25d6..2994bfb074 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -890,12 +890,15 @@ public: SelfList<Skeleton> update_list; Set<RasterizerScene::InstanceBase *> instances; //instances using skeleton Transform2D base_transform_2d; + bool use_world_transform; + Transform world_transform; Skeleton() : use_2d(false), size(0), texture(0), - update_list(this) { + update_list(this), + use_world_transform(false) { } }; @@ -913,6 +916,7 @@ public: virtual void skeleton_bone_set_transform_2d(RID p_skeleton, int p_bone, const Transform2D &p_transform); virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton, int p_bone) const; virtual void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform); + virtual void skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform); /* Light API */ diff --git a/drivers/gles3/shaders/canvas.glsl b/drivers/gles3/shaders/canvas.glsl index 6c1806a657..0d1e7ee4a1 100644 --- a/drivers/gles3/shaders/canvas.glsl +++ b/drivers/gles3/shaders/canvas.glsl @@ -173,6 +173,9 @@ VERTEX_SHADER_CODE #ifdef USE_PIXEL_SNAP outvec.xy = floor(outvec + 0.5).xy; + // precision issue on some hardware creates artifacts within texture + // offset uv by a small amount to avoid + uv_interp += 1e-5; #endif #ifdef USE_SKELETON diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index 3b06b08dec..630e1c2089 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -302,6 +302,8 @@ out highp float dp_clip; #ifdef USE_SKELETON uniform highp sampler2D skeleton_texture; // texunit:-1 +uniform highp mat4 skeleton_transform; +uniform bool skeleton_in_world_coords; #endif out highp vec4 position_interp; @@ -430,7 +432,14 @@ void main() { vec4(0.0, 0.0, 0.0, 1.0)) * bone_weights.w; - world_matrix = transpose(m) * world_matrix; + if (skeleton_in_world_coords) { + highp mat4 bone_matrix = skeleton_transform * (transpose(m) * inverse(skeleton_transform)); + world_matrix = bone_matrix * world_matrix; + + } else { + + world_matrix = world_matrix * transpose(m); + } } #endif diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 22fb1817d1..97ba1de3db 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -50,6 +50,7 @@ if env['builtin_libpng']: neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/arm_init.c")) neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon_intrinsics.c")) neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/filter_neon.S")) + neon_sources.append(env_neon.Object(thirdparty_dir + "/arm/palette_neon_intrinsics.c")) env.drivers_sources += neon_sources # Godot source files diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 6d8185cdd8..0bf432c78a 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -63,7 +63,11 @@ static void _png_error_function(png_structp, png_const_charp text) { } static void _png_warn_function(png_structp, png_const_charp text) { - +#ifdef TOOLS_ENABLED + if (Engine::get_singleton()->is_editor_hint()) { + if (String(text).begins_with("iCCP")) return; // silences annoying spam emitted to output every time the user opened assetlib + } +#endif WARN_PRINT(text); } diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 499bb4f34b..2f705ec87d 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -348,11 +348,10 @@ size_t DirAccessWindows::get_space_left() { String DirAccessWindows::get_filesystem_type() const { String path = fix_path(const_cast<DirAccessWindows *>(this)->get_current_dir()); - print_line("fixed path: " + path); + int unit_end = path.find(":"); ERR_FAIL_COND_V(unit_end == -1, String()); String unit = path.substr(0, unit_end + 1) + "\\"; - print_line("unit: " + unit); WCHAR szVolumeName[100]; WCHAR szFileSystemName[10]; diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index 6b45ca2cae..6b863a162c 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -692,12 +692,10 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) { p_new_len = MAX(0.001, p_new_len); editing = true; - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Change Animation Length")); undo_redo->add_do_method(animation.ptr(), "set_length", p_new_len); undo_redo->add_undo_method(animation.ptr(), "set_length", animation->get_length()); undo_redo->commit_action(); - *block_animation_update_ptr = false; editing = false; update(); @@ -706,12 +704,10 @@ void AnimationTimelineEdit::_anim_length_changed(double p_new_len) { void AnimationTimelineEdit::_anim_loop_pressed() { - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Change Animation Loop")); undo_redo->add_do_method(animation.ptr(), "set_loop", loop->is_pressed()); undo_redo->add_undo_method(animation.ptr(), "set_loop", animation->has_loop()); undo_redo->commit_action(); - *block_animation_update_ptr = false; } int AnimationTimelineEdit::get_buttons_width() const { @@ -936,10 +932,6 @@ Size2 AnimationTimelineEdit::get_minimum_size() const { return ms; } -void AnimationTimelineEdit::set_block_animation_update_ptr(bool *p_block_ptr) { - block_animation_update_ptr = p_block_ptr; -} - void AnimationTimelineEdit::set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; } @@ -1080,7 +1072,6 @@ void AnimationTimelineEdit::_bind_methods() { AnimationTimelineEdit::AnimationTimelineEdit() { - block_animation_update_ptr = NULL; editing = false; name_limit = 150; zoom = NULL; @@ -1884,12 +1875,10 @@ void AnimationTrackEdit::_gui_input(const Ref<InputEvent> &p_event) { Point2 pos = mb->get_position(); if (check_rect.has_point(pos)) { - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Toggle Track Enabled")); undo_redo->add_do_method(animation.ptr(), "track_set_enabled", track, !animation->track_is_enabled(track)); undo_redo->add_undo_method(animation.ptr(), "track_set_enabled", track, animation->track_is_enabled(track)); undo_redo->commit_action(); - *block_animation_update_ptr = false; update(); accept_event(); } @@ -2186,12 +2175,10 @@ void AnimationTrackEdit::_menu_selected(int p_index) { case MENU_CALL_MODE_CAPTURE: { Animation::UpdateMode update_mode = Animation::UpdateMode(p_index); - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Change Animation Update Mode")); undo_redo->add_do_method(animation.ptr(), "value_track_set_update_mode", track, update_mode); undo_redo->add_undo_method(animation.ptr(), "value_track_set_update_mode", track, animation->value_track_get_update_mode(track)); undo_redo->commit_action(); - *block_animation_update_ptr = false; update(); } break; @@ -2200,24 +2187,20 @@ void AnimationTrackEdit::_menu_selected(int p_index) { case MENU_INTERPOLATION_CUBIC: { Animation::InterpolationType interp_mode = Animation::InterpolationType(p_index - MENU_INTERPOLATION_NEAREST); - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Change Animation Interpolation Mode")); undo_redo->add_do_method(animation.ptr(), "track_set_interpolation_type", track, interp_mode); undo_redo->add_undo_method(animation.ptr(), "track_set_interpolation_type", track, animation->track_get_interpolation_type(track)); undo_redo->commit_action(); - *block_animation_update_ptr = false; update(); } break; case MENU_LOOP_WRAP: case MENU_LOOP_CLAMP: { bool loop_wrap = p_index == MENU_LOOP_WRAP; - *block_animation_update_ptr = true; undo_redo->create_action(TTR("Change Animation Loop Mode")); undo_redo->add_do_method(animation.ptr(), "track_set_interpolation_loop_wrap", track, loop_wrap); undo_redo->add_undo_method(animation.ptr(), "track_set_interpolation_loop_wrap", track, animation->track_get_interpolation_loop_wrap(track)); undo_redo->commit_action(); - *block_animation_update_ptr = false; update(); } break; @@ -2235,10 +2218,6 @@ void AnimationTrackEdit::_menu_selected(int p_index) { } } -void AnimationTrackEdit::set_block_animation_update_ptr(bool *p_block_ptr) { - block_animation_update_ptr = p_block_ptr; -} - void AnimationTrackEdit::cancel_drop() { if (dropping_at != 0) { dropping_at = 0; @@ -2301,7 +2280,6 @@ AnimationTrackEdit::AnimationTrackEdit() { root = NULL; path = NULL; menu = NULL; - block_animation_update_ptr = NULL; clicking_on_name = false; dropping_at = 0; @@ -3384,7 +3362,6 @@ void AnimationTrackEditor::_update_tracks() { track_edit->set_undo_redo(undo_redo); track_edit->set_timeline(timeline); - track_edit->set_block_animation_update_ptr(&block_animation_update); track_edit->set_root(root); track_edit->set_animation_and_track(animation, i); track_edit->set_play_position(timeline->get_play_position()); @@ -3425,7 +3402,7 @@ void AnimationTrackEditor::_animation_changed() { timeline->update(); timeline->update_values(); - if (block_animation_update) { + if (undo_redo->is_commiting_action()) { for (int i = 0; i < track_edits.size(); i++) { track_edits[i]->update(); } @@ -4075,9 +4052,7 @@ void AnimationTrackEditor::_move_selection_commit() { undo_redo->add_undo_method(this, "_select_at_anim", animation, E->key().track, oldpos); } - block_animation_update = true; //animation will change and this is triggered from a signal, so block updates undo_redo->commit_action(); - block_animation_update = false; moving_selection = false; for (int i = 0; i < track_edits.size(); i++) { @@ -4778,7 +4753,6 @@ void AnimationTrackEditor::_bind_methods() { AnimationTrackEditor::AnimationTrackEditor() { root = NULL; - block_animation_update = false; undo_redo = EditorNode::get_singleton()->get_undo_redo(); @@ -4796,7 +4770,6 @@ AnimationTrackEditor::AnimationTrackEditor() { timeline_vbox->add_constant_override("separation", 0); timeline = memnew(AnimationTimelineEdit); - timeline->set_block_animation_update_ptr(&block_animation_update); timeline->set_undo_redo(undo_redo); timeline_vbox->add_child(timeline); timeline->connect("timeline_changed", this, "_timeline_changed"); @@ -4815,7 +4788,6 @@ AnimationTrackEditor::AnimationTrackEditor() { bezier_edit = memnew(AnimationBezierTrackEdit); timeline_vbox->add_child(bezier_edit); - bezier_edit->set_block_animation_update_ptr(&block_animation_update); bezier_edit->set_undo_redo(undo_redo); bezier_edit->set_editor(this); bezier_edit->set_timeline(timeline); diff --git a/editor/animation_track_editor.h b/editor/animation_track_editor.h index 47058839ba..4ad8b6fd68 100644 --- a/editor/animation_track_editor.h +++ b/editor/animation_track_editor.h @@ -76,7 +76,6 @@ class AnimationTimelineEdit : public Range { Rect2 hsize_rect; bool editing; - bool *block_animation_update_ptr; //used to block all tracks re-gen (speed up) bool panning_timeline; float panning_timeline_from; @@ -104,7 +103,6 @@ public: void set_zoom(Range *p_zoom); Range *get_zoom() const { return zoom; } void set_undo_redo(UndoRedo *p_undo_redo); - void set_block_animation_update_ptr(bool *p_block_ptr); void set_play_position(float p_pos); float get_play_position() const; @@ -170,8 +168,6 @@ class AnimationTrackEdit : public Control { void _menu_selected(int p_index); - bool *block_animation_update_ptr; //used to block all tracks re-gen (speed up) - void _path_entered(const String &p_text); void _play_position_draw(); mutable int dropping_at; @@ -216,7 +212,6 @@ public: AnimationTimelineEdit *get_timeline() const { return timeline; } AnimationTrackEditor *get_editor() const { return editor; } UndoRedo *get_undo_redo() const { return undo_redo; } - bool *get_block_animation_update_ptr() { return block_animation_update_ptr; } void set_animation_and_track(const Ref<Animation> &p_animation, int p_track); virtual Size2 get_minimum_size() const; @@ -226,8 +221,6 @@ public: void set_editor(AnimationTrackEditor *p_editor); void set_root(Node *p_root); - void set_block_animation_update_ptr(bool *p_block_ptr); - void set_play_position(float p_pos); void update_play_position(); void cancel_drop(); @@ -313,8 +306,6 @@ class AnimationTrackEditor : public VBoxContainer { Vector<AnimationTrackEdit *> track_edits; Vector<AnimationTrackEditGroup *> groups; - bool block_animation_update; - int _get_track_selected(); void _animation_changed(); void _update_tracks(); diff --git a/editor/animation_track_editor_plugins.cpp b/editor/animation_track_editor_plugins.cpp index 399d561e28..baf417fed7 100644 --- a/editor/animation_track_editor_plugins.cpp +++ b/editor/animation_track_editor_plugins.cpp @@ -1004,12 +1004,10 @@ void AnimationTrackEditTypeAudio::drop_data(const Point2 &p_point, const Variant ofs += 0.001; } - *get_block_animation_update_ptr() = true; get_undo_redo()->create_action(TTR("Add Audio Track Clip")); get_undo_redo()->add_do_method(get_animation().ptr(), "audio_track_insert_key", get_track(), ofs, stream); get_undo_redo()->add_undo_method(get_animation().ptr(), "track_remove_key_at_position", get_track(), ofs); get_undo_redo()->commit_action(); - *get_block_animation_update_ptr() = false; update(); return; @@ -1098,21 +1096,17 @@ void AnimationTrackEditTypeAudio::_gui_input(const Ref<InputEvent> &p_event) { float ofs_local = -len_resizing_rel / get_timeline()->get_zoom_scale(); if (len_resizing_start) { float prev_ofs = get_animation()->audio_track_get_key_start_offset(get_track(), len_resizing_index); - *get_block_animation_update_ptr() = true; get_undo_redo()->create_action(TTR("Change Audio Track Clip Start Offset")); get_undo_redo()->add_do_method(get_animation().ptr(), "audio_track_set_key_start_offset", get_track(), len_resizing_index, prev_ofs + ofs_local); get_undo_redo()->add_undo_method(get_animation().ptr(), "audio_track_set_key_start_offset", get_track(), len_resizing_index, prev_ofs); get_undo_redo()->commit_action(); - *get_block_animation_update_ptr() = false; } else { float prev_ofs = get_animation()->audio_track_get_key_end_offset(get_track(), len_resizing_index); - *get_block_animation_update_ptr() = true; get_undo_redo()->create_action(TTR("Change Audio Track Clip End Offset")); get_undo_redo()->add_do_method(get_animation().ptr(), "audio_track_set_key_end_offset", get_track(), len_resizing_index, prev_ofs + ofs_local); get_undo_redo()->add_undo_method(get_animation().ptr(), "audio_track_set_key_end_offset", get_track(), len_resizing_index, prev_ofs); get_undo_redo()->commit_action(); - *get_block_animation_update_ptr() = false; } len_resizing = false; diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index e9580ae0d1..7ee4d5b03b 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -1144,6 +1144,7 @@ void CodeTextEditor::_update_font() { text_editor->add_font_override("font", get_font("source", "EditorFonts")); Ref<Font> status_bar_font = get_font("status_source", "EditorFonts"); + error->add_font_override("font", status_bar_font); int count = status_bar->get_child_count(); for (int i = 0; i < count; i++) { Control *n = Object::cast_to<Control>(status_bar->get_child(i)); diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 2b9007de04..249bbb2a39 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1163,10 +1163,13 @@ void EditorExport::add_export_preset(const Ref<EditorExportPreset> &p_preset, in String EditorExportPlatform::test_etc2() const { String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); - bool etc2_supported = ProjectSettings::get_singleton()->get("rendering/vram_compression/import_etc"); + bool etc_supported = ProjectSettings::get_singleton()->get("rendering/vram_compression/import_etc"); + bool etc2_supported = ProjectSettings::get_singleton()->get("rendering/vram_compression/import_etc2"); - if (driver == "GLES2" && !etc2_supported) { - return TTR("Target platform requires 'ETC' texture compression for GLES2. Enable support in Project Settings."); + if (driver == "GLES2" && !etc_supported) { + return TTR("Target platform requires 'ETC' texture compression for GLES2. Enable 'rendering/vram_compression/import_etc' in Project Settings."); + } else if (driver == "GLES3" && !etc2_supported) { + return TTR("Target platform requires 'ETC2' texture compression for GLES3. Enable 'rendering/vram_compression/import_etc2' in Project Settings."); } return String(); } @@ -1453,6 +1456,10 @@ List<String> EditorExportPlatformPC::get_binary_extensions(const Ref<EditorExpor Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); + if (!FileAccess::exists(p_path.get_base_dir())) { + return ERR_FILE_BAD_PATH; + } + String custom_debug = p_preset->get("custom_template/debug"); String custom_release = p_preset->get("custom_template/release"); diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index 765a330aaf..da16c16966 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -75,7 +75,7 @@ void EditorFileDialog::_notification(int p_what) { preview_wheel_index++; if (preview_wheel_index >= 8) preview_wheel_index = 0; - Ref<Texture> frame = get_icon("WaitPreview" + itos(preview_wheel_index + 1), "EditorIcons"); + Ref<Texture> frame = get_icon("Progress" + itos(preview_wheel_index + 1), "EditorIcons"); preview->set_texture(frame); preview_wheel_timeout = 0.1; } @@ -323,11 +323,10 @@ void EditorFileDialog::_request_single_thumbnail(const String &p_path) { if (!FileAccess::exists(p_path)) return; - EditorResourcePreview::get_singleton()->queue_resource_preview(p_path, this, "_thumbnail_done", p_path); - set_process(true); preview_waiting = true; preview_wheel_timeout = 0; + EditorResourcePreview::get_singleton()->queue_resource_preview(p_path, this, "_thumbnail_done", p_path); } void EditorFileDialog::_action_pressed() { @@ -1206,8 +1205,10 @@ void EditorFileDialog::_update_favorites() { if (name == current) setthis = true; name = "/"; + + favorites->add_item(name, folder_icon); } else if (name.ends_with("/")) { - if (name == current) + if (name == current || name == current + "/") setthis = true; name = name.substr(0, name.length() - 1); name = name.get_file(); @@ -1230,6 +1231,8 @@ void EditorFileDialog::_favorite_toggled(bool p_toggle) { bool res = access == ACCESS_RESOURCES; String cd = get_current_dir(); + if (!cd.ends_with("/")) + cd += "/"; Vector<String> favorited = EditorSettings::get_singleton()->get_favorites(); @@ -1245,13 +1248,10 @@ void EditorFileDialog::_favorite_toggled(bool p_toggle) { } } - if (found) { + if (found) favorited.erase(cd); - favorite->set_pressed(false); - } else { + else favorited.push_back(cd); - favorite->set_pressed(true); - } EditorSettings::get_singleton()->set_favorites(favorited); @@ -1495,7 +1495,9 @@ EditorFileDialog::EditorFileDialog() { HBoxContainer *pathhb = memnew(HBoxContainer); dir_prev = memnew(ToolButton); + dir_prev->set_tooltip(TTR("Previous Folder")); dir_next = memnew(ToolButton); + dir_next->set_tooltip(TTR("Next Folder")); dir_up = memnew(ToolButton); dir_up->set_tooltip(TTR("Go to parent folder")); @@ -1514,12 +1516,14 @@ EditorFileDialog::EditorFileDialog() { dir->set_h_size_flags(SIZE_EXPAND_FILL); refresh = memnew(ToolButton); + refresh->set_tooltip(TTR("Refresh")); refresh->connect("pressed", this, "_update_file_list"); pathhb->add_child(refresh); favorite = memnew(ToolButton); favorite->set_flat(true); favorite->set_toggle_mode(true); + favorite->set_tooltip(TTR("(Un)favorite current folder.")); favorite->connect("toggled", this, "_favorite_toggled"); pathhb->add_child(favorite); @@ -1533,6 +1537,7 @@ EditorFileDialog::EditorFileDialog() { mode_thumbnails->set_toggle_mode(true); mode_thumbnails->set_pressed(display_mode == DISPLAY_THUMBNAILS); mode_thumbnails->set_button_group(view_mode_group); + mode_thumbnails->set_tooltip(TTR("View items as a grid of thumbnails.")); pathhb->add_child(mode_thumbnails); mode_list = memnew(ToolButton); @@ -1540,6 +1545,7 @@ EditorFileDialog::EditorFileDialog() { mode_list->set_toggle_mode(true); mode_list->set_pressed(display_mode == DISPLAY_LIST); mode_list->set_button_group(view_mode_group); + mode_list->set_tooltip(TTR("View items as a list.")); pathhb->add_child(mode_list); drives = memnew(OptionButton); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 8a9835c977..a29b50185c 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -619,7 +619,11 @@ void EditorNode::save_resource_in_path(const Ref<Resource> &p_resource, const St Error err = ResourceSaver::save(path, p_resource, flg | ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS); if (err != OK) { - show_accept(TTR("Error saving resource!"), TTR("OK")); + if (ResourceLoader::is_imported(p_resource->get_path())) { + show_accept(TTR("Imported resources can't be saved."), TTR("OK")); + } else { + show_accept(TTR("Error saving resource!"), TTR("OK")); + } return; } @@ -639,6 +643,18 @@ void EditorNode::save_resource(const Ref<Resource> &p_resource) { void EditorNode::save_resource_as(const Ref<Resource> &p_resource, const String &p_at_path) { + { + String path = p_resource->get_path(); + int srpos = path.find("::"); + if (srpos != -1) { + String base = path.substr(0, srpos); + if (!get_edited_scene() || get_edited_scene()->get_filename() != base) { + show_warning(TTR("This resource can't be saved because it does not belong to the edited scene. Make it unique first.")); + return; + } + } + } + file->set_mode(EditorFileDialog::MODE_SAVE_FILE); saving_resource = p_resource; @@ -1444,7 +1460,7 @@ void EditorNode::edit_item(Object *p_object) { _set_editing_top_editors(p_object); _display_top_editors(true); } else { - _hide_top_editors(); + hide_top_editors(); } } @@ -1482,7 +1498,7 @@ void EditorNode::_save_default_environment() { } } -void EditorNode::_hide_top_editors() { +void EditorNode::hide_top_editors() { _display_top_editors(false); @@ -1659,7 +1675,7 @@ void EditorNode::_edit_current() { } else if (!editor_plugins_over->get_plugins_list().empty()) { - _hide_top_editors(); + hide_top_editors(); } } @@ -2852,7 +2868,7 @@ bool EditorNode::is_changing_scene() const { void EditorNode::_clear_undo_history() { - get_undo_redo()->clear_history(); + get_undo_redo()->clear_history(false); } void EditorNode::set_current_scene(int p_idx) { @@ -4850,6 +4866,7 @@ void EditorNode::_print_handler(void *p_this, const String &p_string, bool p_err EditorNode::EditorNode() { + Input::get_singleton()->set_use_accumulated_input(true); Resource::_get_local_scene_func = _resource_get_edited_scene; VisualServer::get_singleton()->textures_keep_original(true); @@ -5659,7 +5676,6 @@ EditorNode::EditorNode() { filesystem_dock = memnew(FileSystemDock(this)); filesystem_dock->connect("open", this, "open_request"); - filesystem_dock->set_file_list_display_mode(FileSystemDock::FILE_LIST_DISPLAY_LIST); filesystem_dock->connect("instance", this, "_instance_request"); filesystem_dock->connect("display_mode_changed", this, "_save_docks"); @@ -5888,6 +5904,8 @@ EditorNode::EditorNode() { add_editor_plugin(memnew(SkeletonEditorPlugin(this))); add_editor_plugin(memnew(SkeletonIKEditorPlugin(this))); add_editor_plugin(memnew(PhysicalBonePlugin(this))); + add_editor_plugin(memnew(MeshEditorPlugin(this))); + add_editor_plugin(memnew(MaterialEditorPlugin(this))); for (int i = 0; i < EditorPlugins::get_plugin_count(); i++) add_editor_plugin(EditorPlugins::create(i, this)); diff --git a/editor/editor_node.h b/editor/editor_node.h index 192dc649e9..267c70c773 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -452,7 +452,6 @@ private: void _instance_request(const Vector<String> &p_files); - void _hide_top_editors(); void _display_top_editors(bool p_display); void _set_top_editors(Vector<EditorPlugin *> p_editor_plugins_over); void _set_editing_top_editors(Object *p_current_object); @@ -677,6 +676,7 @@ public: void edit_item(Object *p_object); void edit_item_resource(RES p_resource); bool item_has_editor(Object *p_object); + void hide_top_editors(); void open_request(const String &p_path); diff --git a/editor/editor_properties.cpp b/editor/editor_properties.cpp index a07cffb078..2b8d5bf6c9 100644 --- a/editor/editor_properties.cpp +++ b/editor/editor_properties.cpp @@ -2443,6 +2443,38 @@ void EditorPropertyResource::_open_editor_pressed() { } } +void EditorPropertyResource::_fold_other_editors(Object *p_self) { + + if (this == p_self) { + return; + } + + RES res = get_edited_object()->get(get_edited_property()); + + if (!res.is_valid()) + return; + bool use_editor = false; + for (int i = 0; i < EditorNode::get_singleton()->get_editor_data().get_editor_plugin_count(); i++) { + EditorPlugin *ep = EditorNode::get_singleton()->get_editor_data().get_editor_plugin(i); + if (ep->handles(res.ptr())) { + use_editor = true; + } + } + + if (!use_editor) + return; + bool unfolded = get_edited_object()->editor_is_section_unfolded(get_edited_property()); + + opened_editor = false; + + if (unfolded) { + //refold + assign->set_pressed(false); + get_edited_object()->editor_set_section_unfold(get_edited_property(), false); + update_property(); + } +} + void EditorPropertyResource::update_property() { RES res = get_edited_object()->get(get_edited_property()); @@ -2487,12 +2519,20 @@ void EditorPropertyResource::update_property() { } if (use_editor) { + //open editor directly and hide other open of these + _open_editor_pressed(); + if (is_inside_tree()) { + get_tree()->call_deferred("call_group", "_editor_resource_properties", "_fold_other_editors", this); + } + opened_editor = true; + /* Button *open_in_editor = memnew(Button); open_in_editor->set_text(TTR("Open Editor")); open_in_editor->set_icon(get_icon("Edit", "EditorIcons")); sub_inspector_vbox->add_child(open_in_editor); open_in_editor->connect("pressed", this, "_open_editor_pressed"); open_in_editor->set_h_size_flags(SIZE_SHRINK_CENTER); + */ } } @@ -2506,6 +2546,10 @@ void EditorPropertyResource::update_property() { memdelete(sub_inspector_vbox); sub_inspector = NULL; sub_inspector_vbox = NULL; + if (opened_editor) { + EditorNode::get_singleton()->hide_top_editors(); + opened_editor = false; + } } } #endif @@ -2547,7 +2591,8 @@ void EditorPropertyResource::_resource_selected() { if (use_sub_inspector) { - get_edited_object()->editor_set_section_unfold(get_edited_property(), assign->is_pressed()); + bool unfold = !get_edited_object()->editor_is_section_unfolded(get_edited_property()); + get_edited_object()->editor_set_section_unfold(get_edited_property(), unfold); update_property(); } else { @@ -2726,10 +2771,12 @@ void EditorPropertyResource::_bind_methods() { ClassDB::bind_method(D_METHOD("_button_draw"), &EditorPropertyResource::_button_draw); ClassDB::bind_method(D_METHOD("_open_editor_pressed"), &EditorPropertyResource::_open_editor_pressed); ClassDB::bind_method(D_METHOD("_button_input"), &EditorPropertyResource::_button_input); + ClassDB::bind_method(D_METHOD("_fold_other_editors"), &EditorPropertyResource::_fold_other_editors); } EditorPropertyResource::EditorPropertyResource() { + opened_editor = false; sub_inspector = NULL; sub_inspector_vbox = NULL; use_sub_inspector = bool(EDITOR_GET("interface/inspector/open_resources_in_current_inspector")); @@ -2766,6 +2813,8 @@ EditorPropertyResource::EditorPropertyResource() { file = NULL; scene_tree = NULL; dropping = false; + + add_to_group("_editor_resource_properties"); } ////////////// DEFAULT PLUGIN ////////////////////// diff --git a/editor/editor_properties.h b/editor/editor_properties.h index df01ee83b5..574767890c 100644 --- a/editor/editor_properties.h +++ b/editor/editor_properties.h @@ -581,6 +581,9 @@ class EditorPropertyResource : public EditorProperty { void _button_input(const Ref<InputEvent> &p_event); void _open_editor_pressed(); + void _fold_other_editors(Object *p_self); + + bool opened_editor; protected: static void _bind_methods(); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index e0c292dc87..9345ea6b6f 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -313,6 +313,8 @@ void EditorResourcePreview::_thread() { preview_mutex->unlock(); } } + + exited = true; } void EditorResourcePreview::queue_edited_resource_preview(const Ref<Resource> &p_res, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata) { @@ -420,11 +422,16 @@ void EditorResourcePreview::check_for_invalidation(const String &p_path) { void EditorResourcePreview::start() { ERR_FAIL_COND(thread); thread = Thread::create(_thread_func, this); + exited = false; } void EditorResourcePreview::stop() { if (thread) { exit = true; preview_sem->post(); + while (!exited) { + OS::get_singleton()->delay_usec(10000); + VisualServer::get_singleton()->sync(); //sync pending stuff, as thread may be blocked on visual server + } Thread::wait_to_finish(thread); memdelete(thread); thread = NULL; @@ -438,6 +445,7 @@ EditorResourcePreview::EditorResourcePreview() { preview_sem = Semaphore::create(); order = 0; exit = false; + exited = false; } EditorResourcePreview::~EditorResourcePreview() { diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index c958bfbb74..9b9223a818 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -36,24 +36,6 @@ #include "scene/main/node.h" #include "scene/resources/texture.h" -/* make previews for: -*packdscene -*wav -*image -*mesh --font -*script -*material --shader --shader graph? --navigation mesh --collision? --occluder polygon --navigation polygon --tileset --curve and curve2D -*/ - class EditorResourcePreviewGenerator : public Reference { GDCLASS(EditorResourcePreviewGenerator, Reference); @@ -90,7 +72,8 @@ class EditorResourcePreview : public Node { Mutex *preview_mutex; Semaphore *preview_sem; Thread *thread; - bool exit; + volatile bool exit; + volatile bool exited; struct Item { Ref<Texture> preview; diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 741a210950..94473cb989 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -780,12 +780,6 @@ void EditorSettings::create() { // Validate/create data dir and subdirectories dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); - if (dir->change_dir(data_path) != OK) { - ERR_PRINT("Cannot find path for data directory!"); - memdelete(dir); - goto fail; - } - if (dir->change_dir(data_dir) != OK) { dir->make_dir_recursive(data_dir); if (dir->change_dir(data_dir) != OK) { diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 3fe19c0b31..bc42a3f23b 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -641,9 +641,13 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_icon("visibility_xray", "PopupMenu", theme->get_icon("GuiVisibilityXray", "EditorIcons")); theme->set_constant("vseparation", "PopupMenu", (extra_spacing + default_margin_size + 1) * EDSCALE); - Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1, 2, 0, 0, 0); + Ref<StyleBoxFlat> sub_inspector_bg = make_flat_stylebox(dark_color_1.linear_interpolate(accent_color, 0.08), 2, 0, 2, 2); sub_inspector_bg->set_border_width(MARGIN_LEFT, 2); sub_inspector_bg->set_border_color(MARGIN_LEFT, accent_color * Color(1, 1, 1, 0.3)); + sub_inspector_bg->set_border_width(MARGIN_RIGHT, 2); + sub_inspector_bg->set_border_color(MARGIN_RIGHT, accent_color * Color(1, 1, 1, 0.3)); + sub_inspector_bg->set_border_width(MARGIN_BOTTOM, 2); + sub_inspector_bg->set_border_color(MARGIN_BOTTOM, accent_color * Color(1, 1, 1, 0.3)); sub_inspector_bg->set_draw_center(true); theme->set_stylebox("sub_inspector_bg", "Editor", sub_inspector_bg); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 9bd6063a71..b5d9071199 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -283,7 +283,7 @@ void FileSystemDock::_notification(int p_what) { String ei = "EditorIcons"; button_reload->set_icon(get_icon("Reload", ei)); button_toggle_display_mode->set_icon(get_icon("Panels2", ei)); - button_file_list_display_mode->connect("toggled", this, "_toggle_file_display"); + button_file_list_display_mode->connect("pressed", this, "_toggle_file_display"); files->connect("item_activated", this, "_file_list_activate_file"); button_hist_next->connect("pressed", this, "_fw_history"); @@ -302,6 +302,8 @@ void FileSystemDock::_notification(int p_what) { always_show_folders = bool(EditorSettings::get_singleton()->get("docks/filesystem/always_show_folders")); + set_file_list_display_mode(FileSystemDock::FILE_LIST_DISPLAY_LIST); + _update_display_mode(); if (EditorFileSystem::get_singleton()->is_scanning()) { @@ -348,7 +350,7 @@ void FileSystemDock::_notification(int p_what) { button_toggle_display_mode->set_icon(get_icon("Panels2", ei)); button_hist_next->set_icon(get_icon("Forward", ei)); button_hist_prev->set_icon(get_icon("Back", ei)); - if (button_file_list_display_mode->is_pressed()) { + if (file_list_display_mode == FILE_LIST_DISPLAY_LIST) { button_file_list_display_mode->set_icon(get_icon("FileThumbnail", "EditorIcons")); } else { button_file_list_display_mode->set_icon(get_icon("FileList", "EditorIcons")); @@ -499,8 +501,8 @@ void FileSystemDock::_tree_thumbnail_done(const String &p_path, const Ref<Textur } } -void FileSystemDock::_toggle_file_display(bool p_active) { - _set_file_display(p_active); +void FileSystemDock::_toggle_file_display() { + _set_file_display(file_list_display_mode != FILE_LIST_DISPLAY_LIST); emit_signal("display_mode_changed"); } @@ -1690,8 +1692,7 @@ void FileSystemDock::set_file_list_display_mode(FileListDisplayMode p_mode) { if (p_mode == file_list_display_mode) return; - button_file_list_display_mode->set_pressed(p_mode == FILE_LIST_DISPLAY_LIST); - _toggle_file_display(p_mode == FILE_LIST_DISPLAY_LIST); + _toggle_file_display(); } Variant FileSystemDock::get_drag_data_fw(const Point2 &p_point, Control *p_from) { @@ -2375,29 +2376,6 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { tree_search_box->connect("text_changed", this, "_search_changed", varray(tree_search_box)); toolbar2_hbc->add_child(tree_search_box); - //toolbar_hbc->add_spacer(); - - //Control *spacer = memnew( Control); - - /* - button_open = memnew( Button ); - button_open->set_flat(true); - button_open->connect("pressed",this,"_tree_toggle_collapsed"); - toolbar_hbc->add_child(button_open); - button_open->hide(); - button_open->set_focus_mode(FOCUS_NONE); - button_open->set_tooltip("Open the selected file.\nOpen as scene if a scene, or as resource otherwise."); - - - button_instance = memnew( Button ); - button_instance->set_flat(true); - button_instance->connect("pressed",this,"_instance_pressed"); - toolbar_hbc->add_child(button_instance); - button_instance->hide(); - button_instance->set_focus_mode(FOCUS_NONE); - button_instance->set_tooltip(TTR("Instance the selected scene(s) as child of the selected node.")); - -*/ file_list_popup = memnew(PopupMenu); file_list_popup->set_hide_on_window_lose_focus(true); add_child(file_list_popup); @@ -2439,7 +2417,6 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { path_hb->add_child(file_list_search_box); button_file_list_display_mode = memnew(ToolButton); - button_file_list_display_mode->set_toggle_mode(true); path_hb->add_child(button_file_list_display_mode); files = memnew(ItemList); diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 7cf37a7634..cd052f9700 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -181,7 +181,7 @@ private: void _tree_gui_input(Ref<InputEvent> p_event); void _update_file_list(bool p_keep_selection); - void _toggle_file_display(bool p_active); + void _toggle_file_display(); void _set_file_display(bool p_active); void _fs_changed(); diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 652f1ebac9..44eaf3d9ef 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -176,7 +176,7 @@ Error ColladaImport::_create_scene_skeletons(Collada::Node *p_node) { Skeleton *sk = memnew(Skeleton); int bone = 0; - + sk->set_use_bones_in_world_transform(true); // This improves compatibility in Collada for (int i = 0; i < p_node->children.size(); i++) { _populate_skeleton(sk, p_node->children[i], bone, -1); diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index ff2f68ffd3..7032146229 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -892,9 +892,11 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { primitive = primitives2[mode]; } + ERR_FAIL_COND_V(!a.has("POSITION"), ERR_PARSE_ERROR); if (a.has("POSITION")) { array[Mesh::ARRAY_VERTEX] = _decode_accessor_as_vec3(state, a["POSITION"], true); } + if (a.has("NORMAL")) { array[Mesh::ARRAY_NORMAL] = _decode_accessor_as_vec3(state, a["NORMAL"], true); } @@ -2119,6 +2121,7 @@ Spatial *EditorSceneImporterGLTF::_generate_scene(GLTFState &state, int p_bake_f Vector<Skeleton *> skeletons; for (int i = 0; i < state.skins.size(); i++) { Skeleton *s = memnew(Skeleton); + s->set_use_bones_in_world_transform(false); //GLTF does not need this since meshes are always local String name = state.skins[i].name; if (name == "") { name = _gen_unique_name(state, "Skeleton"); diff --git a/editor/import/resource_importer_csv_translation.cpp b/editor/import/resource_importer_csv_translation.cpp index b4b3e0e551..cfcdbc8de4 100644 --- a/editor/import/resource_importer_csv_translation.cpp +++ b/editor/import/resource_importer_csv_translation.cpp @@ -119,7 +119,7 @@ Error ResourceImporterCSVTranslation::import(const String &p_source_file, const if (key != "") { for (int i = 1; i < line.size(); i++) { - translations.write[i - 1]->add_message(key, line[i]); + translations.write[i - 1]->add_message(key, line[i].c_unescape()); } } diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index 76552575da..5eb1d2ec6c 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -1240,7 +1240,7 @@ Error ResourceImporterScene::import(const String &p_source_file, const String &p String root_type = p_options["nodes/root_type"]; - if (scene->get_class() != root_type) { + if (root_type != "Spatial") { Node *base_node = Object::cast_to<Node>(ClassDB::instance(root_type)); if (base_node) { diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index ab3936407b..a9e9607bc5 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -177,6 +177,8 @@ void EditorAssetLibraryItemDescription::set_image(int p_type, int p_index, const thumbnail = thumbnail->duplicate(); Point2 overlay_pos = Point2((thumbnail->get_width() - overlay->get_width()) / 2, (thumbnail->get_height() - overlay->get_height()) / 2); + // Overlay and thumbnail need the same format for `blend_rect` to work. + thumbnail->convert(Image::FORMAT_RGBA8); thumbnail->lock(); thumbnail->blend_rect(overlay, overlay->get_used_rect(), overlay_pos); thumbnail->unlock(); diff --git a/editor/plugins/material_editor_plugin.cpp b/editor/plugins/material_editor_plugin.cpp index ce8cc77802..ebacccb03c 100644 --- a/editor/plugins/material_editor_plugin.cpp +++ b/editor/plugins/material_editor_plugin.cpp @@ -32,6 +32,210 @@ #include "scene/resources/particles_material.h" +void MaterialEditor::_notification(int p_what) { + + if (p_what == NOTIFICATION_PHYSICS_PROCESS) { + } + + if (p_what == NOTIFICATION_READY) { + + //get_scene()->connect("node_removed",this,"_node_removed"); + + if (first_enter) { + //it's in propertyeditor so.. could be moved around + + light_1_switch->set_normal_texture(get_icon("MaterialPreviewLight1", "EditorIcons")); + light_1_switch->set_pressed_texture(get_icon("MaterialPreviewLight1Off", "EditorIcons")); + light_2_switch->set_normal_texture(get_icon("MaterialPreviewLight2", "EditorIcons")); + light_2_switch->set_pressed_texture(get_icon("MaterialPreviewLight2Off", "EditorIcons")); + + sphere_switch->set_normal_texture(get_icon("MaterialPreviewSphereOff", "EditorIcons")); + sphere_switch->set_pressed_texture(get_icon("MaterialPreviewSphere", "EditorIcons")); + box_switch->set_normal_texture(get_icon("MaterialPreviewCubeOff", "EditorIcons")); + box_switch->set_pressed_texture(get_icon("MaterialPreviewCube", "EditorIcons")); + + first_enter = false; + } + } + + if (p_what == NOTIFICATION_DRAW) { + + Ref<Texture> checkerboard = get_icon("Checkerboard", "EditorIcons"); + Size2 size = get_size(); + + draw_texture_rect(checkerboard, Rect2(Point2(), size), true); + } +} + +void MaterialEditor::edit(Ref<Material> p_material, const Ref<Environment> &p_env) { + + material = p_material; + camera->set_environment(p_env); + if (!material.is_null()) { + sphere_instance->set_material_override(material); + box_instance->set_material_override(material); + } else { + + hide(); + } +} + +void MaterialEditor::_button_pressed(Node *p_button) { + + if (p_button == light_1_switch) { + light1->set_visible(!light_1_switch->is_pressed()); + } + + if (p_button == light_2_switch) { + light2->set_visible(!light_2_switch->is_pressed()); + } + + if (p_button == box_switch) { + box_instance->show(); + sphere_instance->hide(); + box_switch->set_pressed(true); + sphere_switch->set_pressed(false); + } + + if (p_button == sphere_switch) { + box_instance->hide(); + sphere_instance->show(); + box_switch->set_pressed(false); + sphere_switch->set_pressed(true); + } +} + +void MaterialEditor::_bind_methods() { + + ClassDB::bind_method(D_METHOD("_button_pressed"), &MaterialEditor::_button_pressed); +} + +MaterialEditor::MaterialEditor() { + + vc = memnew(ViewportContainer); + vc->set_stretch(true); + add_child(vc); + vc->set_anchors_and_margins_preset(PRESET_WIDE); + viewport = memnew(Viewport); + Ref<World> world; + world.instance(); + viewport->set_world(world); //use own world + vc->add_child(viewport); + viewport->set_disable_input(true); + viewport->set_transparent_background(true); + viewport->set_msaa(Viewport::MSAA_4X); + + camera = memnew(Camera); + camera->set_transform(Transform(Basis(), Vector3(0, 0, 3))); + camera->set_perspective(45, 0.1, 10); + camera->make_current(); + viewport->add_child(camera); + + light1 = memnew(DirectionalLight); + light1->set_transform(Transform().looking_at(Vector3(-1, -1, -1), Vector3(0, 1, 0))); + viewport->add_child(light1); + + light2 = memnew(DirectionalLight); + light2->set_transform(Transform().looking_at(Vector3(0, 1, 0), Vector3(0, 0, 1))); + light2->set_color(Color(0.7, 0.7, 0.7)); + viewport->add_child(light2); + + sphere_instance = memnew(MeshInstance); + viewport->add_child(sphere_instance); + + box_instance = memnew(MeshInstance); + viewport->add_child(box_instance); + + Transform box_xform; + box_xform.basis.rotate(Vector3(1, 0, 0), Math::deg2rad(25.0)); + box_xform.basis = box_xform.basis * Basis().rotated(Vector3(0, 1, 0), Math::deg2rad(-25.0)); + box_xform.basis.scale(Vector3(0.8, 0.8, 0.8)); + box_xform.origin.y = 0.2; + box_instance->set_transform(box_xform); + + sphere_mesh.instance(); + sphere_instance->set_mesh(sphere_mesh); + box_mesh.instance(); + box_instance->set_mesh(box_mesh); + box_instance->hide(); + + set_custom_minimum_size(Size2(1, 150) * EDSCALE); + + HBoxContainer *hb = memnew(HBoxContainer); + add_child(hb); + hb->set_anchors_and_margins_preset(Control::PRESET_WIDE, Control::PRESET_MODE_MINSIZE, 2); + + VBoxContainer *vb_shape = memnew(VBoxContainer); + hb->add_child(vb_shape); + + sphere_switch = memnew(TextureButton); + sphere_switch->set_toggle_mode(true); + sphere_switch->set_pressed(true); + vb_shape->add_child(sphere_switch); + sphere_switch->connect("pressed", this, "_button_pressed", varray(sphere_switch)); + + box_switch = memnew(TextureButton); + box_switch->set_toggle_mode(true); + box_switch->set_pressed(false); + vb_shape->add_child(box_switch); + box_switch->connect("pressed", this, "_button_pressed", varray(box_switch)); + + hb->add_spacer(); + + VBoxContainer *vb_light = memnew(VBoxContainer); + hb->add_child(vb_light); + + light_1_switch = memnew(TextureButton); + light_1_switch->set_toggle_mode(true); + vb_light->add_child(light_1_switch); + light_1_switch->connect("pressed", this, "_button_pressed", varray(light_1_switch)); + + light_2_switch = memnew(TextureButton); + light_2_switch->set_toggle_mode(true); + vb_light->add_child(light_2_switch); + light_2_switch->connect("pressed", this, "_button_pressed", varray(light_2_switch)); + + first_enter = true; +} + +/////////////////////// + +bool EditorInspectorPluginMaterial::can_handle(Object *p_object) { + + Material *material = Object::cast_to<Material>(p_object); + if (!material) + return false; + + return material->get_shader_mode() == Shader::MODE_SPATIAL; +} + +void EditorInspectorPluginMaterial::parse_begin(Object *p_object) { + + Material *material = Object::cast_to<Material>(p_object); + if (!material) { + return; + } + Ref<Material> m(material); + + MaterialEditor *editor = memnew(MaterialEditor); + editor->edit(m, env); + add_custom_control(editor); +} + +EditorInspectorPluginMaterial::EditorInspectorPluginMaterial() { + env.instance(); + Ref<ProceduralSky> proc_sky = memnew(ProceduralSky(true)); + env->set_sky(proc_sky); + env->set_background(Environment::BG_COLOR_SKY); +} + +MaterialEditorPlugin::MaterialEditorPlugin(EditorNode *p_node) { + + Ref<EditorInspectorPluginMaterial> plugin; + plugin.instance(); + add_inspector_plugin(plugin); +} + String SpatialMaterialConversionPlugin::converts_to() const { return "ShaderMaterial"; diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 39935d3e12..c3f14c27e5 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -32,6 +32,71 @@ #define MATERIAL_EDITOR_PLUGIN_H #include "editor/property_editor.h" +#include "scene/resources/primitive_meshes.h" + +#include "editor/editor_node.h" +#include "editor/editor_plugin.h" +#include "scene/3d/camera.h" +#include "scene/3d/light.h" +#include "scene/3d/mesh_instance.h" +#include "scene/resources/material.h" + +class MaterialEditor : public Control { + + GDCLASS(MaterialEditor, Control); + + ViewportContainer *vc; + Viewport *viewport; + MeshInstance *sphere_instance; + MeshInstance *box_instance; + DirectionalLight *light1; + DirectionalLight *light2; + Camera *camera; + + Ref<SphereMesh> sphere_mesh; + Ref<CubeMesh> box_mesh; + + TextureButton *sphere_switch; + TextureButton *box_switch; + + TextureButton *light_1_switch; + TextureButton *light_2_switch; + + Ref<Material> material; + + void _button_pressed(Node *p_button); + bool first_enter; + +protected: + void _notification(int p_what); + + static void _bind_methods(); + +public: + void edit(Ref<Material> p_material, const Ref<Environment> &p_env); + MaterialEditor(); +}; + +class EditorInspectorPluginMaterial : public EditorInspectorPlugin { + GDCLASS(EditorInspectorPluginMaterial, EditorInspectorPlugin) + Ref<Environment> env; + +public: + virtual bool can_handle(Object *p_object); + virtual void parse_begin(Object *p_object); + + EditorInspectorPluginMaterial(); +}; + +class MaterialEditorPlugin : public EditorPlugin { + + GDCLASS(MaterialEditorPlugin, EditorPlugin); + +public: + virtual String get_name() const { return "Material"; } + + MaterialEditorPlugin(EditorNode *p_node); +}; class SpatialMaterialConversionPlugin : public EditorResourceConversionPlugin { GDCLASS(SpatialMaterialConversionPlugin, EditorResourceConversionPlugin) diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index fcf515e3fc..6203035e25 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -80,26 +80,21 @@ void MeshEditor::edit(Ref<Mesh> p_mesh) { mesh = p_mesh; mesh_instance->set_mesh(mesh); - if (mesh.is_null()) { - - hide(); - } else { - rot_x = 0; - rot_y = 0; - _update_rotation(); - - AABB aabb = mesh->get_aabb(); - Vector3 ofs = aabb.position + aabb.size * 0.5; - float m = aabb.get_longest_axis_size(); - if (m != 0) { - m = 1.0 / m; - m *= 0.5; - Transform xform; - xform.basis.scale(Vector3(m, m, m)); - xform.origin = -xform.basis.xform(ofs); //-ofs*m; - //xform.origin.z -= aabb.get_longest_axis_size() * 2; - mesh_instance->set_transform(xform); - } + rot_x = Math::deg2rad(-15.0); + rot_y = Math::deg2rad(30.0); + _update_rotation(); + + AABB aabb = mesh->get_aabb(); + Vector3 ofs = aabb.position + aabb.size * 0.5; + float m = aabb.get_longest_axis_size(); + if (m != 0) { + m = 1.0 / m; + m *= 0.5; + Transform xform; + xform.basis.scale(Vector3(m, m, m)); + xform.origin = -xform.basis.xform(ofs); //-ofs*m; + //xform.origin.z -= aabb.get_longest_axis_size() * 2; + mesh_instance->set_transform(xform); } } @@ -128,8 +123,8 @@ MeshEditor::MeshEditor() { viewport->set_world(world); //use own world add_child(viewport); viewport->set_disable_input(true); + viewport->set_msaa(Viewport::MSAA_2X); set_stretch(true); - camera = memnew(Camera); camera->set_transform(Transform(Basis(), Vector3(0, 0, 1.1))); camera->set_perspective(45, 0.1, 10); @@ -176,39 +171,29 @@ MeshEditor::MeshEditor() { rot_y = 0; } -void MeshEditorPlugin::edit(Object *p_object) { - - Mesh *s = Object::cast_to<Mesh>(p_object); - if (!s) - return; - - mesh_editor->edit(Ref<Mesh>(s)); -} +/////////////////////// -bool MeshEditorPlugin::handles(Object *p_object) const { +bool EditorInspectorPluginMesh::can_handle(Object *p_object) { - return p_object->is_class("Mesh"); + return Object::cast_to<Mesh>(p_object) != NULL; } -void MeshEditorPlugin::make_visible(bool p_visible) { +void EditorInspectorPluginMesh::parse_begin(Object *p_object) { - if (p_visible) { - mesh_editor->show(); - //mesh_editor->set_process(true); - } else { - - mesh_editor->hide(); - //mesh_editor->set_process(false); + Mesh *mesh = Object::cast_to<Mesh>(p_object); + if (!mesh) { + return; } + Ref<Mesh> m(mesh); + + MeshEditor *editor = memnew(MeshEditor); + editor->edit(m); + add_custom_control(editor); } MeshEditorPlugin::MeshEditorPlugin(EditorNode *p_node) { - editor = p_node; - mesh_editor = memnew(MeshEditor); - add_control_to_container(CONTAINER_PROPERTY_EDITOR_BOTTOM, mesh_editor); - mesh_editor->hide(); -} - -MeshEditorPlugin::~MeshEditorPlugin() { + Ref<EditorInspectorPluginMesh> plugin; + plugin.instance(); + add_inspector_plugin(plugin); } diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index 0275f45be9..8ada2dac90 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -72,22 +72,21 @@ public: MeshEditor(); }; +class EditorInspectorPluginMesh : public EditorInspectorPlugin { + GDCLASS(EditorInspectorPluginMesh, EditorInspectorPlugin) +public: + virtual bool can_handle(Object *p_object); + virtual void parse_begin(Object *p_object); +}; + class MeshEditorPlugin : public EditorPlugin { GDCLASS(MeshEditorPlugin, EditorPlugin); - MeshEditor *mesh_editor; - EditorNode *editor; - public: virtual String get_name() const { return "Mesh"; } - bool has_main_screen() const { return false; } - virtual void edit(Object *p_object); - virtual bool handles(Object *p_object) const; - virtual void make_visible(bool p_visible); MeshEditorPlugin(EditorNode *p_node); - ~MeshEditorPlugin(); }; #endif diff --git a/editor/plugins/particles_2d_editor_plugin.cpp b/editor/plugins/particles_2d_editor_plugin.cpp index bb7d50a9c1..d00687f7ea 100644 --- a/editor/plugins/particles_2d_editor_plugin.cpp +++ b/editor/plugins/particles_2d_editor_plugin.cpp @@ -133,7 +133,10 @@ void Particles2DEditorPlugin::_generate_visibility_rect() { particles->set_emitting(false); } - particles->set_visibility_rect(rect); + undo_redo->create_action(TTR("Generate Visibility Rect")); + undo_redo->add_do_method(particles, "set_visibility_rect", rect); + undo_redo->add_undo_method(particles, "set_visibility_rect", particles->get_visibility_rect()); + undo_redo->commit_action(); } void Particles2DEditorPlugin::_generate_emission_mask() { diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index 95828064ac..0032850535 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -353,7 +353,11 @@ void ParticlesEditor::_generate_aabb() { node->set_emitting(false); } - node->set_visibility_aabb(rect); + UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); + ur->create_action(TTR("Generate Visibility AABB")); + ur->add_do_method(node, "set_visibility_aabb", rect); + ur->add_undo_method(node, "set_visibility_aabb", node->get_visibility_aabb()); + ur->commit_action(); } void ParticlesEditor::edit(Particles *p_particles) { diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 020a68a7ed..033a6c56d9 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -47,6 +47,9 @@ Ref<Shader> ShaderTextEditor::get_edited_shader() const { } void ShaderTextEditor::set_edited_shader(const Ref<Shader> &p_shader) { + if (shader == p_shader) { + return; + } shader = p_shader; _load_theme_settings(); @@ -415,6 +418,9 @@ void ShaderEditor::edit(const Ref<Shader> &p_shader) { if (p_shader.is_null() || !p_shader->is_text_shader()) return; + if (shader == p_shader) + return; + shader = p_shader; shader_editor->set_edited_shader(p_shader); @@ -438,8 +444,12 @@ void ShaderEditor::save_external_data() { void ShaderEditor::apply_shaders() { if (shader.is_valid()) { - shader->set_code(shader_editor->get_text_edit()->get_text()); - shader->set_edited(true); + String shader_code = shader->get_code(); + String editor_code = shader_editor->get_text_edit()->get_text(); + if (shader_code != editor_code) { + shader->set_code(editor_code); + shader->set_edited(true); + } } } diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 1e9ff87fd3..ed11d26f25 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -2108,9 +2108,11 @@ void SpatialEditorViewport::_notification(int p_what) { set_process(visible); - if (visible) + if (visible) { _update_camera(0); - + } else { + set_freelook_active(false); + } call_deferred("update_transform_gizmo_view"); } diff --git a/editor/plugins/sprite_editor_plugin.cpp b/editor/plugins/sprite_editor_plugin.cpp index c1718dd8bf..3854d27567 100644 --- a/editor/plugins/sprite_editor_plugin.cpp +++ b/editor/plugins/sprite_editor_plugin.cpp @@ -91,6 +91,8 @@ Vector<Vector2> expand(const Vector<Vector2> &points, const Rect2i &rect, float Vector<Vector2> outPoints; ClipperLib::PolyNode *p2 = out.GetFirst(); + ERR_FAIL_COND_V(!p2, points); + while (p2->IsHole()) { p2 = p2->GetNext(); } diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index 0482ae86f3..831b2f3f16 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -138,39 +138,28 @@ TextureEditor::TextureEditor() { set_custom_minimum_size(Size2(1, 150)); } -void TextureEditorPlugin::edit(Object *p_object) { +// +bool EditorInspectorPluginTexture::can_handle(Object *p_object) { - Texture *s = Object::cast_to<Texture>(p_object); - if (!s) - return; - - texture_editor->edit(Ref<Texture>(s)); -} - -bool TextureEditorPlugin::handles(Object *p_object) const { - - return p_object->is_class("Texture"); + return Object::cast_to<Texture>(p_object) != NULL; } -void TextureEditorPlugin::make_visible(bool p_visible) { +void EditorInspectorPluginTexture::parse_begin(Object *p_object) { - if (p_visible) { - texture_editor->show(); - //texture_editor->set_process(true); - } else { - - texture_editor->hide(); - //texture_editor->set_process(false); + Texture *texture = Object::cast_to<Texture>(p_object); + if (!texture) { + return; } + Ref<Texture> m(texture); + + TextureEditor *editor = memnew(TextureEditor); + editor->edit(m); + add_custom_control(editor); } TextureEditorPlugin::TextureEditorPlugin(EditorNode *p_node) { - editor = p_node; - texture_editor = memnew(TextureEditor); - add_control_to_container(CONTAINER_PROPERTY_EDITOR_BOTTOM, texture_editor); - texture_editor->hide(); -} - -TextureEditorPlugin::~TextureEditorPlugin() { + Ref<EditorInspectorPluginTexture> plugin; + plugin.instance(); + add_inspector_plugin(plugin); } diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index 80ff4d6416..9c7d33df5a 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -52,22 +52,21 @@ public: TextureEditor(); }; +class EditorInspectorPluginTexture : public EditorInspectorPlugin { + GDCLASS(EditorInspectorPluginTexture, EditorInspectorPlugin) +public: + virtual bool can_handle(Object *p_object); + virtual void parse_begin(Object *p_object); +}; + class TextureEditorPlugin : public EditorPlugin { GDCLASS(TextureEditorPlugin, EditorPlugin); - TextureEditor *texture_editor; - EditorNode *editor; - public: virtual String get_name() const { return "Texture"; } - bool has_main_screen() const { return false; } - virtual void edit(Object *p_object); - virtual bool handles(Object *p_object) const; - virtual void make_visible(bool p_visible); TextureEditorPlugin(EditorNode *p_node); - ~TextureEditorPlugin(); }; #endif // TEXTURE_EDITOR_PLUGIN_H diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 5b34aaa92a..5b54384ee0 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -201,6 +201,7 @@ void TileSetEditor::_bind_methods() { ClassDB::bind_method("_zoom_out", &TileSetEditor::_zoom_out); ClassDB::bind_method("_zoom_reset", &TileSetEditor::_zoom_reset); ClassDB::bind_method("_select_edited_shape_coord", &TileSetEditor::_select_edited_shape_coord); + ClassDB::bind_method("_sort_tiles", &TileSetEditor::_sort_tiles); ClassDB::bind_method("edit", &TileSetEditor::edit); ClassDB::bind_method("add_texture", &TileSetEditor::add_texture); @@ -234,6 +235,8 @@ void TileSetEditor::_notification(int p_what) { tools[BITMASK_CLEAR]->set_icon(get_icon("Clear", "EditorIcons")); tools[SHAPE_NEW_POLYGON]->set_icon(get_icon("CollisionPolygon2D", "EditorIcons")); tools[SHAPE_NEW_RECTANGLE]->set_icon(get_icon("CollisionShape2D", "EditorIcons")); + tools[SELECT_PREVIOUS]->set_icon(get_icon("ArrowLeft", "EditorIcons")); + tools[SELECT_NEXT]->set_icon(get_icon("ArrowRight", "EditorIcons")); tools[SHAPE_DELETE]->set_icon(get_icon("Remove", "EditorIcons")); tools[SHAPE_KEEP_INSIDE_TILE]->set_icon(get_icon("Snap", "EditorIcons")); tools[TOOL_GRID_SNAP]->set_icon(get_icon("SnapGrid", "EditorIcons")); @@ -241,6 +244,7 @@ void TileSetEditor::_notification(int p_what) { tools[ZOOM_1]->set_icon(get_icon("ZoomReset", "EditorIcons")); tools[ZOOM_IN]->set_icon(get_icon("ZoomMore", "EditorIcons")); tools[VISIBLE_INFO]->set_icon(get_icon("InformationSign", "EditorIcons")); + _update_toggle_shape_button(); tool_editmode[EDITMODE_REGION]->set_icon(get_icon("RegionEdit", "EditorIcons")); tool_editmode[EDITMODE_COLLISION]->set_icon(get_icon("StaticBody2D", "EditorIcons")); @@ -324,11 +328,29 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) { tool_workspacemode[i]->connect("pressed", this, "_on_workspace_mode_changed", varray(i)); tool_hb->add_child(tool_workspacemode[i]); } + Control *spacer = memnew(Control); spacer->set_h_size_flags(Control::SIZE_EXPAND_FILL); tool_hb->add_child(spacer); tool_hb->move_child(spacer, WORKSPACE_CREATE_SINGLE); + tools[SELECT_NEXT] = memnew(ToolButton); + tool_hb->add_child(tools[SELECT_NEXT]); + tool_hb->move_child(tools[SELECT_NEXT], WORKSPACE_CREATE_SINGLE); + tools[SELECT_NEXT]->set_shortcut(ED_SHORTCUT("tileset_editor/next_shape", TTR("Next Coordinate"), KEY_PAGEDOWN)); + tools[SELECT_NEXT]->connect("pressed", this, "_on_tool_clicked", varray(SELECT_NEXT)); + tools[SELECT_NEXT]->set_tooltip(TTR("Select the next shape, subtile, or Tile.")); + tools[SELECT_PREVIOUS] = memnew(ToolButton); + tool_hb->add_child(tools[SELECT_PREVIOUS]); + tool_hb->move_child(tools[SELECT_PREVIOUS], WORKSPACE_CREATE_SINGLE); + tools[SELECT_PREVIOUS]->set_shortcut(ED_SHORTCUT("tileset_editor/previous_shape", TTR("Previous Coordinate"), KEY_PAGEUP)); + tools[SELECT_PREVIOUS]->set_tooltip(TTR("Select the previous shape, subtile, or Tile.")); + tools[SELECT_PREVIOUS]->connect("pressed", this, "_on_tool_clicked", varray(SELECT_PREVIOUS)); + + VSeparator *separator_shape_selection = memnew(VSeparator); + tool_hb->add_child(separator_shape_selection); + tool_hb->move_child(separator_shape_selection, WORKSPACE_CREATE_SINGLE); + tool_workspacemode[WORKSPACE_EDIT]->set_pressed(true); workspace_mode = WORKSPACE_EDIT; @@ -391,6 +413,12 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) { tools[SHAPE_NEW_POLYGON]->set_button_group(tg); tools[SHAPE_NEW_POLYGON]->set_tooltip(TTR("Create a new polygon.")); + separator_shape_toggle = memnew(VSeparator); + toolbar->add_child(separator_shape_toggle); + tools[SHAPE_TOGGLE_TYPE] = memnew(ToolButton); + tools[SHAPE_TOGGLE_TYPE]->connect("pressed", this, "_on_tool_clicked", varray(SHAPE_TOGGLE_TYPE)); + toolbar->add_child(tools[SHAPE_TOGGLE_TYPE]); + separator_delete = memnew(VSeparator); toolbar->add_child(separator_delete); tools[SHAPE_DELETE] = memnew(ToolButton); @@ -744,6 +772,7 @@ void TileSetEditor::_on_edit_mode_changed(int p_edit_mode) { } break; default: {} } + _update_toggle_shape_button(); workspace->update(); } @@ -1375,8 +1404,7 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { } undo_redo->create_action(TTR("Edit Collision Polygon")); - undo_redo->add_do_method(edited_collision_shape.ptr(), "set_points", points); - undo_redo->add_undo_method(edited_collision_shape.ptr(), "set_points", edited_collision_shape->get_points()); + _set_edited_shape_points(points); undo_redo->add_do_method(this, "_select_edited_shape_coord"); undo_redo->add_undo_method(this, "_select_edited_shape_coord"); undo_redo->commit_action(); @@ -1454,7 +1482,7 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { workspace->update(); } else { creating_shape = true; - edited_collision_shape = Ref<ConvexPolygonShape2D>(); + _set_edited_collision_shape(Ref<ConvexPolygonShape2D>()); current_shape.resize(0); current_shape.push_back(snap_point(pos)); workspace->update(); @@ -1474,7 +1502,7 @@ void TileSetEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { } else if (tools[SHAPE_NEW_RECTANGLE]->is_pressed()) { if (mb.is_valid()) { if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { - edited_collision_shape = Ref<ConvexPolygonShape2D>(); + _set_edited_collision_shape(Ref<ConvexPolygonShape2D>()); current_shape.resize(0); current_shape.push_back(snap_point(shape_anchor)); current_shape.push_back(snap_point(shape_anchor + Vector2(current_tile_region.size.x, 0))); @@ -1519,6 +1547,49 @@ void TileSetEditor::_on_tool_clicked(int p_tool) { undo_redo->add_do_method(workspace, "update"); undo_redo->add_undo_method(workspace, "update"); undo_redo->commit_action(); + } else if (p_tool == SHAPE_TOGGLE_TYPE) { + if (edited_collision_shape.is_valid()) { + Ref<ConvexPolygonShape2D> convex = edited_collision_shape; + Ref<ConcavePolygonShape2D> concave = edited_collision_shape; + Ref<Shape2D> previous_shape = edited_collision_shape; + Array sd = tileset->call("tile_get_shapes", get_current_tile()); + + if (convex.is_valid()) { + // Make concave + undo_redo->create_action(TTR("Make Polygon Concave")); + Ref<ConcavePolygonShape2D> _concave = memnew(ConcavePolygonShape2D); + edited_collision_shape = _concave; + _set_edited_shape_points(_get_collision_shape_points(convex)); + } else if (concave.is_valid()) { + // Make convex + undo_redo->create_action(TTR("Make Polygon Convex")); + Ref<ConvexPolygonShape2D> _convex = memnew(ConvexPolygonShape2D); + edited_collision_shape = _convex; + _set_edited_shape_points(_get_collision_shape_points(concave)); + } else { + // Shoudn't haphen + } + for (int i = 0; i < sd.size(); i++) { + if (sd[i].get("shape") == previous_shape) { + undo_redo->add_undo_method(tileset.ptr(), "tile_set_shapes", get_current_tile(), sd.duplicate()); + sd.remove(i); + sd.insert(i, edited_collision_shape); + undo_redo->add_do_method(tileset.ptr(), "tile_set_shapes", get_current_tile(), sd); + undo_redo->add_do_method(this, "_select_edited_shape_coord"); + undo_redo->add_undo_method(this, "_select_edited_shape_coord"); + undo_redo->commit_action(); + break; + } + } + _update_toggle_shape_button(); + workspace->update(); + workspace_container->update(); + helper->_change_notify(""); + } + } else if (p_tool == SELECT_NEXT) { + _select_next_shape(); + } else if (p_tool == SELECT_PREVIOUS) { + _select_previous_shape(); } else if (p_tool == SHAPE_DELETE) { if (creating_shape) { creating_shape = false; @@ -1641,6 +1712,378 @@ void TileSetEditor::_on_grid_snap_toggled(bool p_val) { workspace->update(); } +Vector<Vector2> TileSetEditor::_get_collision_shape_points(const Ref<Shape2D> &p_shape) { + Ref<ConvexPolygonShape2D> convex = p_shape; + Ref<ConcavePolygonShape2D> concave = p_shape; + if (convex.is_valid()) { + return convex->get_points(); + } else if (concave.is_valid()) { + Vector<Vector2> points; + for (int i = 0; i < concave->get_segments().size(); i += 2) { + points.push_back(concave->get_segments()[i]); + } + return points; + } else { + return Vector<Vector2>(); + } +} + +Vector<Vector2> TileSetEditor::_get_edited_shape_points() { + return _get_collision_shape_points(edited_collision_shape); +} + +void TileSetEditor::_set_edited_shape_points(const Vector<Vector2> points) { + Ref<ConvexPolygonShape2D> convex = edited_collision_shape; + Ref<ConcavePolygonShape2D> concave = edited_collision_shape; + if (convex.is_valid()) { + undo_redo->add_do_method(convex.ptr(), "set_points", points); + undo_redo->add_undo_method(convex.ptr(), "set_points", _get_edited_shape_points()); + } else if (concave.is_valid()) { + PoolVector2Array segments; + for (int i = 0; i < points.size() - 1; i++) { + segments.push_back(points[i]); + segments.push_back(points[i + 1]); + } + segments.push_back(points[points.size() - 1]); + segments.push_back(points[0]); + concave->set_segments(segments); + undo_redo->add_do_method(concave.ptr(), "set_segments", segments); + undo_redo->add_undo_method(concave.ptr(), "set_segments", concave->get_segments()); + } else { + // Invalid shape + } +} + +void TileSetEditor::_update_tile_data() { + current_tile_data.clear(); + if (get_current_tile() < 0) + return; + + Vector<TileSet::ShapeData> sd = tileset->tile_get_shapes(get_current_tile()); + if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { + SubtileData data; + for (int i = 0; i < sd.size(); i++) { + data.collisions.push_back(sd[i].shape); + } + data.navigation_shape = tileset->tile_get_navigation_polygon(get_current_tile()); + data.occlusion_shape = tileset->tile_get_light_occluder(get_current_tile()); + current_tile_data[Vector2i()] = data; + } else { + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->tile_get_region(get_current_tile()).size; + Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing)); + for (int y = 0; y < cell_count.y; y++) { + for (int x = 0; x < cell_count.x; x++) { + SubtileData data; + Vector2i coord(x, y); + for (int i = 0; i < sd.size(); i++) { + if (sd[i].autotile_coord == coord) { + data.collisions.push_back(sd[i].shape); + } + } + data.navigation_shape = tileset->autotile_get_navigation_polygon(get_current_tile(), coord); + data.occlusion_shape = tileset->tile_get_light_occluder(get_current_tile()); + current_tile_data[coord] = data; + } + } + } +} + +void TileSetEditor::_update_toggle_shape_button() { + Ref<ConvexPolygonShape2D> convex = edited_collision_shape; + Ref<ConcavePolygonShape2D> concave = edited_collision_shape; + separator_shape_toggle->show(); + tools[SHAPE_TOGGLE_TYPE]->show(); + if (edit_mode != EDITMODE_COLLISION || !edited_collision_shape.is_valid()) { + separator_shape_toggle->hide(); + tools[SHAPE_TOGGLE_TYPE]->hide(); + } else if (concave.is_valid()) { + tools[SHAPE_TOGGLE_TYPE]->set_icon(get_icon("ConvexPolygonShape2D", "EditorIcons")); + tools[SHAPE_TOGGLE_TYPE]->set_text("Make Convex"); + } else if (convex.is_valid()) { + tools[SHAPE_TOGGLE_TYPE]->set_icon(get_icon("ConcavePolygonShape2D", "EditorIcons")); + tools[SHAPE_TOGGLE_TYPE]->set_text("Make Concave"); + } else { + // Shoudn't happen + separator_shape_toggle->hide(); + tools[SHAPE_TOGGLE_TYPE]->hide(); + } +} + +void TileSetEditor::_select_next_tile() { + Array tiles = _get_tiles_in_current_texture(true); + if (tiles.size() == 0) { + set_current_tile(-1); + } else if (get_current_tile() == -1) { + set_current_tile(tiles[0]); + } else { + int index = tiles.find(get_current_tile()); + if (index < 0) { + set_current_tile(tiles[0]); + } else if (index == tiles.size() - 1) { + set_current_tile(tiles[0]); + } else { + set_current_tile(tiles[index + 1]); + } + } + if (get_current_tile() == -1) { + return; + } else if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { + return; + } else { + switch (edit_mode) { + case EDITMODE_COLLISION: + case EDITMODE_OCCLUSION: + case EDITMODE_NAVIGATION: + case EDITMODE_PRIORITY: + case EDITMODE_Z_INDEX: { + edited_shape_coord = Vector2(); + _select_edited_shape_coord(); + } break; + default: {} + } + } +} + +void TileSetEditor::_select_previous_tile() { + Array tiles = _get_tiles_in_current_texture(true); + if (tiles.size() == 0) { + set_current_tile(-1); + } else if (get_current_tile() == -1) { + set_current_tile(tiles[tiles.size() - 1]); + } else { + int index = tiles.find(get_current_tile()); + if (index <= 0) { + set_current_tile(tiles[tiles.size() - 1]); + } else { + set_current_tile(tiles[index - 1]); + } + } + if (get_current_tile() == -1) { + return; + } else if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { + return; + } else { + switch (edit_mode) { + case EDITMODE_COLLISION: + case EDITMODE_OCCLUSION: + case EDITMODE_NAVIGATION: + case EDITMODE_PRIORITY: + case EDITMODE_Z_INDEX: { + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->tile_get_region(get_current_tile()).size; + Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing)); + cell_count -= Vector2(1, 1); + edited_shape_coord = cell_count; + _select_edited_shape_coord(); + } break; + default: {} + } + } +} + +Array TileSetEditor::_get_tiles_in_current_texture(bool sorted) { + Array a; + List<int> all_tiles; + if (!get_current_texture().is_valid()) { + return a; + } + tileset->get_tile_list(&all_tiles); + for (int i = 0; i < all_tiles.size(); i++) { + if (tileset->tile_get_texture(all_tiles[i]) == get_current_texture()) { + a.push_back(all_tiles[i]); + } + } + if (sorted) { + a.sort_custom(this, "_sort_tiles"); + } + return a; +} + +bool TileSetEditor::_sort_tiles(Variant p_a, Variant p_b) { + int a = p_a; + int b = p_b; + + Vector2 pos_a = tileset->tile_get_region(a).position; + Vector2 pos_b = tileset->tile_get_region(b).position; + if (pos_a.y < pos_b.y) { + return true; + + } else if (pos_a.y == pos_b.y) { + if (pos_a.x < pos_b.x) { + return true; + } else { + return false; + } + } else { + return false; + } +} + +void TileSetEditor::_select_next_subtile() { + if (get_current_tile() == -1) { + _select_next_tile(); + return; + } + if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { + _select_next_tile(); + } else if (edit_mode == EDITMODE_REGION || edit_mode == EDITMODE_BITMASK || edit_mode == EDITMODE_ICON) { + _select_next_tile(); + } else { + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->tile_get_region(get_current_tile()).size; + Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing)); + if (edited_shape_coord.x >= cell_count.x - 1 && edited_shape_coord.y >= cell_count.y - 1) { + _select_next_tile(); + } else { + edited_shape_coord.x++; + if (edited_shape_coord.x >= cell_count.x) { + edited_shape_coord.x = 0; + edited_shape_coord.y++; + } + _select_edited_shape_coord(); + } + } +} + +void TileSetEditor::_select_previous_subtile() { + if (get_current_tile() == -1) { + _select_previous_tile(); + return; + } + if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { + _select_previous_tile(); + } else if (edit_mode == EDITMODE_REGION || edit_mode == EDITMODE_BITMASK || edit_mode == EDITMODE_ICON) { + _select_previous_tile(); + } else { + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->tile_get_region(get_current_tile()).size; + Vector2i cell_count = size / (tileset->autotile_get_size(get_current_tile()) + Vector2(spacing, spacing)); + if (edited_shape_coord.x <= 0 && edited_shape_coord.y <= 0) { + _select_previous_tile(); + } else { + edited_shape_coord.x--; + if (edited_shape_coord.x == -1) { + edited_shape_coord.x = cell_count.x - 1; + edited_shape_coord.y--; + } + _select_edited_shape_coord(); + } + } +} + +void TileSetEditor::_select_next_shape() { + if (get_current_tile() == -1) { + _select_next_subtile(); + } else if (edit_mode != EDITMODE_COLLISION) { + _select_next_subtile(); + } else { + Vector2i edited_coord = Vector2(); + if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) { + edited_coord = edited_shape_coord; + } + SubtileData data = current_tile_data[edited_coord]; + if (data.collisions.size() == 0) { + _select_next_subtile(); + } else { + int index = data.collisions.find(edited_collision_shape); + if (index < 0) { + _set_edited_collision_shape(data.collisions[0]); + } else if (index == data.collisions.size() - 1) { + _select_next_subtile(); + } else { + _set_edited_collision_shape(data.collisions[index + 1]); + } + } + current_shape.resize(0); + Rect2 current_tile_region = tileset->tile_get_region(get_current_tile()); + current_tile_region.position += WORKSPACE_MARGIN; + + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->autotile_get_size(get_current_tile()); + Vector2 shape_anchor = edited_shape_coord; + shape_anchor.x *= (size.x + spacing); + shape_anchor.y *= (size.y + spacing); + current_tile_region.position += shape_anchor; + + if (edited_collision_shape.is_valid()) { + for (int i = 0; i < _get_edited_shape_points().size(); i++) { + current_shape.push_back(_get_edited_shape_points()[i] + current_tile_region.position); + } + } + workspace->update(); + workspace_container->update(); + helper->_change_notify(""); + } +} + +void TileSetEditor::_select_previous_shape() { + if (get_current_tile() == -1) { + _select_previous_subtile(); + if (get_current_tile() != -1 && edit_mode == EDITMODE_COLLISION) { + SubtileData data = current_tile_data[Vector2i(edited_shape_coord)]; + if (data.collisions.size() > 1) { + _set_edited_collision_shape(data.collisions[data.collisions.size() - 1]); + } + } else { + return; + } + } else if (edit_mode != EDITMODE_COLLISION) { + _select_previous_subtile(); + } else { + Vector2i edited_coord = Vector2(); + if (tileset->tile_get_tile_mode(get_current_tile()) != TileSet::SINGLE_TILE) { + edited_coord = edited_shape_coord; + } + SubtileData data = current_tile_data[edited_coord]; + if (data.collisions.size() == 0) { + _select_previous_subtile(); + data = current_tile_data[Vector2i(edited_shape_coord)]; + if (data.collisions.size() > 1) { + _set_edited_collision_shape(data.collisions[data.collisions.size() - 1]); + } + } else { + int index = data.collisions.find(edited_collision_shape); + if (index < 0) { + _set_edited_collision_shape(data.collisions[data.collisions.size() - 1]); + } else if (index == 0) { + _select_previous_subtile(); + data = current_tile_data[Vector2i(edited_shape_coord)]; + if (data.collisions.size() > 1) { + _set_edited_collision_shape(data.collisions[data.collisions.size() - 1]); + } + } else { + _set_edited_collision_shape(data.collisions[index - 1]); + } + } + + current_shape.resize(0); + Rect2 current_tile_region = tileset->tile_get_region(get_current_tile()); + current_tile_region.position += WORKSPACE_MARGIN; + + int spacing = tileset->autotile_get_spacing(get_current_tile()); + Vector2 size = tileset->autotile_get_size(get_current_tile()); + Vector2 shape_anchor = edited_shape_coord; + shape_anchor.x *= (size.x + spacing); + shape_anchor.y *= (size.y + spacing); + current_tile_region.position += shape_anchor; + + if (edited_collision_shape.is_valid()) { + for (int i = 0; i < _get_edited_shape_points().size(); i++) { + current_shape.push_back(_get_edited_shape_points()[i] + current_tile_region.position); + } + } + workspace->update(); + workspace_container->update(); + helper->_change_notify(""); + } +} + +void TileSetEditor::_set_edited_collision_shape(const Ref<Shape2D> &p_shape) { + edited_collision_shape = p_shape; + _update_toggle_shape_button(); +} + void TileSetEditor::_set_snap_step(Vector2 p_val) { snap_step.x = CLAMP(p_val.x, 0, 256); snap_step.y = CLAMP(p_val.y, 0, 256); @@ -1937,16 +2380,29 @@ void TileSetEditor::draw_polygon_shapes() { } anchor += WORKSPACE_MARGIN; anchor += tileset->tile_get_region(t_id).position; - Ref<ConvexPolygonShape2D> shape = sd[i].shape; + Ref<Shape2D> shape = sd[i].shape; if (shape.is_valid()) { Color c_bg; Color c_border; + Ref<ConvexPolygonShape2D> convex = shape; + bool is_convex = convex.is_valid(); if ((tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE || coord == edited_shape_coord) && sd[i].shape == edited_collision_shape) { - c_bg = Color(0, 1, 1, 0.5); - c_border = Color(0, 1, 1); + if (is_convex) { + c_bg = Color(0, 1, 1, 0.5); + c_border = Color(0, 1, 1); + } else { + c_bg = Color(0.8, 0, 1, 0.5); + c_border = Color(0.8, 0, 1); + } } else { - c_bg = Color(0.9, 0.7, 0.07, 0.5); - c_border = Color(0.9, 0.7, 0.07, 1); + if (is_convex) { + c_bg = Color(0.9, 0.7, 0.07, 0.5); + c_border = Color(0.9, 0.7, 0.07, 1); + + } else { + c_bg = Color(0.9, 0.45, 0.075, 0.5); + c_border = Color(0.9, 0.45, 0.075); + } } Vector<Vector2> polygon; Vector<Color> colors; @@ -1956,8 +2412,8 @@ void TileSetEditor::draw_polygon_shapes() { colors.push_back(c_bg); } } else { - for (int j = 0; j < shape->get_points().size(); j++) { - polygon.push_back(shape->get_points()[j] + anchor); + for (int j = 0; j < _get_collision_shape_points(shape).size(); j++) { + polygon.push_back(_get_collision_shape_points(shape)[j] + anchor); colors.push_back(c_bg); } } @@ -2174,11 +2630,11 @@ void TileSetEditor::close_shape(const Vector2 &shape_anchor) { if (current_shape.size() >= 3) { Ref<ConvexPolygonShape2D> shape = memnew(ConvexPolygonShape2D); - Vector<Vector2> segments; + Vector<Vector2> points; float p_total = 0; for (int i = 0; i < current_shape.size(); i++) { - segments.push_back(current_shape[i] - shape_anchor); + points.push_back(current_shape[i] - shape_anchor); if (i != current_shape.size() - 1) p_total += ((current_shape[i + 1].x - current_shape[i].x) * (-current_shape[i + 1].y + (-current_shape[i].y))); @@ -2187,9 +2643,9 @@ void TileSetEditor::close_shape(const Vector2 &shape_anchor) { } if (p_total < 0) - segments.invert(); + points.invert(); - shape->set_points(segments); + shape->set_points(points); undo_redo->create_action(TTR("Create Collision Polygon")); // Necessary to get the version that returns a Array instead of a Vector. @@ -2274,6 +2730,7 @@ void TileSetEditor::close_shape(const Vector2 &shape_anchor) { } void TileSetEditor::select_coord(const Vector2 &coord) { + _update_tile_data(); current_shape = PoolVector2Array(); if (get_current_tile() == -1) return; @@ -2281,7 +2738,7 @@ void TileSetEditor::select_coord(const Vector2 &coord) { current_tile_region.position += WORKSPACE_MARGIN; if (tileset->tile_get_tile_mode(get_current_tile()) == TileSet::SINGLE_TILE) { if (edited_collision_shape != tileset->tile_get_shape(get_current_tile(), 0)) - edited_collision_shape = tileset->tile_get_shape(get_current_tile(), 0); + _set_edited_collision_shape(tileset->tile_get_shape(get_current_tile(), 0)); if (edited_occlusion_shape != tileset->tile_get_light_occluder(get_current_tile())) edited_occlusion_shape = tileset->tile_get_light_occluder(get_current_tile()); if (edited_navigation_shape != tileset->tile_get_navigation_polygon(get_current_tile())) @@ -2290,8 +2747,8 @@ void TileSetEditor::select_coord(const Vector2 &coord) { if (edit_mode == EDITMODE_COLLISION) { current_shape.resize(0); if (edited_collision_shape.is_valid()) { - for (int i = 0; i < edited_collision_shape->get_points().size(); i++) { - current_shape.push_back(edited_collision_shape->get_points()[i] + current_tile_region.position); + for (int i = 0; i < _get_edited_shape_points().size(); i++) { + current_shape.push_back(_get_edited_shape_points()[i] + current_tile_region.position); } } } else if (edit_mode == EDITMODE_OCCLUSION) { @@ -2318,13 +2775,13 @@ void TileSetEditor::select_coord(const Vector2 &coord) { for (int i = 0; i < sd.size(); i++) { if (sd[i].autotile_coord == coord) { if (edited_collision_shape != sd[i].shape) - edited_collision_shape = sd[i].shape; + _set_edited_collision_shape(sd[i].shape); found_collision_shape = true; break; } } if (!found_collision_shape) - edited_collision_shape = Ref<ConvexPolygonShape2D>(NULL); + _set_edited_collision_shape(Ref<ConvexPolygonShape2D>(NULL)); if (edited_occlusion_shape != tileset->autotile_get_light_occluder(get_current_tile(), coord)) edited_occlusion_shape = tileset->autotile_get_light_occluder(get_current_tile(), coord); if (edited_navigation_shape != tileset->autotile_get_navigation_polygon(get_current_tile(), coord)) @@ -2339,8 +2796,8 @@ void TileSetEditor::select_coord(const Vector2 &coord) { if (edit_mode == EDITMODE_COLLISION) { current_shape.resize(0); if (edited_collision_shape.is_valid()) { - for (int j = 0; j < edited_collision_shape->get_points().size(); j++) { - current_shape.push_back(edited_collision_shape->get_points()[j] + shape_anchor); + for (int j = 0; j < _get_edited_shape_points().size(); j++) { + current_shape.push_back(_get_edited_shape_points()[j] + shape_anchor); } } } else if (edit_mode == EDITMODE_OCCLUSION) { @@ -2461,7 +2918,8 @@ void TileSetEditor::update_texture_list_icon() { for (int current_idx = 0; current_idx < texture_list->get_item_count(); current_idx++) { RID rid = texture_list->get_item_metadata(current_idx); texture_list->set_item_icon(current_idx, texture_map[rid]); - texture_list->set_item_icon_region(current_idx, Rect2(0, 0, 150, 100)); + Size2 texture_size = texture_map[rid]->get_size(); + texture_list->set_item_icon_region(current_idx, Rect2(0, 0, MIN(texture_size.x, 150), MIN(texture_size.y, 100))); } texture_list->update(); } @@ -2474,10 +2932,14 @@ void TileSetEditor::update_workspace_tile_mode() { for (int i = 1; i < WORKSPACE_MODE_MAX; i++) { tool_workspacemode[i]->set_disabled(true); } + tools[SELECT_NEXT]->set_disabled(true); + tools[SELECT_PREVIOUS]->set_disabled(true); } else { for (int i = 1; i < WORKSPACE_MODE_MAX; i++) { tool_workspacemode[i]->set_disabled(false); } + tools[SELECT_NEXT]->set_disabled(false); + tools[SELECT_PREVIOUS]->set_disabled(false); } if (workspace_mode != WORKSPACE_EDIT) { @@ -2495,7 +2957,7 @@ void TileSetEditor::update_workspace_tile_mode() { for (int i = 0; i < EDITMODE_MAX; i++) { tool_editmode[i]->hide(); } - for (int i = 0; i < ZOOM_OUT; i++) { + for (int i = TOOL_SELECT; i < ZOOM_OUT; i++) { tools[i]->hide(); } @@ -2661,6 +3123,24 @@ bool TilesetEditorContext::_set(const StringName &p_name, const Variant &p_value } else if (name == "tileset_script") { tileset->set_script(p_value); return true; + } else if (name == "selected_collision_one_way") { + Vector<TileSet::ShapeData> sd = tileset->tile_get_shapes(tileset_editor->get_current_tile()); + for (int index = 0; index < sd.size(); index++) { + if (sd[index].shape == tileset_editor->edited_collision_shape) { + tileset->tile_set_shape_one_way(tileset_editor->get_current_tile(), index, p_value); + return true; + } + } + return false; + } else if (name == "selected_collision_one_way_margin") { + Vector<TileSet::ShapeData> sd = tileset->tile_get_shapes(tileset_editor->get_current_tile()); + for (int index = 0; index < sd.size(); index++) { + if (sd[index].shape == tileset_editor->edited_collision_shape) { + tileset->tile_set_shape_one_way_margin(tileset_editor->get_current_tile(), index, p_value); + return true; + } + } + return false; } tileset_editor->err_dialog->set_text(TTR("This property can't be changed.")); @@ -2703,6 +3183,24 @@ bool TilesetEditorContext::_get(const StringName &p_name, Variant &r_ret) const } else if (name == "selected_collision") { r_ret = tileset_editor->edited_collision_shape; v = true; + } else if (name == "selected_collision_one_way") { + Vector<TileSet::ShapeData> sd = tileset->tile_get_shapes(tileset_editor->get_current_tile()); + for (int index = 0; index < sd.size(); index++) { + if (sd[index].shape == tileset_editor->edited_collision_shape) { + r_ret = sd[index].one_way_collision; + v = true; + break; + } + } + } else if (name == "selected_collision_one_way_margin") { + Vector<TileSet::ShapeData> sd = tileset->tile_get_shapes(tileset_editor->get_current_tile()); + for (int index = 0; index < sd.size(); index++) { + if (sd[index].shape == tileset_editor->edited_collision_shape) { + r_ret = sd[index].one_way_collision_margin; + v = true; + break; + } + } } else if (name == "selected_navigation") { r_ret = tileset_editor->edited_navigation_shape; v = true; @@ -2749,6 +3247,10 @@ void TilesetEditorContext::_get_property_list(List<PropertyInfo> *p_list) const } if (tileset_editor->edit_mode == TileSetEditor::EDITMODE_COLLISION && tileset_editor->edited_collision_shape.is_valid()) { p_list->push_back(PropertyInfo(Variant::OBJECT, "selected_collision", PROPERTY_HINT_RESOURCE_TYPE, tileset_editor->edited_collision_shape->get_class())); + if (tileset_editor->edited_collision_shape.is_valid()) { + p_list->push_back(PropertyInfo(Variant::BOOL, "selected_collision_one_way", PROPERTY_HINT_NONE)); + p_list->push_back(PropertyInfo(Variant::REAL, "selected_collision_one_way_margin", PROPERTY_HINT_NONE)); + } } if (tileset_editor->edit_mode == TileSetEditor::EDITMODE_NAVIGATION && tileset_editor->edited_navigation_shape.is_valid()) { p_list->push_back(PropertyInfo(Variant::OBJECT, "selected_navigation", PROPERTY_HINT_RESOURCE_TYPE, tileset_editor->edited_navigation_shape->get_class())); diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 9c4aa80dcb..2827964592 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -34,6 +34,7 @@ #include "editor/editor_name_dialog.h" #include "editor/editor_node.h" #include "scene/2d/sprite.h" +#include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/convex_polygon_shape_2d.h" #include "scene/resources/tile_set.h" @@ -76,12 +77,15 @@ class TileSetEditor : public HSplitContainer { }; enum TileSetTools { + SELECT_PREVIOUS, + SELECT_NEXT, TOOL_SELECT, BITMASK_COPY, BITMASK_PASTE, BITMASK_CLEAR, SHAPE_NEW_POLYGON, SHAPE_NEW_RECTANGLE, + SHAPE_TOGGLE_TYPE, SHAPE_DELETE, SHAPE_KEEP_INSIDE_TILE, TOOL_GRID_SNAP, @@ -92,6 +96,12 @@ class TileSetEditor : public HSplitContainer { TOOL_MAX }; + struct SubtileData { + Array collisions; + Ref<OccluderPolygon2D> occlusion_shape; + Ref<NavigationPolygon> navigation_shape; + }; + Ref<TileSet> tileset; TilesetEditorContext *helper; EditorNode *editor; @@ -115,13 +125,14 @@ class TileSetEditor : public HSplitContainer { bool draw_edited_region; Vector2 edited_shape_coord; PoolVector2Array current_shape; + Map<Vector2i, SubtileData> current_tile_data; Map<Vector2, uint16_t> bitmask_map_copy; Vector2 snap_step; Vector2 snap_offset; Vector2 snap_separation; - Ref<ConvexPolygonShape2D> edited_collision_shape; + Ref<Shape2D> edited_collision_shape; Ref<OccluderPolygon2D> edited_occlusion_shape; Ref<NavigationPolygon> edited_navigation_shape; @@ -137,6 +148,7 @@ class TileSetEditor : public HSplitContainer { HSeparator *separator_editmode; HBoxContainer *toolbar; ToolButton *tools[TOOL_MAX]; + VSeparator *separator_shape_toggle; VSeparator *separator_bitmask; VSeparator *separator_delete; VSeparator *separator_grid; @@ -188,6 +200,20 @@ private: void _on_priority_changed(float val); void _on_z_index_changed(float val); void _on_grid_snap_toggled(bool p_val); + Vector<Vector2> _get_collision_shape_points(const Ref<Shape2D> &p_shape); + Vector<Vector2> _get_edited_shape_points(); + void _set_edited_shape_points(const Vector<Vector2> points); + void _update_tile_data(); + void _update_toggle_shape_button(); + void _select_next_tile(); + void _select_previous_tile(); + Array _get_tiles_in_current_texture(bool sorted = false); + bool _sort_tiles(Variant p_a, Variant p_b); + void _select_next_subtile(); + void _select_previous_subtile(); + void _select_next_shape(); + void _select_previous_shape(); + void _set_edited_collision_shape(const Ref<Shape2D> &p_shape); void _set_snap_step(Vector2 p_val); void _set_snap_off(Vector2 p_val); void _set_snap_sep(Vector2 p_val); diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 831ebde3a6..82a6a07805 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -1012,7 +1012,11 @@ void ProjectExportDialog::_export_all(bool p_debug) { Error err = platform->export_project(preset, p_debug, preset->get_export_path(), 0); if (err != OK) { - error_dialog->set_text(TTR("Export templates for this platform are missing/corrupted:") + " " + platform->get_name()); + if (err == ERR_FILE_BAD_PATH) { + error_dialog->set_text(TTR("The given export path doesn't exist:") + "\n" + preset->get_export_path().get_base_dir()); + } else { + error_dialog->set_text(TTR("Export templates for this platform are missing/corrupted:") + " " + platform->get_name()); + } error_dialog->show(); error_dialog->popup_centered_minsize(Size2(300, 80)); ERR_PRINT("Failed to export project"); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index d931d5bb37..084830ed7b 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -336,9 +336,13 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { } break; case TOOL_ATTACH_SCRIPT: { + List<Node *> selection = editor_selection->get_selected_node_list(); + if (selection.empty()) + break; + Node *selected = scene_tree->get_selected(); if (!selected) - break; + selected = selection.front()->get(); Ref<Script> existing = selected->get_script(); diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index 303d10d768..6b7c4781dd 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -1084,19 +1084,19 @@ void ScriptEditorDebugger::_notification(int p_what) { if (error_count != last_error_count || warning_count != last_warning_count) { if (error_count == 0 && warning_count == 0) { - error_tree->set_name(TTR("Errors")); + errors_tab->set_name(TTR("Errors")); debugger_button->set_text(TTR("Debugger")); debugger_button->set_icon(Ref<Texture>()); - tabs->set_tab_icon(error_tree->get_index(), Ref<Texture>()); + tabs->set_tab_icon(errors_tab->get_index(), Ref<Texture>()); } else { - error_tree->set_name(TTR("Errors") + " (" + itos(error_count + warning_count) + ")"); + errors_tab->set_name(TTR("Errors") + " (" + itos(error_count + warning_count) + ")"); debugger_button->set_text(TTR("Debugger") + " (" + itos(error_count + warning_count) + ")"); if (error_count == 0) { debugger_button->set_icon(get_icon("Warning", "EditorIcons")); - tabs->set_tab_icon(error_tree->get_index(), get_icon("Warning", "EditorIcons")); + tabs->set_tab_icon(errors_tab->get_index(), get_icon("Warning", "EditorIcons")); } else { debugger_button->set_icon(get_icon("Error", "EditorIcons")); - tabs->set_tab_icon(error_tree->get_index(), get_icon("Error", "EditorIcons")); + tabs->set_tab_icon(errors_tab->get_index(), get_icon("Error", "EditorIcons")); } } last_error_count = error_count; @@ -2054,11 +2054,11 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { } { //errors - VBoxContainer *errvb = memnew(VBoxContainer); - errvb->set_name(TTR("Errors")); + errors_tab = memnew(VBoxContainer); + errors_tab->set_name(TTR("Errors")); HBoxContainer *errhb = memnew(HBoxContainer); - errvb->add_child(errhb); + errors_tab->add_child(errhb); Button *expand_all = memnew(Button); expand_all->set_text(TTR("Expand All")); @@ -2093,13 +2093,13 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { error_tree->set_v_size_flags(SIZE_EXPAND_FILL); error_tree->set_allow_rmb_select(true); error_tree->connect("item_rmb_selected", this, "_error_tree_item_rmb_selected"); - errvb->add_child(error_tree); + errors_tab->add_child(error_tree); item_menu = memnew(PopupMenu); item_menu->connect("id_pressed", this, "_item_menu_id_pressed"); error_tree->add_child(item_menu); - tabs->add_child(errvb); + tabs->add_child(errors_tab); } { // remote scene tree diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index 49651ad9c9..fb1545559c 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -87,7 +87,7 @@ class ScriptEditorDebugger : public Control { Map<ObjectID, ScriptEditorDebuggerInspectedObject *> remote_objects; Set<ObjectID> unfold_cache; - HSplitContainer *error_split; + VBoxContainer *errors_tab; Tree *error_tree; Tree *inspect_scene_tree; Button *clearbutton; diff --git a/editor/translations/af.po b/editor/translations/af.po index fa210f0894..249e68ff53 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -87,6 +87,15 @@ msgstr "Dupliseer Seleksie" msgid "Delete Selected Key(s)" msgstr "Skrap gekose lêers?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Skuif Gunsteling Op" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Dupliseer Sleutels" @@ -118,6 +127,16 @@ msgid "Anim Change Call" msgstr "Anim Verander Roep" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Verander Anim Lente" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -170,6 +189,11 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Verander Skikking Waarde" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -196,6 +220,10 @@ msgid "Time (s): " msgstr "Tree (s):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Deurlopend" @@ -248,6 +276,21 @@ msgid "Delete Key(s)" msgstr "Anim Skrap Sleutels" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Verander Woordeboek Waarde" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Verander Woordeboek Waarde" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Verander Anim Herspeel" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Verwyder Anim Baan" @@ -289,6 +332,16 @@ msgid "Anim Insert Key" msgstr "Anim Voeg Sleutel by" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Verander Anim Lente" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Herrangskik AutoLaaie" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -313,6 +366,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Anim Voeg Baan By" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -321,10 +379,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Anim Voeg Baan & Sleutel By" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim Voeg Baan By" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim Voeg Baan & Sleutel By" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -337,6 +410,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Skaal Sleutels" @@ -382,10 +459,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skaal Seleksie" @@ -488,6 +561,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Anim Voeg Baan By" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Herskaleer Skikking" @@ -1310,6 +1396,12 @@ msgstr "" msgid "Packing" msgstr "Verpak" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1881,6 +1973,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3495,12 +3595,46 @@ msgstr "Laai" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Skuif Gunsteling Op" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Skuif Gunsteling Op" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animasie Zoem." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3542,6 +3676,27 @@ msgid "Triangle already exists" msgstr "AutoLaai '%s' bestaan reeds!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Anim Voeg Baan By" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3550,6 +3705,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Wissel AutoLaai Globale" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3567,6 +3727,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3576,11 +3740,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Nodus Naam:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Koppel" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Ontkoppel" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Optimaliseer Animasie" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Skrap" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Wissel Gunsteling" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Verander Anim Lente" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3596,6 +3803,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nodus Naam:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3829,6 +4042,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Skuif Byvoeg Sleutel" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Oorgang" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3858,6 +4086,20 @@ msgid "No playback resource set at path: %s." msgstr "Nie in hulpbron pad nie." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Verwyder" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Oorgang" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4668,6 +4910,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5835,6 +6081,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy msgid "Skeleton2D" msgstr "EnkelHouer" @@ -5946,10 +6200,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5994,7 +6244,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6086,6 +6336,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6094,6 +6350,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6372,10 +6632,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6711,6 +6967,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Skep Nuwe" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Skep Intekening" @@ -6887,6 +7148,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Anim Dupliseer Sleutels" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6902,6 +7184,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6915,7 +7205,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6927,6 +7226,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7915,6 +8218,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7949,6 +8256,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "Skep Vouer" @@ -8365,6 +8676,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8571,6 +8894,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8868,10 +9195,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8954,6 +9277,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9828,12 +10155,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Uit-In" -#~ msgid "Change Anim Len" -#~ msgstr "Verander Anim Lente" - -#~ msgid "Change Anim Loop" -#~ msgstr "Verander Anim Herspeel" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Anim Skep Soort-Waarde Sleutel" @@ -9892,8 +10213,5 @@ msgstr "" #~ msgid "Skip" #~ msgstr "Spring Oor" -#~ msgid "Move Add Key" -#~ msgstr "Skuif Byvoeg Sleutel" - #~ msgid "List:" #~ msgstr "Lys:" diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 4870528b89..ce40d0bdfa 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -104,6 +104,16 @@ msgstr "تكرار المÙØ§ØªÙŠØ Ø§Ù„Ù…Øدد(Ø©)" msgid "Delete Selected Key(s)" msgstr "Ø¥Ù…Ø³Ø Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ù…Øدد(Ø©)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "إضاÙØ© نقطة" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Ù…Ø³Ø Ø§Ù„Ù†Ù‚Ø·Ø©" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "تكرار Ù…ÙØ§ØªÙŠØ Ø§Ù„ØªØريك" @@ -133,6 +143,16 @@ msgid "Anim Change Call" msgstr "نداء تغيير التØريك" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "تغيير إسم الØركة:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "خط الخاصية" @@ -182,6 +202,11 @@ msgid "Anim Clips:" msgstr "مقاطع الØركة:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "تغيير قيمة ÙÙŠ المصÙÙˆÙØ©" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "تمكين/إيقا٠هذا المسار." @@ -209,6 +234,10 @@ msgid "Time (s): " msgstr "وقت التلاشي X (ثواني):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "متواصل" @@ -262,6 +291,21 @@ msgid "Delete Key(s)" msgstr "Ù…ÙØ§ØªÙŠØ Øذ٠التØريك" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "تغيير إسم الØركة:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "عقدة الØركة" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "تغيير تكرير الØركة" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Øذ٠مسار التØريك" @@ -303,6 +347,16 @@ msgid "Anim Insert Key" msgstr "أض٠مÙØªØ§Ø Øركة" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "تغيير إسم الØركة:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "اعادة ترتيب التØميلات التلقائية" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -327,6 +381,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "إضاÙØ© مسار" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -335,10 +394,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "خط التØريك ثلاثي الأبعاد" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "إضاÙØ© مسار" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "استدعاء أسلوب المسار" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -351,6 +425,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "لصق المÙعامل" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Ù…ÙØªØ§Ø ØªÙƒØ¨ÙŠØ± Øركة" @@ -397,11 +476,6 @@ msgid "Copy Tracks" msgstr "إنسخ المÙعامل" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "لصق المÙعامل" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "تكبير المØدد" @@ -504,6 +578,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "مقاطع الصوت:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "تغيير Øجم المصÙÙˆÙØ©" @@ -1317,6 +1404,12 @@ msgstr "" msgid "Packing" msgstr "ÙŠÙŽØزم\"ينتج المل٠المضغوط\"" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1906,6 +1999,15 @@ msgid "Save changes to '%s' before closing?" msgstr "هل تريد ØÙظ التغييرات إلي'%s' قبل الإغلاق؟" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Ùشل تØميل المورد." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "ØÙظ المشهد كـ..." @@ -3583,12 +3685,49 @@ msgstr "تØميل" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Ù…Ø³Ø Ø§Ù„Ù†Ù‚Ø·Ø©" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "تغيير وقت الدمج" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "تغيير وقت الدمج" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "إضاÙØ© نقطة" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "أض٠Øركة" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Ù…Ø³Ø Ø§Ù„Ø¨ÙˆÙ„ÙŠ والنقطة" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3630,6 +3769,30 @@ msgid "Triangle already exists" msgstr "خطأ: إسم الØركة موجود بالÙعل!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "إضاÙØ© مسار" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "تغيير وقت الدمج" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "تغيير وقت الدمج" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Ù…Ø³Ø Ø§Ù„Ø¨ÙˆÙ„ÙŠ والنقطة" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3638,6 +3801,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "تبديل التØميل التلقائي العام" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3655,6 +3823,11 @@ msgid "Blend:" msgstr "الدمج:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "تØديث التغييرات" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "تعديل المصاÙÙŠ" @@ -3664,11 +3837,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "وضع التØريك" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "متصل" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "غير متصل" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "صورة متØركة" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "إنشاء عقدة" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "تمكين/إيقا٠هذا المسار." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "تغيير خط الØركة" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3684,6 +3900,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "إسم العقدة:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3918,6 +4140,21 @@ msgid "Cross-Animation Blend Times" msgstr "وقت الدمج عبر الØركة" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "وضع التØريك" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "تØول" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3947,6 +4184,20 @@ msgid "No playback resource set at path: %s." msgstr "ليس ÙÙŠ مسار الموارد." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Ù…ÙسÙØ:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "عقدة التنقل" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4779,6 +5030,10 @@ msgstr "إبقي ضاغطاً علي Shift لتعديل المماس Ùرديا٠msgid "Bake GI Probe" msgstr "طبخ مجس GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "العنصر %d" @@ -5967,6 +6222,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "أنشئ نقاط إنبعاث من الشبكة" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "الÙردية" @@ -6079,10 +6343,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6127,7 +6387,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6220,6 +6480,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6228,6 +6494,11 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "الكبس إلي الشبكة" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "تØديد الوضع (ض)" @@ -6509,10 +6780,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6861,6 +7128,11 @@ msgstr "زر الÙأرة الأيمن: Ù…Ø³Ø Ø§Ù„Ù†Ù‚Ø·Ø©." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "إنشاء %s جديد" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "أنشئ شكل جديد من لا شئ." @@ -7045,6 +7317,28 @@ msgid "TileSet" msgstr "مجموعة البلاط" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Øدد كإÙتراضي من أجل '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Ù…ÙØ§ØªÙŠØ Ù†Ø³Ø® التØريك" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7061,6 +7355,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "تعديل المصاÙÙŠ" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7074,7 +7377,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7087,6 +7399,10 @@ msgid "Exporting All" msgstr "التصدير كـ %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8080,6 +8396,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "ØÙظ المشهد" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8116,6 +8437,11 @@ msgstr "أنشئ عظام" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "ØÙظ المشهد" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "إنشاء عقدة" @@ -8538,6 +8864,20 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "تخÙي٠للخارج" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "تغيير المرتكزات" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8754,6 +9094,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9050,10 +9394,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9136,6 +9476,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "تعديل العنصر القماشي" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10030,10 +10375,6 @@ msgstr "" #~ msgid "Search in files" #~ msgstr "إبØØ« ÙÙŠ الأصناÙ" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "الكبس إلي الشبكة" - #~ msgid "Bake!" #~ msgstr "طبخ!" @@ -10085,12 +10426,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "خارج-داخل" -#~ msgid "Change Anim Len" -#~ msgstr "تغيير خط الØركة" - -#~ msgid "Change Anim Loop" -#~ msgstr "تغيير تكرير الØركة" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "أنشي Ù…ÙØªØ§Ø Øركة ذا قيمة مكتوبة" @@ -10244,9 +10579,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "تم إضاÙته:" -#~ msgid "Removed:" -#~ msgstr "Ù…ÙسÙØ:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "لا يمكن ØÙظ النسيج الÙرعي للأطلس:" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index cbab22b334..a629e78a9c 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -92,6 +92,15 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "LMB: ПремеÑти Точка." + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -121,6 +130,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Промени Името на ÐнимациÑта:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -172,6 +191,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -198,6 +221,10 @@ msgid "Time (s): " msgstr "Стъпка (Ñек.):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -250,6 +277,21 @@ msgid "Delete Key(s)" msgstr "Изтрий Key(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Промени Името на ÐнимациÑта:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Промени Името на ÐнимациÑта:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Промени Името на ÐнимациÑта:" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -291,6 +333,16 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Промени Името на ÐнимациÑта:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "ПоÑтавÑне на възелите" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -315,6 +367,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "ДобавÑне на нови пътечки." + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -323,10 +380,24 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "ДобавÑне на нови пътечки." + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "ДобавÑне на нови пътечки." + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -339,6 +410,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "ПоÑтавÑне на възелите" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -383,11 +459,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "ПоÑтавÑне на възелите" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -489,6 +560,19 @@ msgstr "" msgid "Copy" msgstr "Копиране" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "ДобавÑне на нови пътечки." + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "ПреоразмерÑване на маÑива" @@ -1287,6 +1371,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1848,6 +1938,15 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "ÐеуÑпешно зареждане на реÑурÑите." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Запазване на Ñцената като..." @@ -3505,12 +3604,47 @@ msgstr "Зареди..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "LMB: ПремеÑти Точка." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Добави Възел..." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Добави ÐнимациÑ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "ПремеÑтване на Полигон" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3553,6 +3687,28 @@ msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp #, fuzzy +msgid "Add Triangle" +msgstr "ДобавÑне на нови пътечки." + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "ПремеÑтване на Полигон" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D не принадлежи на възел тип AnimationTree." @@ -3561,6 +3717,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Покажи Любими" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3578,6 +3739,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3588,11 +3753,53 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Режим на ПремеÑтване" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "ИзрÑзване на възелите" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Разкачи" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Ðово Име на ÐнимациÑ:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Избиране на вÑичко" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Покажи Любими" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3608,6 +3815,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Възел" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3841,6 +4054,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Режим на ПремеÑтване" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "ДобавÑне на превод" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3870,6 +4098,20 @@ msgid "No playback resource set at path: %s." msgstr "Обектът не е базиран на реÑурÑен файл" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Премахни" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Преход" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4689,6 +4931,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5855,6 +6101,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Възпроизвеждане на Ñцена по избор" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5964,10 +6219,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Изглед Отгоре." @@ -6012,8 +6263,9 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr "Изглед ОтдÑÑно." #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." @@ -6105,6 +6357,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6113,6 +6371,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Режим на Селектиране (Q)" @@ -6393,10 +6655,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6738,6 +6996,11 @@ msgstr "Изтрий точки." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Създай нови възли." + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Създай нов полигон от нулата." @@ -6922,6 +7185,28 @@ msgid "TileSet" msgstr "Файл:" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Задай по Подразбиране за '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Ðаправи дупликат на Key(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6937,6 +7222,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Промени Филтрите" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6950,7 +7244,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6963,6 +7266,10 @@ msgid "Exporting All" msgstr "ИзнаÑÑне за %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7971,6 +8278,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Запазване на Ñцената" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8006,6 +8318,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Запазване на Ñцената" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Създаване на папка" @@ -8435,6 +8752,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8657,6 +8986,11 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "ÐаÑтройки" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8960,10 +9294,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9048,6 +9378,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Вкарай Коментар" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9873,9 +10208,6 @@ msgstr "" #~ msgid "Select a split to erase it." #~ msgstr "Избери разделение и го изтрий" -#~ msgid "Add Node.." -#~ msgstr "Добави Възел..." - #~ msgid "Zoom out" #~ msgstr "Отдалечи" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index 5d24e2b222..845cceaf35 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -93,6 +93,16 @@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহ অনà§à¦²à¦¿à¦ªà¦¿ করৠmsgid "Delete Selected Key(s)" msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহ অপসারণ করà§à¦¨" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "ইনপà§à¦Ÿ যোগ করà§à¦¨" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "বিনà§à¦¦à§ সরান" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ (Anim) কি ডà§à¦ªà§à¦²à¦¿à¦•à§‡à¦Ÿ করà§à¦¨" @@ -125,6 +135,16 @@ msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ (Anim) কল পরিবরà§à¦¤à¦¨ ঠ#: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° লà§à¦ª পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° লà§à¦ª পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "পà§à¦°à¦ªà¦¾à¦°à§à¦Ÿà¦¿:" @@ -182,6 +202,11 @@ msgstr "কà§à¦²à¦¿à¦ªà¦¸à¦®à§‚হ" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারির মান পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "বিকà§à¦·à§‡à¦ª-হীন মোড" @@ -209,6 +234,11 @@ msgid "Time (s): " msgstr "X-ফেড/বিলীন সময় (সেঃ):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "সকà§à¦°à¦¿à¦¯à¦¼ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "অবিচà§à¦›à¦¿à¦¨à§à¦¨/নিরবচà§à¦›à¦¿à¦¨à§à¦¨" @@ -262,6 +292,21 @@ msgid "Delete Key(s)" msgstr "নোড(সমূহ) অপসারণ করà§à¦¨" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° নাম পরিবরà§à¦¤à¦¨ করà§à¦¨:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° নোড" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° লà§à¦ª পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ (Anim) টà§à¦°à§à¦¯à¦¾à¦• রিমà§à¦ করà§à¦¨" @@ -303,6 +348,16 @@ msgid "Anim Insert Key" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡ (Anim) চাবি যোগ করà§à¦¨" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° FPS পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Autoload সমূহ পà§à¦¨à¦°à§à¦¬à¦¿à¦¨à§à¦¯à¦¸à§à¦¤ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -327,6 +382,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ (Anim) টà§à¦°à§à¦¯à¦¾à¦• যোগ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -335,11 +395,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "রà§à¦ªà¦¾à¦¨à§à¦¤à¦°à§‡à¦° ধরণ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ (Anim) টà§à¦°à§à¦¯à¦¾à¦• যোগ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡ (Anim) টà§à¦°à§à¦¯à¦¾à¦•/পথ à¦à¦¬à¦‚ চাবি যোগ করà§à¦¨" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿà§‡ চলক-পà§à¦°à¦¾à¦ªà¦• (VariableGet) পাওয়া যায়নি: " @@ -353,6 +428,11 @@ msgid "Clipboard is empty" msgstr "রিসোরà§à¦¸à§‡à¦° কà§à¦²à§€à¦ªà¦¬à§‹à¦°à§à¦¡ খালি!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "মানসমূহ পà§à¦°à¦¤à¦¿à¦²à§‡à¦ªà¦¨/পেসà§à¦Ÿ করà§à¦¨" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° (Anim) চাবিসমূহের আকার পরিবরà§à¦¤à¦¨ করà§à¦¨" @@ -399,11 +479,6 @@ msgid "Copy Tracks" msgstr "মানসমূহ পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿/কপি করà§à¦¨" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "মানসমূহ পà§à¦°à¦¤à¦¿à¦²à§‡à¦ªà¦¨/পেসà§à¦Ÿ করà§à¦¨" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহের আকার পরিবরà§à¦¤à¦¨ করà§à¦¨" @@ -506,6 +581,19 @@ msgstr "" msgid "Copy" msgstr "পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿/কপি করà§à¦¨" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "অডিও শà§à¦°à§‹à¦¤à¦¾" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারি পà§à¦¨à¦°à§à¦®à¦¾à¦ªà¦¨ করà§à¦¨" @@ -1338,6 +1426,12 @@ msgstr "" msgid "Packing" msgstr "পà§à¦¯à¦¾à¦•/গà§à¦šà§à¦›à¦¿à¦¤ করা" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1955,6 +2049,16 @@ msgid "Save changes to '%s' before closing?" msgstr "'%s' বনà§à¦§ করার পূরà§à¦¬à§‡ পরিবরà§à¦¤à¦¨à¦¸à¦®à§‚হ সংরকà§à¦·à¦£ করবেন?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "রিসোরà§à¦¸ লোড বà§à¦¯à¦°à§à¦¥ হয়েছে।" + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "বৃহৎ গঠনবিনà§à¦¯à¦¾à¦¸à§‡à¦° জনà§à¦¯ শà§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦à¦•à¦Ÿà¦¿ ফাইল পà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "দৃশà§à¦¯ à¦à¦‡à¦°à§‚পে সংরকà§à¦·à¦£ করà§à¦¨..." @@ -3728,12 +3832,49 @@ msgstr "লোড" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "বিনà§à¦¦à§ সরান" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "বà§à¦²à§‡à¦¨à§à¦¡-à¦à¦° সময় পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "বà§à¦²à§‡à¦¨à§à¦¡-à¦à¦° সময় পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "নোড সংযোজন করà§à¦¨" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ যà§à¦•à§à¦¤ করà§à¦¨" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "পথের বিনà§à¦¦à§ অপসারণ করà§à¦¨" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3776,6 +3917,31 @@ msgid "Triangle already exists" msgstr "'%s' অà§à¦¯à¦¾à¦•à¦¶à¦¨ ইতিমধà§à¦¯à§‡à¦‡ বিদà§à¦¯à¦®à¦¾à¦¨!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "চলক/à¦à§‡à¦°à¦¿à§Ÿà§‡à¦¬à¦² সংযোজন করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "বà§à¦²à§‡à¦¨à§à¦¡-à¦à¦° সময় পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "বà§à¦²à§‡à¦¨à§à¦¡-à¦à¦° সময় পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "পথের বিনà§à¦¦à§ অপসারণ করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "চলক/à¦à§‡à¦°à¦¿à§Ÿà§‡à¦¬à¦² অপসারণ করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3784,6 +3950,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "AutoLoad à¦à¦° সারà§à¦¬à¦œà¦¨à§€à¦¨ মানসমূহ অদলবদল/টগল করà§à¦¨" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3802,6 +3973,11 @@ msgid "Blend:" msgstr "বà§à¦²à§‡à¦¨à§à¦¡/মিশà§à¦°à¦£:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "পরিবরà§à¦¤à¦¨à¦¸à¦®à§‚হ হাল-নাগাদ করà§à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3812,11 +3988,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "শাখা (tree) হতে নোড (সমূহ) যà§à¦•à§à¦¤ করà§à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "মোড (Mode) সরান" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "সংযোগ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "সংযোগ বিচà§à¦›à¦¿à¦¨à§à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "নোড(সমূহ) অপসারণ করà§à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "বিকà§à¦·à§‡à¦ª-হীন মোড" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "বà§à¦²à§‡à¦¨à§à¦¡-à¦à¦° সময় পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3832,6 +4052,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "নোডের নাম:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -4073,6 +4299,21 @@ msgstr "আনà§à¦¤-অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨ বà§à¦²à§‡à¦¨à§à¦¡ সম #: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Move Node" +msgstr "মোড (Mode) সরান" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "অনà§à¦¬à¦¾à¦¦ সংযোগ করà§à¦¨" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "নোড সংযোজন করà§à¦¨" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy msgid "End" msgstr "সমাপà§à¦¤à¦¿(সমূহ)" @@ -4102,6 +4343,20 @@ msgid "No playback resource set at path: %s." msgstr "রিসোরà§à¦¸à§‡à¦° পথে নয়।" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "অপসারিত:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "টà§à¦°à§à¦¯à¦¾à¦¨à¦œà¦¿à¦¶à¦¨ নোড" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4967,6 +5222,10 @@ msgstr "টà§à¦¯à¦¾à¦¨à¦œà§‡à¦¨à§à¦Ÿà¦—à§à¦²à¦¿ আলাদা আলাদà msgid "Bake GI Probe" msgstr "জি আই পà§à¦°à§‹à¦¬ বেক করà§à¦¨" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "বসà§à¦¤à§ %d" @@ -6190,6 +6449,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Mesh হতে Emitter তৈরি করà§à¦¨" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "সà§à¦•à§‡à¦²à§‡à¦Ÿà¦¨/কাঠাম..." @@ -6308,10 +6576,6 @@ msgid "Vertices" msgstr "à¦à¦¾à¦°à¦Ÿà§‡à¦•à§à¦¸" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "à¦à¦« পি à¦à¦¸" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "শীরà§à¦· দরà§à¦¶à¦¨à¥¤" @@ -6356,7 +6620,8 @@ msgid "Rear" msgstr "পশà§à¦šà¦¾à§Ž" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "দরà§à¦¶à¦¨à§‡à¦° সাথে সারিবদà§à¦§ করà§à¦¨" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6459,6 +6724,12 @@ msgid "Freelook Speed Modifier" msgstr "ফà§à¦°à¦¿ লà§à¦• সà§à¦ªà¦¿à¦¡ মডিফায়ার" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "তথà§à¦¯ দেখà§à¦¨" @@ -6469,6 +6740,11 @@ msgstr "XForm à¦à¦° সংলাপ" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy +msgid "Snap Nodes To Floor" +msgstr "সà§à¦¨à§à¦¯à¦¾à¦ª মোড:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "Select Mode (Q)" msgstr "মোড (Mode) বাছাই করà§à¦¨" @@ -6761,10 +7037,6 @@ msgid "Add Empty" msgstr "খালি বসà§à¦¤à§ যোগ করà§à¦¨" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° লà§à¦ª পরিবরà§à¦¤à¦¨ করà§à¦¨" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° FPS পরিবরà§à¦¤à¦¨ করà§à¦¨" @@ -7122,6 +7394,11 @@ msgstr "মাউসের ডান বোতাম: বিনà§à¦¦à§ মà§à #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "নতà§à¦¨ তৈরি করà§à¦¨" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "আরমà§à¦ হতে নতà§à¦¨ polygon তৈরি করà§à¦¨à¥¤" @@ -7307,6 +7584,29 @@ msgid "TileSet" msgstr "TileSet (টাইল-সেট)..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "'% s' à¦à¦° জনà§à¦¯ ডিফলà§à¦Ÿ হিসাবে সেট করà§à¦¨" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "শেডার" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "নোড(সমূহ) পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ করà§à¦¨" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "à¦à¦¾à¦°à¦Ÿà§‡à¦•à§à¦¸" @@ -7325,6 +7625,16 @@ msgstr "ডান" msgid "VisualShader" msgstr "শেডার" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "নোড ফিলà§à¦Ÿà¦¾à¦°à¦¸à¦®à§‚হ সমà§à¦ªà¦¾à¦¦à¦¨ করà§à¦¨" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "পরিবরà§à¦¤à¦¨à¦¸à¦®à§‚হ হাল-নাগাদ করà§à¦¨" + #: editor/project_export.cpp #, fuzzy msgid "Runnable" @@ -7341,10 +7651,17 @@ msgid "Delete preset '%s'?" msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলসমূহ অপসারণ করবেন?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"à¦à¦‡ পà§à¦²à§à¦¯à¦¾à¦Ÿà¦«à¦°à§à¦®à§‡à¦° জনà§à¦¯ দরকারি à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ টেমপà§à¦²à§‡à¦Ÿà¦—à§à¦²à¦¿ কà§à¦·à¦¤à¦¿à¦—à§à¦°à¦¸à§à¦¥ হয়েছে অথবা খà§à¦à¦œà§‡ পাওয়া " -"যাচà§à¦›à§‡ না:" #: editor/project_export.cpp #, fuzzy @@ -7357,6 +7674,12 @@ msgid "Exporting All" msgstr "%s à¦à¦° জনà§à¦¯ à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ (export) হচà§à¦›à§‡" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"à¦à¦‡ পà§à¦²à§à¦¯à¦¾à¦Ÿà¦«à¦°à§à¦®à§‡à¦° জনà§à¦¯ দরকারি à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ টেমপà§à¦²à§‡à¦Ÿà¦—à§à¦²à¦¿ কà§à¦·à¦¤à¦¿à¦—à§à¦°à¦¸à§à¦¥ হয়েছে অথবা খà§à¦à¦œà§‡ পাওয়া " +"যাচà§à¦›à§‡ না:" + +#: editor/project_export.cpp #, fuzzy msgid "Presets" msgstr "পà§à¦°à¦¿à¦¸à§‡à¦Ÿ..." @@ -8418,6 +8741,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "অরà§à¦¥à¦ªà§‚রà§à¦¨!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "নোড(সমূহ) অপসারণ করবেন?" @@ -8453,6 +8781,11 @@ msgstr "সà§à¦¥à¦¾à¦¨à§€à§Ÿ করà§à¦¨" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "অরà§à¦¥à¦ªà§‚রà§à¦¨!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "নোড তৈরি করà§à¦¨" @@ -8913,6 +9246,21 @@ msgid "Set From Tree" msgstr "শাখা হতে সà§à¦¥à¦¾à¦ªà¦¨ করà§à¦¨" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "বহিঃ-সহজাগমন" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "শরà§à¦Ÿà¦•à¦¾à¦Ÿà¦¸à¦®à§‚হ" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "অà§à¦¯à¦¾à¦‚করসমূহ পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "শরà§à¦Ÿà¦•à¦¾à¦Ÿà¦¸à¦®à§‚হ" @@ -9138,6 +9486,11 @@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহ অনà§à¦²à¦¿à¦ªà¦¿ করৠ#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy +msgid "GridMap Paint" +msgstr "সà§à¦¨à§à¦¯à¦¾à¦ª সেটিংস" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Grid Map" msgstr "গà§à¦°à¦¿à¦¡ সà§à¦¨à§à¦¯à¦¾à¦ª" @@ -9471,10 +9824,6 @@ msgid "Change Expression" msgstr "অà¦à¦¿à¦¬à§à¦¯à¦•à§à¦¤à¦¿ (Expression) পরিবরà§à¦¤à¦¨ করà§à¦¨" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "নোড সংযোজন করà§à¦¨" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯ চাবিসমূহ অপসারণ করà§à¦¨" @@ -9575,6 +9924,11 @@ msgstr "ইনপà§à¦Ÿ নাম পরিবরà§à¦¤à¦¨ করà§à¦¨" #: modules/visual_script/visual_script_editor.cpp #, fuzzy +msgid "Resize Comment" +msgstr "CanvasItem সমà§à¦ªà¦¾à¦¦à¦¨ করà§à¦¨" + +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Can't copy the function node." msgstr "'..' তে পরিচালনা করা সমà§à¦à¦¬ নয়" @@ -10406,6 +10760,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "à¦à¦« পি à¦à¦¸" + #, fuzzy #~ msgid "Warnings:" #~ msgstr "সতরà§à¦•à¦¤à¦¾" @@ -10582,10 +10939,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "à¦à¦¤à§‡ রূপানà§à¦¤à¦° করà§à¦¨..." -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "সà§à¦¨à§à¦¯à¦¾à¦ª মোড:" - #~ msgid "Rotate 0 degrees" #~ msgstr "০ ডিগà§à¦°à¦¿ ঘোরানà§" @@ -11118,9 +11471,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "সংযোজিত:" -#~ msgid "Removed:" -#~ msgstr "অপসারিত:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€à¦° উপ-গঠনবিনà§à¦¯à¦¾à¦¸ (subtexture) সংরকà§à¦·à¦£ অসমরà§à¦¥ হয়েছে:" @@ -11381,9 +11731,6 @@ msgstr "" #~ msgid "Error importing:" #~ msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿà§‡ সমসà§à¦¯à¦¾ হয়েছে:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "বৃহৎ গঠনবিনà§à¦¯à¦¾à¦¸à§‡à¦° জনà§à¦¯ শà§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦à¦•à¦Ÿà¦¿ ফাইল পà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤" - #~ msgid "Max Texture Size:" #~ msgstr "গঠনবিনà§à¦¯à¦¾à¦¸à§‡à¦° সরà§à¦¬à§‡à¦¾à¦šà§à¦š আকার:" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index d43dae0f8e..e8642ec86f 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -85,6 +85,16 @@ msgstr "Duplica les Claus seleccionades" msgid "Delete Selected Key(s)" msgstr "Elimina les Claus seleccionades" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Afegeix un punt" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Mou el Punt" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplica les Claus" @@ -114,6 +124,16 @@ msgid "Anim Change Call" msgstr "Modifica la Crida" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Modifica el bucle d'Animació" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Modifica el bucle d'Animació" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Pista de Propietats" @@ -163,6 +183,11 @@ msgid "Anim Clips:" msgstr "Talls d'Animació:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Modifica el Valor de la Taula" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Activa/Desactiva la Pista." @@ -187,6 +212,11 @@ msgid "Time (s): " msgstr "Temps (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Activa Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Continu" @@ -237,6 +267,21 @@ msgid "Delete Key(s)" msgstr "Elimina les Claus" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Modifica el Nom de l'Animació:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Mode d'Interpolació" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Modifica el bucle d'Animació" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Treu la Pista" @@ -279,6 +324,16 @@ msgid "Anim Insert Key" msgstr "Insereix una Clau" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Modifica els FPS de l'Animació" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Reorganitza AutoCà rregues" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" "Les pistes de Transformació només s'apliquen a nodes del tipus Espacial." @@ -310,6 +365,11 @@ msgid "Not possible to add a new track without a root" msgstr "No es pot afegir una nova pista sense cap arrel" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Afegeix una Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "El camà de la Pista no és và lid i per tant no s'hi poden afegir claus." @@ -318,11 +378,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "No s'hi pot inserir cap Clau. La pista no és del tipus \"Spatial\"" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Pista de Transformació 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Afegeix una Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "No s'hi pot afegit cap clau de mètode. El camà de la pista no és và lid." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Pista de Crida de Mètodes" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "No s'ha trobat el mètode en l'objecte: " @@ -335,6 +410,10 @@ msgid "Clipboard is empty" msgstr "El porta-retalls és buit" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Enganxa les Pistes" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Escala les Claus" @@ -378,10 +457,6 @@ msgid "Copy Tracks" msgstr "Còpia les Pistes" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Enganxa les Pistes" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Escala la Selecció" @@ -483,6 +558,19 @@ msgstr "Tria les Pistes per copiar:" msgid "Copy" msgstr "Copia" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Talls d'Àudio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimensiona la Matriu" @@ -1301,6 +1389,12 @@ msgstr "" msgid "Packing" msgstr "Compressió" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1896,6 +1990,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Desar els canvis a '%s' abans de tancar?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "No s'ha pogut carregar el recurs." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Anomena i Desa l'Escena..." @@ -3548,6 +3651,22 @@ msgstr "Carrega..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Mou el Punt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Modifica el Temps de Mescla" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Modifica el Temps de Mescla" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3556,6 +3675,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Afegeix un Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Afegeix una Animació" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Elimina un Punt del CamÃ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3597,6 +3737,31 @@ msgid "Triangle already exists" msgstr "El triangle ja existeix" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Afegeix una Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Modifica el Temps de Mescla" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Modifica el Temps de Mescla" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Elimina un Punt del CamÃ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Elimina la Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D no pertany a cap node AnimationTree." @@ -3605,6 +3770,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "En no haver-hi cap triangle, no es pot mesclar res." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Commuta les Globals d'AutoCà rrega" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Crea triangles connectant punts." @@ -3622,6 +3792,11 @@ msgid "Blend:" msgstr "Mescla:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Canvis de Material" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Edita Filtres" @@ -3631,11 +3806,55 @@ msgid "Output node can't be added to the blend tree." msgstr "No es pot afegir el node de sortida a l'arbre de mescla." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Afegeix Nodes des d'Arbre" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Mode de moviment" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "No es pot connectar. El port és en ús o la connexió no és và lida." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Connectat" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Desconnectat" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animació" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Elimina els Nodes" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Activa/Desactiva la Pista." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "S'ha Modificat el Filtre de Locale" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "En no haver-se establert cap reproductor d'animacions, no es poden recuperar " @@ -3653,6 +3872,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nom del node:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3891,6 +4116,21 @@ msgstr "Temps de mescla entre Animacions" #: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Move Node" +msgstr "Mode de moviment" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Afegeix una Traducció" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Afegeix un Node" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy msgid "End" msgstr "Final/s" @@ -3920,6 +4160,20 @@ msgid "No playback resource set at path: %s." msgstr "Fora del camà dels recursos." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Eliminat:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Node de Transició" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4756,6 +5010,10 @@ msgstr "Prem Maj. per editar les tangents individualment" msgid "Bake GI Probe" msgstr "Precalcula la Sonda d'IG" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Element %d" @@ -5947,6 +6205,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Crea Punts d'Emissió des d'una Malla" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6060,10 +6327,6 @@ msgid "Vertices" msgstr "Vèrtexs" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vista superior." @@ -6108,7 +6371,8 @@ msgid "Rear" msgstr "Darrere" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Alinea amb la Vista" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6202,6 +6466,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de la Velocitat de la Vista Lliure" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Mostra la Informació" @@ -6211,6 +6481,11 @@ msgid "XForm Dialog" msgstr "Dià leg XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Alinea-ho amb la graella" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Mode Selecció (Q)" @@ -6497,10 +6772,6 @@ msgid "Add Empty" msgstr "Afegeix un element Buit" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Modifica el bucle d'Animació" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Modifica els FPS de l'Animació" @@ -6844,6 +7115,11 @@ msgstr "Elimina un Punt." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Crea Nou %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Crea un nou PolÃgon del no-res." @@ -7035,6 +7311,29 @@ msgid "TileSet" msgstr "Tile Set" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Establir com a valor Predeterminat per a '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Ombreig" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplica els Nodes" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "Vèrtexs" @@ -7054,6 +7353,16 @@ msgstr "Dreta" msgid "VisualShader" msgstr "Ombreig" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Edita Filtres" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Canvis de Ombreig" + #: editor/project_export.cpp msgid "Runnable" msgstr "Executable" @@ -7067,8 +7376,17 @@ msgid "Delete preset '%s'?" msgstr "Esborrar la configuració '%s' ?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Manquen d'exportació per aquesta plataforma o s'han malmès:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp #, fuzzy @@ -7081,6 +7399,10 @@ msgid "Exporting All" msgstr "Exportació per a %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Manquen d'exportació per aquesta plataforma o s'han malmès:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Configuracions prestablertes" @@ -8110,6 +8432,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Entesos!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Elimina els Nodes?" @@ -8146,6 +8473,11 @@ msgstr "Local" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Entesos!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Crea un Node" @@ -8587,6 +8919,21 @@ msgid "Set From Tree" msgstr "Estableix des de l'Arbre" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Sortida Lenta" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Dreceres" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Modifica Ancoratges" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Dreceres" @@ -8804,6 +9151,11 @@ msgid "GridMap Duplicate Selection" msgstr "Duplica la Selecció del GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Configuració del GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Mapa de Graella" @@ -9107,10 +9459,6 @@ msgid "Change Expression" msgstr "Modifica l'Expressió" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Afegeix un Node" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Elimina els Nodes de VisualScript" @@ -9197,6 +9545,11 @@ msgid "Change Input Value" msgstr "Modifica el Valor de l'Entrada" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Modifica el elementCanvas" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "No es pot copiar el node de funció." @@ -10062,6 +10415,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Avisos:" @@ -10239,10 +10595,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Converteix en minúscules" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Alinea-ho amb la graella" - #~ msgid "Rotate 0 degrees" #~ msgstr "Gira-ho 0 graus" @@ -10754,9 +11106,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Afegit:" -#~ msgid "Removed:" -#~ msgstr "Eliminat:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No s'ha pogut desar la subtextura de l'atles:" diff --git a/editor/translations/cs.po b/editor/translations/cs.po index b987e1d8ef..b8c1040589 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -9,13 +9,14 @@ # LudÄ›k Novotný <gladosicek@gmail.com>, 2016, 2018. # Martin Novák <maidx@seznam.cz>, 2017. # zxey <r.hozak@seznam.cz>, 2018. -# VojtÄ›ch Å amla <auzkok@seznam.cz>, 2018. +# VojtÄ›ch Å amla <auzkok@seznam.cz>, 2018, 2019. +# Peeter Angelo <contact@peeterangelo.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-10 12:01+0000\n" -"Last-Translator: Josef KuchaÅ™ <josef.kuchar267@gmail.com>\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" +"Last-Translator: VojtÄ›ch Å amla <auzkok@seznam.cz>\n" "Language-Team: Czech <https://hosted.weblate.org/projects/godot-engine/godot/" "cs/>\n" "Language: cs\n" @@ -67,9 +68,8 @@ msgstr "PÅ™i volánà '%s':" #: editor/animation_bezier_editor.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Free" -msgstr "Uvolnit" +msgstr "Volný" #: editor/animation_bezier_editor.cpp msgid "Balanced" @@ -85,14 +85,22 @@ msgid "Insert Key Here" msgstr "Vložit klÃÄ zde" #: editor/animation_bezier_editor.cpp -#, fuzzy msgid "Duplicate Selected Key(s)" -msgstr "Duplikovat výbÄ›r" +msgstr "Duplikovat klÃÄ(e)" #: editor/animation_bezier_editor.cpp -#, fuzzy msgid "Delete Selected Key(s)" -msgstr "Smazat vybraný" +msgstr "Smazat klÃÄ(e)" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "PÅ™idat bod" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "PÅ™esunout body" #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" @@ -123,6 +131,16 @@ msgid "Anim Change Call" msgstr "Animace: zmÄ›na volánÃ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "ZmÄ›nit smyÄku animace" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "ZmÄ›nit smyÄku animace" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Stopa vlastnosti" @@ -172,12 +190,17 @@ msgid "Anim Clips:" msgstr "AnimaÄnà klipy:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "ZmÄ›nit hodnotu pole" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Aktivovat/Deaktivovat tuto stopu." #: editor/animation_track_editor.cpp msgid "Update Mode (How this property is set)" -msgstr "" +msgstr "Režim aktualizece (jak je tato vlastnost nastavena)" #: editor/animation_track_editor.cpp msgid "Interpolation Mode" @@ -196,6 +219,11 @@ msgid "Time (s): " msgstr "ÄŒas (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Povolit" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Spojité" @@ -246,6 +274,21 @@ msgid "Delete Key(s)" msgstr "Odstranit klÃÄ(e)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "ZmÄ›nit název animace:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "InterpolaÄnà režim" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "ZmÄ›nit smyÄku animace" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Odstranit stopu animace" @@ -287,6 +330,16 @@ msgid "Anim Insert Key" msgstr "Animace: vložit klÃÄ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "ZmÄ›nit FPS animace" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "PÅ™eskupit Autoloady" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -315,6 +368,11 @@ msgid "Not possible to add a new track without a root" msgstr "Nenà možné pÅ™idat novou stopu bez koÅ™enového uzlu" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "PÅ™idat stopu" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -323,10 +381,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Stopa nenà typu Spatial, nelze vložit klÃÄ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Stopa 3D transformace" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "PÅ™idat stopu" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Stopa volánà metody" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Tato metoda nebyla v objektu nalezena: " @@ -339,6 +412,10 @@ msgid "Clipboard is empty" msgstr "Schránka je prázdná" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Vložit stopy" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Animace: zmÄ›nit měřÃtko klÃÄů" @@ -381,10 +458,6 @@ msgid "Copy Tracks" msgstr "KopÃrovat stopy" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Vložit stopy" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ZmÄ›nit měřÃtko výbÄ›ru" @@ -405,14 +478,12 @@ msgid "Delete Selection" msgstr "Smazat vybÄ›r" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Go to Next Step" -msgstr "JÃt k dalÅ¡Ãmu kroku" +msgstr "PÅ™ejÃt k dalÅ¡Ãmu kroku" #: editor/animation_track_editor.cpp -#, fuzzy msgid "Go to Previous Step" -msgstr "JÃt k pÅ™edchozÃmu kroku" +msgstr "PÅ™ejÃt k pÅ™edchozÃmu kroku" #: editor/animation_track_editor.cpp msgid "Optimize Animation" @@ -486,6 +557,19 @@ msgstr "Zvolte stopy ke zkopÃrovánÃ:" msgid "Copy" msgstr "KopÃrovat" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Audio klipy:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "ZmÄ›nit velikost pole" @@ -653,9 +737,8 @@ msgid "Disconnect" msgstr "Odpojit" #: editor/connections_dialog.cpp -#, fuzzy msgid "Connect Signal: " -msgstr "PÅ™ipojuji signál:" +msgstr "PÅ™ipojit Signál: " #: editor/connections_dialog.cpp msgid "Edit Connection: " @@ -1290,29 +1373,30 @@ msgid "Storing File:" msgstr "Ukládám soubor:" #: editor/editor_export.cpp -#, fuzzy msgid "No export template found at the expected path:" -msgstr "" -"Nebyly nalezeny žádné exportnà šablony.\n" -"StáhnÄ›te a nainstalujte exportnà šablony." +msgstr "Na oÄekávané cestÄ› nebyly nalezeny žádné exportnà šablony:" #: editor/editor_export.cpp msgid "Packing" msgstr "BalÃm" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp -#, fuzzy msgid "Custom debug template not found." -msgstr "Vlastnà ladÃcà balÃÄek nebyl nalezen." +msgstr "Vlastnà ladÃcà šablona nebyla nalezena." #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp -#, fuzzy msgid "Custom release template not found." -msgstr "Vlastnà balÃÄek k uveÅ™ejnÄ›nà nebyl nalezen." +msgstr "Vlastnà šablona k uveÅ™ejnÄ›nà nebyla nalezena." #: editor/editor_export.cpp platform/javascript/export/export.cpp msgid "Template file not found:" @@ -1866,6 +1950,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Uložit zmÄ›ny '%s' pÅ™ed zavÅ™enÃm?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Selhalo nahránà zdroje." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Uložit scénu jako..." @@ -2385,9 +2478,8 @@ msgid "Save & Restart" msgstr "Uložit a restartovat" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "ToÄà se, když se okno pÅ™ekresluje!" +msgstr "ToÄà se, když se okno editoru pÅ™ekresluje." #: editor/editor_node.cpp msgid "Update Always" @@ -2593,14 +2685,12 @@ msgid "[Empty]" msgstr "[Prázdné]" #: editor/editor_properties.cpp editor/plugins/root_motion_editor_plugin.cpp -#, fuzzy msgid "Assign..." -msgstr "PÅ™iÅ™adit.." +msgstr "PÅ™iÅ™adit..." #: editor/editor_properties.cpp -#, fuzzy msgid "Invalid RID" -msgstr "Neplatná cesta" +msgstr "Neplatné RID" #: editor/editor_properties.cpp msgid "" @@ -3071,11 +3161,11 @@ msgstr "PÅ™ejmenovat" #: editor/filesystem_dock.cpp msgid "Previous Directory" -msgstr "PÅ™edchozà adresář" +msgstr "PÅ™edchozà složka" #: editor/filesystem_dock.cpp msgid "Next Directory" -msgstr "NásledujÃcà adresář" +msgstr "NásledujÃcà složka" #: editor/filesystem_dock.cpp msgid "Re-Scan Filesystem" @@ -3172,7 +3262,6 @@ msgid "Group name already exists." msgstr "Název skupiny již existuje." #: editor/groups_editor.cpp -#, fuzzy msgid "Invalid group name." msgstr "Neplatný název skupiny." @@ -3467,21 +3556,18 @@ msgid "Erase points." msgstr "Vymazat body." #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Edit Polygon" -msgstr "Editovat polygon" +msgstr "Upravit polygon" #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "Insert Point" msgstr "Vložit polygon" #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Edit Polygon (Remove Point)" -msgstr "Upravit polygon (Odstranit bod)" +msgstr "Upravit polygon (odstranit bod)" #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Remove Polygon And Point" msgstr "Odstranit polygon a bod" @@ -3497,9 +3583,22 @@ msgstr "PÅ™idat animaci" #: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp -#, fuzzy msgid "Load..." -msgstr "NaÄÃst.." +msgstr "NaÄÃst..." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "PÅ™esunout body" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp @@ -3509,6 +3608,27 @@ msgstr "Tento typ uzlu nelze použÃt. Jsou povoleny pouze koÅ™enové uzly." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "PÅ™idat uzel" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "PÅ™idat animaci" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Odstranit bod cesty" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3548,6 +3668,29 @@ msgid "Triangle already exists" msgstr "TrojúhelnÃk již existuje" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "PÅ™idat promÄ›nnou" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Odstranit bod cesty" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Odstranit promÄ›nnou" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3556,6 +3699,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Zobrazit oblÃbené" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3573,6 +3721,11 @@ msgid "Blend:" msgstr "ProlÃnánÃ:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "ZmÄ›ny materiálu" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editovat filtry" @@ -3582,11 +3735,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "PÅ™idat uzel(y) ze stromu" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Režim pÅ™esouvánÃ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "PÅ™ipojeno" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Odpojeno" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Nová animace" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Odstranit uzel/uzly" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Aktivovat/Deaktivovat tuto stopu." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "ZmÄ›nit typ hodnot pole" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3602,10 +3799,15 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp -#: editor/plugins/visual_shader_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Node Renamed" +msgstr "Název uzlu" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." -msgstr "PÅ™idat uzel.." +msgstr "PÅ™idat uzel..." #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/root_motion_editor_plugin.cpp @@ -3614,7 +3816,7 @@ msgstr "Upravit filtrované stopy:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "Enable filtering" -msgstr "" +msgstr "Povolit filtrovánÃ" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" @@ -3675,9 +3877,8 @@ msgid "No animation to copy!" msgstr "Žádná animace pro kopÃrovánÃ!" #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "No animation resource on clipboard!" -msgstr "Nenà v cestÄ› ke zdroji." +msgstr "Ve schránce nenà žádný zdroj animace!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Pasted Animation" @@ -3693,11 +3894,11 @@ msgstr "Žádná animace pro úpravu!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation backwards from current pos. (A)" -msgstr "" +msgstr "PÅ™ehrát zvolenou animaci pozpátku ze souÄasné pozice. (A)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation backwards from end. (Shift+A)" -msgstr "" +msgstr "PÅ™ehrát zvolenou animaci pozpátku od konce. (A)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Stop animation playback. (S)" @@ -3742,7 +3943,7 @@ msgstr "OtevÅ™Ãt v inspektoru" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Display list of animations in player." -msgstr "" +msgstr "Zobrazit seznam animacà v pÅ™ehrávaÄi." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Autoplay on Load" @@ -3830,6 +4031,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Režim pÅ™esouvánÃ" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "PÅ™idat pÅ™eklad" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "PÅ™idat uzel" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Konec" @@ -3859,6 +4075,20 @@ msgid "No playback resource set at path: %s." msgstr "Nenà v cestÄ› ke zdroji." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Odebrat" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "PÅ™echod: " + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -3874,9 +4104,8 @@ msgid "Connect nodes." msgstr "PÅ™ipojit uzly." #: editor/plugins/animation_state_machine_editor.cpp -#, fuzzy msgid "Remove selected node or transition." -msgstr "Odstranit vybranou stopu." +msgstr "Odstranit vybraný uzel nebo pÅ™echod." #: editor/plugins/animation_state_machine_editor.cpp msgid "Toggle autoplay this animation on start, restart or seek to zero." @@ -3946,7 +4175,6 @@ msgid "Blend 0:" msgstr "ProlÃnánà 0:" #: editor/plugins/animation_tree_player_editor_plugin.cpp -#, fuzzy msgid "Blend 1:" msgstr "ProlÃnánà 1:" @@ -4265,9 +4493,8 @@ msgid "Resize CanvasItem" msgstr "ZmÄ›nit velikost CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale CanvasItem" -msgstr "Rotovat CanvasItem" +msgstr "Å kálovat CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move CanvasItem" @@ -4308,9 +4535,8 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/texture_region_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Reset" -msgstr "Oddálit" +msgstr "Resetovat zoom" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Select Mode" @@ -4342,9 +4568,8 @@ msgid "Rotate Mode" msgstr "Režim otáÄenÃ" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Scale Mode" -msgstr "Režim zvÄ›tÅ¡ovánà (R)" +msgstr "Režim Å¡kálovánÃ" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -4441,9 +4666,8 @@ msgid "Restores the object's children's ability to be selected." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Skeleton Options" -msgstr "Kostra" +msgstr "Možnosti kostry" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Bones" @@ -4469,7 +4693,7 @@ msgstr "Vymazat kosti" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "View" -msgstr "Zobrazit" +msgstr "ZobrazenÃ" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp @@ -4569,9 +4793,8 @@ msgid "" msgstr "" #: editor/plugins/collision_polygon_editor_plugin.cpp -#, fuzzy msgid "Create Polygon3D" -msgstr "VytvoÅ™it polygon" +msgstr "VytvoÅ™it Polygon3D" #: editor/plugins/collision_polygon_editor_plugin.cpp msgid "Edit Poly" @@ -4669,6 +4892,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Položka %d" @@ -5056,9 +5283,8 @@ msgid "Add Point to Curve" msgstr "PÅ™idat bod do kÅ™ivky" #: editor/plugins/path_2d_editor_plugin.cpp -#, fuzzy msgid "Split Curve" -msgstr "UzavÅ™Ãt kÅ™ivku" +msgstr "RozdÄ›lit kÅ™ivku" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move Point in Curve" @@ -5181,7 +5407,6 @@ msgid "" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Sync Bones" msgstr "Synchronizovat kosti" @@ -5202,42 +5427,36 @@ msgid "" msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Create Polygon & UV" -msgstr "VytvoÅ™it Poly3D" +msgstr "VytvoÅ™it polygon a UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Create Internal Vertex" -msgstr "VytvoÅ™it nové vodorovné vodÃtko" +msgstr "VytvoÅ™it vnitÅ™nà vrchol" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Internal Vertex" -msgstr "Odstranit položku" +msgstr "Odstranit vnitÅ™nà vrchol" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Invalid Polygon (need 3 different vertices)" -msgstr "" +msgstr "Neplatný polygon (jsou tÅ™eba 3 různé vrcholy)" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Add Custom Polygon" -msgstr "Editovat polygon" +msgstr "PÅ™idat vlastnà polygon" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Custom Polygon" -msgstr "Odstranit polygon a bod" +msgstr "Odstranit vlastnà polygon" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Transform UV Map" msgstr "Transformovat UV mapu" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Transform Polygon" -msgstr "Typ transformace" +msgstr "Transformovat polygon" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Paint Bone Weights" @@ -5254,26 +5473,23 @@ msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "UV" -msgstr "" +msgstr "UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Points" -msgstr "Bod" +msgstr "Body" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Polygons" -msgstr "Polygon->UV" +msgstr "Polygony" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Bones" msgstr "Kosti" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Move Points" -msgstr "PÅ™esunout bod" +msgstr "PÅ™esunout body" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Ctrl: Rotate" @@ -5301,13 +5517,15 @@ msgstr "ZmÄ›nit měřÃtko mnohoúhelnÃku" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create a custom polygon. Enables custom polygon rendering." -msgstr "" +msgstr "VytvoÅ™it vlastnà polygon. Aktivuje renderovánà vlastnÃch polygonů." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "" "Remove a custom polygon. If none remain, custom polygon rendering is " "disabled." msgstr "" +"Odstranit vlastnà polygon. Pokud žádný nezbývá, je renderovánà vlastnÃch " +"polygonů deaktivováno." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Paint weights with specified intensity." @@ -5319,7 +5537,7 @@ msgstr "" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Radius:" -msgstr "" +msgstr "PolomÄ›r:" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Polygon->UV" @@ -5451,31 +5669,27 @@ msgstr "Chyba: nelze naÄÃst soubor." #: editor/plugins/script_editor_plugin.cpp msgid "Error could not load file." -msgstr "Chyba nelze naÄÃst soubor." +msgstr "Chyba: nelze naÄÃst soubor." #: editor/plugins/script_editor_plugin.cpp msgid "Error saving file!" msgstr "Chyba pÅ™i ukládánà souboru!" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error while saving theme." -msgstr "Chyba pÅ™i ukládánà motivu" +msgstr "Chyba pÅ™i ukládánà motivu." #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error Saving" -msgstr "Chyba pÅ™i ukládánÃ" +msgstr "Chyba ukládánÃ" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error importing theme." -msgstr "Chyba pÅ™i importu motivu" +msgstr "Chyba pÅ™i importu motivu." #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Error Importing" -msgstr "Chyba pÅ™i importu" +msgstr "Chyba importu" #: editor/plugins/script_editor_plugin.cpp msgid "New TextFile..." @@ -5511,7 +5725,7 @@ msgstr " Reference tÅ™Ãdy" #: editor/plugins/script_editor_plugin.cpp msgid "Toggle alphabetical sorting of the method list." -msgstr "" +msgstr "PÅ™epnout abecednà řazenà seznamu metod." #: editor/plugins/script_editor_plugin.cpp msgid "Sort" @@ -5542,9 +5756,8 @@ msgid "File" msgstr "Soubor" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Open..." -msgstr "OtevÅ™Ãt" +msgstr "OtevÅ™Ãt..." #: editor/plugins/script_editor_plugin.cpp msgid "Save All" @@ -5573,9 +5786,8 @@ msgid "Theme" msgstr "Téma" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Import Theme..." -msgstr "Importovat motiv" +msgstr "Importovat motiv..." #: editor/plugins/script_editor_plugin.cpp msgid "Reload Theme" @@ -5836,6 +6048,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "VytvoÅ™it ze scény" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Skeleton2D" @@ -5896,9 +6117,8 @@ msgid "Scaling: " msgstr "Å kálovánÃ: " #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Translating: " -msgstr "PÅ™echod" +msgstr "Posun: " #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." @@ -5945,10 +6165,6 @@ msgid "Vertices" msgstr "Vrcholy" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Pohled shora." @@ -5993,7 +6209,8 @@ msgid "Rear" msgstr "ZadnÃ" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Zarovnat s výhledem" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6087,6 +6304,12 @@ msgid "Freelook Speed Modifier" msgstr "Rychlost volného pohledu" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Zobrazit informace" @@ -6096,6 +6319,11 @@ msgid "XForm Dialog" msgstr "XForm Dialog" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "PÅ™ichytit k mřÞce" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Režim výbÄ›ru (Q)" @@ -6376,10 +6604,6 @@ msgid "Add Empty" msgstr "PÅ™idat prázdný" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "ZmÄ›nit smyÄku animace" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "ZmÄ›nit FPS animace" @@ -6388,14 +6612,12 @@ msgid "(empty)" msgstr "(prázdný)" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Animations:" -msgstr "Animace" +msgstr "Animace:" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "New Animation" -msgstr "Animace" +msgstr "Nová animace" #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Speed (FPS):" @@ -6562,9 +6784,8 @@ msgid "Many" msgstr "" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Has,Many,Options" -msgstr "Možnosti" +msgstr "Má,mnoho,možnostÃ" #: editor/plugins/theme_editor_plugin.cpp msgid "Tab 1" @@ -6607,9 +6828,8 @@ msgid "Erase Selection" msgstr "Vymazat oznaÄené" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Fix Invalid Tiles" -msgstr "Neplatný název." +msgstr "Opravit neplatné dlaždice" #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy @@ -6705,22 +6925,24 @@ msgstr "SlouÄit ze scény" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Copy bitmask." -msgstr "" +msgstr "KopÃrovat bitovou masku." #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Paste bitmask." -msgstr "Vložit animaci" +msgstr "Vložit bitovou masku." #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Erase bitmask." -msgstr "Vymazat body." +msgstr "Vymazat bitovou masku." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "VytvoÅ™it nové uzly." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." -msgstr "VytvoÅ™it polygon" +msgstr "VytvoÅ™it nový polygon." #: editor/plugins/tile_set_editor_plugin.cpp msgid "Keep polygon inside region Rect." @@ -6735,13 +6957,14 @@ msgid "Display Tile Names (Hold Alt Key)" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Remove selected texture? This will remove all tiles which use it." -msgstr "Odstranit aktuálnà texturu z TileSetu" +msgstr "" +"Odstranit vybranou texturu? Toto odstranà vÅ¡echny dlaždice, které ji " +"použÃvajÃ." #: editor/plugins/tile_set_editor_plugin.cpp msgid "You haven't selected a texture to remove." -msgstr "" +msgstr "Nevybrali jste texturu k odstranÄ›nÃ." #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from scene? This will overwrite all current tiles." @@ -6752,9 +6975,8 @@ msgid "Merge from scene?" msgstr "SlouÄit ze scény?" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Remove Texture" -msgstr "Odstranit Å¡ablonu" +msgstr "Odstranit texturu" #: editor/plugins/tile_set_editor_plugin.cpp msgid "%s file(s) were not added because was already on the list." @@ -6779,9 +7001,8 @@ msgid "" msgstr "VytvoÅ™it složku" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Delete polygon." -msgstr "Odstranit body" +msgstr "Smazat polygon." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -6817,18 +7038,16 @@ msgid "Set Tile Region" msgstr "Oblast textury" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Create Tile" -msgstr "VytvoÅ™it složku" +msgstr "VytvoÅ™it dlaždici" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Set Tile Icon" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Edit Tile Bitmask" -msgstr "Editovat filtry" +msgstr "Upravit bitovou masku dlaždice" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -6846,18 +7065,16 @@ msgid "Edit Navigation Polygon" msgstr "VytvoÅ™it navigaÄnà polygon" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Paste Tile Bitmask" -msgstr "Vložit animaci" +msgstr "Vložit bitovou masku dlaždice" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Clear Tile Bitmask" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Remove Tile" -msgstr "Odstranit Å¡ablonu" +msgstr "Odstranit dlaždici" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy @@ -6898,9 +7115,30 @@ msgid "This property can't be changed." msgstr "Tato vlastnost nemůže být zmÄ›nÄ›na." #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "TileSet" -msgstr "Soubor:" +msgstr "TileSet" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplikovat uzel/uzly" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" @@ -6918,6 +7156,16 @@ msgstr "SvÄ›tlo" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editovat filtry" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "ZmÄ›ny shaderu" + #: editor/project_export.cpp msgid "Runnable" msgstr "Spustitelný" @@ -6932,8 +7180,17 @@ msgid "Delete preset '%s'?" msgstr "Odstranit pÅ™edvolbu '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Exportnà šablony pro tuto platformu chybà nebo jsou poÅ¡kozené:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6944,6 +7201,10 @@ msgid "Exporting All" msgstr "Exportovánà vÅ¡eho" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Exportnà šablony pro tuto platformu chybà nebo jsou poÅ¡kozené:" + +#: editor/project_export.cpp msgid "Presets" msgstr "PÅ™edvolby" @@ -6952,9 +7213,8 @@ msgid "Add..." msgstr "PÅ™idat..." #: editor/project_export.cpp -#, fuzzy msgid "Export Path" -msgstr "Exportovat projekt" +msgstr "Exportovat cestu" #: editor/project_export.cpp msgid "Resources" @@ -7001,33 +7261,31 @@ msgstr "" #: editor/project_export.cpp msgid "Features" -msgstr "" +msgstr "Funkce" #: editor/project_export.cpp msgid "Custom (comma-separated):" -msgstr "" +msgstr "Vlastnà (oddÄ›lené Äárkou):" #: editor/project_export.cpp msgid "Feature List:" msgstr "Seznam funkcÃ:" #: editor/project_export.cpp -#, fuzzy msgid "Script" -msgstr "Nový skript" +msgstr "Skript" #: editor/project_export.cpp -#, fuzzy msgid "Script Export Mode:" -msgstr "Expertnà režim:" +msgstr "Režim exportu skriptů:" #: editor/project_export.cpp msgid "Text" -msgstr "" +msgstr "Text" #: editor/project_export.cpp msgid "Compiled" -msgstr "" +msgstr "Zkompilovaný" #: editor/project_export.cpp msgid "Encrypted (Provide Key Below)" @@ -7035,7 +7293,7 @@ msgstr "" #: editor/project_export.cpp msgid "Invalid Encryption Key (must be 64 characters long)" -msgstr "" +msgstr "Neplatný Å¡ifrovacà klÃÄ (musà být dlouhý 64 znaků)" #: editor/project_export.cpp msgid "Script Encryption Key (256-bits as hex):" @@ -7043,17 +7301,15 @@ msgstr "" #: editor/project_export.cpp msgid "Export PCK/Zip" -msgstr "" +msgstr "Exportovat PCK/Zip" #: editor/project_export.cpp -#, fuzzy msgid "Export mode?" -msgstr "Expertnà režim:" +msgstr "Režim exportu?" #: editor/project_export.cpp -#, fuzzy msgid "Export All" -msgstr "Exportovat" +msgstr "Exportovat vÅ¡e" #: editor/project_export.cpp msgid "Export templates for this platform are missing:" @@ -7069,15 +7325,15 @@ msgstr "Cesta neexistuje." #: editor/project_manager.cpp msgid "Invalid '.zip' project file, does not contain a 'project.godot' file." -msgstr "" +msgstr "Neplatný projektový '.zip' soubor; neobsahuje soubor 'project.godot'." #: editor/project_manager.cpp msgid "Please choose an empty folder." -msgstr "" +msgstr "Zvolte prosÃm prázdnou složku." #: editor/project_manager.cpp msgid "Please choose a 'project.godot' or '.zip' file." -msgstr "" +msgstr "Zvolte prosÃm soubor 'project.godot' nebo '.zip'." #: editor/project_manager.cpp msgid "Directory already contains a Godot project." @@ -7088,9 +7344,8 @@ msgid "Imported Project" msgstr "" #: editor/project_manager.cpp -#, fuzzy msgid "Invalid Project Name." -msgstr "Jméno projektu:" +msgstr "Neplatný název projektu." #: editor/project_manager.cpp msgid "Couldn't create folder." @@ -7216,9 +7471,8 @@ msgid "Unnamed Project" msgstr "Nepojmenovaný projekt" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project at '%s'." -msgstr "Nelze otevÅ™Ãt projekt" +msgstr "Nelze otevÅ™Ãt projekt v '%s'." #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -7349,7 +7603,6 @@ msgid "Mouse Button" msgstr "TlaÄÃtko myÅ¡i" #: editor/project_settings_editor.cpp -#, fuzzy msgid "" "Invalid action name. it cannot be empty nor contain '/', ':', '=', '\\' or " "'\"'" @@ -7375,9 +7628,8 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "All Devices" -msgstr "ZaÅ™ÃzenÃ" +msgstr "VÅ¡echna zaÅ™ÃzenÃ" #: editor/project_settings_editor.cpp msgid "Device" @@ -7513,13 +7765,12 @@ msgid "Delete Item" msgstr "Odstranit položku" #: editor/project_settings_editor.cpp -#, fuzzy msgid "" "Invalid action name. It cannot be empty nor contain '/', ':', '=', '\\' or " "'\"'." msgstr "" "Neplatné jméno akce. Nesmà být prázdné nebo obsahovat '/', ':', '=', '\\' " -"nebo '\"'" +"nebo '\"'." #: editor/project_settings_editor.cpp msgid "Already existing" @@ -7603,9 +7854,8 @@ msgid "Action:" msgstr "Akce:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Action" -msgstr "Akce:" +msgstr "Akce" #: editor/project_settings_editor.cpp msgid "Deadzone" @@ -7740,9 +7990,8 @@ msgid "Can't load back converted image using PVRTC tool:" msgstr "" #: editor/rename_dialog.cpp editor/scene_tree_dock.cpp -#, fuzzy msgid "Batch Rename" -msgstr "RozliÅ¡ovat malá/velká" +msgstr "Dávkové pÅ™ejmenovánÃ" #: editor/rename_dialog.cpp msgid "Prefix" @@ -7753,9 +8002,8 @@ msgid "Suffix" msgstr "Sufix" #: editor/rename_dialog.cpp -#, fuzzy msgid "Advanced options" -msgstr "Možnosti pÅ™ichytávánÃ" +msgstr "PokroÄilé možnosti" #: editor/rename_dialog.cpp msgid "Substitute" @@ -7797,7 +8045,7 @@ msgstr "" #: editor/rename_dialog.cpp msgid "Initial value for the counter" -msgstr "" +msgstr "PoÄáteÄnà hodnota pro poÄÃtadlo" #: editor/rename_dialog.cpp msgid "Step" @@ -7816,6 +8064,8 @@ msgid "" "Minimum number of digits for the counter.\n" "Missing digits are padded with leading zeros." msgstr "" +"Minimálnà poÄet ÄÃslic poÄÃtadla.\n" +"ChybÄ›jÃcà ÄÃslice budou nahrazeny nulami." #: editor/rename_dialog.cpp msgid "Regular Expressions" @@ -7850,9 +8100,8 @@ msgid "To Uppercase" msgstr "Na velká pÃsmena" #: editor/rename_dialog.cpp -#, fuzzy msgid "Reset" -msgstr "Obnovit původnà pÅ™iblÞenÃ" +msgstr "Resetovat" #: editor/rename_dialog.cpp msgid "Error" @@ -7949,6 +8198,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Dává smysl!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Odstranit uzel/uzly?" @@ -7985,27 +8239,28 @@ msgstr "MÃstnÃ" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Dává smysl!" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" -msgstr "VytvoÅ™it uzel" +msgstr "VytvoÅ™it koÅ™enový uzel:" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "2D Scene" -msgstr "Scéna" +msgstr "2D scéna" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "3D Scene" -msgstr "Scéna" +msgstr "3D scéna" #: editor/scene_tree_dock.cpp msgid "User Interface" -msgstr "" +msgstr "Uživatelské rozhranÃ" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Custom Node" -msgstr "Vyjmout uzly" +msgstr "Vlastnà uzel" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -8046,9 +8301,8 @@ msgid "Clear Inheritance" msgstr "" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Open documentation" -msgstr "OtevÅ™Ãt Godot online dokumentaci" +msgstr "OtevÅ™Ãt dokumentaci" #: editor/scene_tree_dock.cpp msgid "Delete Node(s)" @@ -8146,7 +8400,6 @@ msgid "" msgstr "" #: editor/scene_tree_editor.cpp editor/script_create_dialog.cpp -#, fuzzy msgid "Open Script" msgstr "OtevÅ™Ãt skript" @@ -8218,9 +8471,8 @@ msgid "Path is empty" msgstr "Cesta je prázdná" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Filename is empty" -msgstr "Sprite je prázdný!" +msgstr "Název souboru je prázdný" #: editor/script_create_dialog.cpp msgid "Path is not local" @@ -8277,7 +8529,7 @@ msgstr "VytvoÅ™it nový soubor skriptu" #: editor/script_create_dialog.cpp msgid "Load existing script file" -msgstr "" +msgstr "NaÄÃst existujÃcà soubor skriptu" #: editor/script_create_dialog.cpp msgid "Language" @@ -8408,6 +8660,21 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Zkratky" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Zkratky" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Upravit kotvy" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Zkratky" @@ -8622,6 +8889,11 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap Duplikovat výbÄ›r" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Nastavenà GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8760,9 +9032,8 @@ msgid "Build Project" msgstr "Sestavit projekt" #: modules/mono/editor/mono_bottom_panel.cpp -#, fuzzy msgid "View log" -msgstr "Zobrazit soubory" +msgstr "Zobrazit logy" #: modules/mono/mono_gd/gd_mono_utils.cpp msgid "End of inner exception stack trace" @@ -8926,10 +9197,6 @@ msgid "Change Expression" msgstr "ZmÄ›nit výraz" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "PÅ™idat uzel" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Odstranit uzly VisualScriptu" @@ -9018,6 +9285,11 @@ msgid "Change Input Value" msgstr "ZmÄ›nit vstupnà hodnotu" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "ZmÄ›nit velikost CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9853,6 +10125,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "VarovánÃ:" @@ -9997,10 +10272,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Konvertovat na malá pÃsmena" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "PÅ™ichytit k mřÞce" - #~ msgid "Rotate 0 degrees" #~ msgstr "OtoÄit o 0 stupňů" diff --git a/editor/translations/da.po b/editor/translations/da.po index 41e00e3cbf..fe271a62a6 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -91,6 +91,16 @@ msgstr "Duplikér valgte nøgle(r)" msgid "Delete Selected Key(s)" msgstr "Slet valgte nøgle(r)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Tilføj punkt" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Fjern punkt" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Dublikér Nøgle" @@ -120,6 +130,16 @@ msgid "Anim Change Call" msgstr "Anim Skift Call" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Ændre Animation Navn:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Egenskabsbane" @@ -169,6 +189,11 @@ msgid "Anim Clips:" msgstr "Anim klip:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Ændre Array-Værdi" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "SlÃ¥ spor til/fra." @@ -193,6 +218,10 @@ msgid "Time (s): " msgstr "Tid (s): " #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Kontinuerlig" @@ -243,6 +272,21 @@ msgid "Delete Key(s)" msgstr "Slet nøgle(r)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Ændre Animation Navn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Interpolationsmetode" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Ændre Anim Løkke" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Fjern Anim Spor" @@ -284,6 +328,16 @@ msgid "Anim Insert Key" msgstr "Anim Indsæt Nøgle" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Ændre Animation Navn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Flytte om pÃ¥ Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Transformeringsspor kan kun anvendes pÃ¥ rumlige noder." @@ -313,6 +367,11 @@ msgid "Not possible to add a new track without a root" msgstr "Det er ikke muligt at tilføje et nyt spor uden en rod" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Tilføj Spor" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Sporstien er ugyldig, sÃ¥ kan ikke tilføje en nøgle." @@ -321,10 +380,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Spor er ikke af typen Spatial, kan ikke indsætte nøgle" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D-transformationsspor" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Tilføj Spor" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "Sporstien er ugyldig, sÃ¥ kan ikke tilføje en metode nøgle." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Kald metode spor" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metode ikke fundet i objekt: " @@ -337,6 +411,10 @@ msgid "Clipboard is empty" msgstr "Udklipsholder er tom" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Indsæt Spor" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Skaler Nøgler" @@ -381,10 +459,6 @@ msgid "Copy Tracks" msgstr "Kopier Spor" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Indsæt Spor" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skalér Valgte" @@ -484,6 +558,19 @@ msgstr "Vælg spor til kopiering:" msgid "Copy" msgstr "Kopier" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Lydklip:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Ændre størrelsen pÃ¥ Array" @@ -1295,6 +1382,12 @@ msgstr "" msgid "Packing" msgstr "Pakker" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1870,6 +1963,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Gem ændringer til '%s' før lukning?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Fejler med at indlæse ressource." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Gem Scene Som..." @@ -3540,12 +3642,47 @@ msgstr "Indlæs" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Fjern punkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Tilføj Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Tilføj animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Fjern Poly og Punkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3587,6 +3724,29 @@ msgid "Triangle already exists" msgstr "FEJL: Animationsnavn eksisterer allerede!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Tilføj variabel" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Fjern Poly og Punkt" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Fjern Variabel" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3595,6 +3755,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Skift AutoIndlæs Globalt" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3612,6 +3777,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Skift Shader" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Rediger filtre" @@ -3621,11 +3791,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Tilføj Node(r) fra Tree" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Node Navn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Tilsluttet" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Afbrudt" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Ny Animation Navn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Vælg Node" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "SlÃ¥ spor til/fra." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Ændret Lokalfilter" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3641,6 +3855,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node Navn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3878,6 +4098,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Flyt Node(s)" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Overgang" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Tilføj Node" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3907,6 +4142,20 @@ msgid "No playback resource set at path: %s." msgstr "Ikke i stien for ressource." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Fjern" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Overgang" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4723,6 +4972,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5909,6 +6162,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Spil Brugerdefineret Scene" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6020,10 +6282,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6068,7 +6326,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6161,6 +6419,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6169,6 +6433,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Vælg Mode (Q)\n" @@ -6451,10 +6719,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6793,6 +7057,11 @@ msgstr "Slet points" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Opret Ny %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Opret Poly" @@ -6977,6 +7246,28 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Sæt som Standard for '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Dublikér nøgle(r)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6993,6 +7284,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Rediger filtre" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Skift Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7006,7 +7307,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7019,6 +7329,10 @@ msgid "Exporting All" msgstr "Eksporter" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8024,6 +8338,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Gem Scene" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8059,6 +8378,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Gem Scene" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Opret Mappe" @@ -8484,6 +8808,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Slet valgte" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8694,6 +9031,10 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap Duplikér Markerede" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9002,10 +9343,6 @@ msgid "Change Expression" msgstr "Skift udtryk" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Tilføj Node" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Fjern VisualScript Nodes" @@ -9088,6 +9425,10 @@ msgid "Change Input Value" msgstr "Ændre Input Værdi" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10074,9 +10415,6 @@ msgstr "" #~ msgid "Change Anim Len" #~ msgstr "Ændre Anim Længde" -#~ msgid "Change Anim Loop" -#~ msgstr "Ændre Anim Løkke" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Anim Opret Indtastet Værdi Nøgle" diff --git a/editor/translations/de.po b/editor/translations/de.po index 5ee82b5d7a..9cf2dc4a85 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -37,12 +37,13 @@ # ssantos <ssantos@web.de>, 2018. # Rémi Verschelde <akien@godotengine.org>, 2019. # Martin <martinreininger@gmx.net>, 2019. +# Andreas During <anduring@web.de>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-13 23:10+0000\n" -"Last-Translator: Martin <martinreininger@gmx.net>\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" +"Last-Translator: Andreas During <anduring@web.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" "Language: de\n" @@ -67,7 +68,7 @@ msgstr "" #: core/math/expression.cpp msgid "Invalid input %i (not passed) in expression" -msgstr "Ungültige Eingabe %i (nicht bestanden) in Ausdruck" +msgstr "Ungültige Eingabe %i (nicht übergeben) im Ausdruck" #: core/math/expression.cpp msgid "self can't be used because instance is null (not passed)" @@ -118,6 +119,16 @@ msgstr "Ausgewählte Schlüssel duplizieren" msgid "Delete Selected Key(s)" msgstr "Ausgewählte Schlüssel löschen" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Punkt hinzufügen" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Punkte Verschieben" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Schlüsselbild duplizieren" @@ -147,6 +158,16 @@ msgid "Anim Change Call" msgstr "Aufruf ändern" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Bearbeite Animationsschleife" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Bearbeite Animationsschleife" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Eigenschaftenspur" @@ -196,6 +217,11 @@ msgid "Anim Clips:" msgstr "Animationsschnipsel:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Array-Wert ändern" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Diese Spur an-/abschalten." @@ -220,6 +246,11 @@ msgid "Time (s): " msgstr "Zeit (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Dopplereffekt aktivieren" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Fortlaufend" @@ -270,6 +301,21 @@ msgid "Delete Key(s)" msgstr "Schlüsselbilder entfernen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Animationsname ändern:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Interpolationsmodus" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Bearbeite Animationsschleife" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Spur entfernen" @@ -311,6 +357,16 @@ msgid "Anim Insert Key" msgstr "Schlüsselbild einfügen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Ändere FPS-Wert der Animation" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Autoloads neu anordnen" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Transformationsspuren gelten nur für Nodes die auf Spatial basieren." @@ -340,6 +396,11 @@ msgid "Not possible to add a new track without a root" msgstr "Ohne eine Wurzel kann keine neue Spur hinzugefügt werden" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Spur hinzufügen" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Spurpfad ist ungültig, Schlüssel kann nicht hinzugefügt werden." @@ -349,11 +410,26 @@ msgstr "" "Spur ist nicht vom Typ Spatial, Schlüssel kann nicht hinzugefügt werden" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D-Transformspur" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Spur hinzufügen" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "Spurpfad ist ungültig, Methoden-Schlüssel kann nicht hinzugefügt werden." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Methodenaufrufsspur" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Methode nicht im Objekt gefunden: " @@ -366,6 +442,10 @@ msgid "Clipboard is empty" msgstr "Zwischenablage ist leer" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Spuren einfügen" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Schlüsselbilder skalieren" @@ -410,10 +490,6 @@ msgid "Copy Tracks" msgstr "Spuren kopieren" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Spuren einfügen" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Auswahl skalieren" @@ -513,6 +589,19 @@ msgstr "Zu kopierende Spuren auswählen:" msgid "Copy" msgstr "Kopieren" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Audioschnipsel:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Größe des Arrays ändern" @@ -582,9 +671,8 @@ msgid "Warnings" msgstr "Warnungen" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Zeilen- und Spaltennummern" +msgstr "Zeilen- und Spaltennummern." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1147,9 +1235,8 @@ msgid "Add Bus" msgstr "Audiobus hinzufügen" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Audiobus-Layout speichern als..." +msgstr "Neuen Audio-Bus diesem Layout hinzufügen." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1330,6 +1417,12 @@ msgstr "Keine Exportvorlagen am erwarteten Pfad gefunden:" msgid "Packing" msgstr "Packe" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1652,7 +1745,7 @@ msgstr "Setze" #: editor/editor_inspector.cpp msgid "Set Multiple:" -msgstr "Setze mehrere:" +msgstr "Mehrfach einstellen:" #: editor/editor_log.cpp msgid "Output:" @@ -1909,6 +2002,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Änderungen in ‚%s‘ vor dem Schließen speichern?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Laden der Ressource gescheitert." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Es ist nur eine Datei für eine große Textur erforderlich." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Szene speichern als..." @@ -2188,7 +2291,7 @@ msgstr "Mesh-Bibliothek..." #: editor/editor_node.cpp msgid "TileSet..." -msgstr "Tile Set…" +msgstr "TileSet…" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp @@ -2439,9 +2542,8 @@ msgid "Save & Restart" msgstr "Speichern & Neu starten" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "Dreht sich, wenn das Editorfenster neu gezeichnet wird!" +msgstr "Dreht sich, wenn das Editorfenster neu gezeichnet wird." #: editor/editor_node.cpp msgid "Update Always" @@ -3559,6 +3661,22 @@ msgstr "Lade..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Punkte Verschieben" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Ãœberblendungszeit ändern" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Ãœberblendungszeit ändern" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3566,6 +3684,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Node hinzufügen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animation hinzufügen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Pfadpunkt entfernen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3608,6 +3747,31 @@ msgid "Triangle already exists" msgstr "Dreieck existiert bereits" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Variable hinzufügen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Ãœberblendungszeit ändern" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Ãœberblendungszeit ändern" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Pfadpunkt entfernen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Variable entfernen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D gehört nicht zu einem AnimationTree-Node." @@ -3616,6 +3780,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Es existieren keine Dreiecke, Vermischen nicht möglich." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Autoload-Globals umschalten" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Dreiecke durch Punkteverbinden herstellen." @@ -3633,6 +3802,11 @@ msgid "Blend:" msgstr "Blende:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Materialänderungen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Filter bearbeiten" @@ -3642,6 +3816,17 @@ msgid "Output node can't be added to the blend tree." msgstr "Ausgabe-Node kann nicht zum Mischungsbaum hinzugefügt werden." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Node(s) aus Szenenbaum hinzufügen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Bewegungsmodus" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3649,6 +3834,39 @@ msgstr "" "Verbindung ist ungültig." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Verbunden" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Getrennt" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Neue Animation" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Node(s) löschen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Diese Spur an-/abschalten." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Sprachfilter geändert" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Kein Animationsspieler festgelegt, Spurnamen können nicht abgerufen werden." @@ -3668,6 +3886,12 @@ msgstr "" "nicht abgerufen werden." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node-Name" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Knoten hinzufügen....." @@ -3893,6 +4117,21 @@ msgid "Cross-Animation Blend Times" msgstr "Ãœbergangszeiten kreuzender Animationen" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Bewegungsmodus" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Ãœbersetzung hinzufügen" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Node hinzufügen" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Ende" @@ -3921,6 +4160,20 @@ msgid "No playback resource set at path: %s." msgstr "Keine Abspiel-Ressource festgelegt im Pfad: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Entfernt:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Ãœbergangs-Node" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4744,6 +4997,10 @@ msgstr "Umsch halten um Tangenten einzeln zu bearbeiten" msgid "Bake GI Probe" msgstr "GI Sonde vorrendern" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Element %d" @@ -5273,6 +5530,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"Dieses Polygon2D enthält interne Vertices, es kann nicht mehr im Viewport " +"bearbeitet werden." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5895,6 +6154,16 @@ msgstr "" "hinzugefügt werden." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Ruhe-Pose erstellen (aus Knochen)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Ruhe-Pose erstellen (aus Knochen)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Skeleton2D" @@ -6003,10 +6272,6 @@ msgid "Vertices" msgstr "Vertices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Sicht von oben." @@ -6051,7 +6316,8 @@ msgid "Rear" msgstr "Hinten" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Auf Sicht ausrichten" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6143,6 +6409,12 @@ msgid "Freelook Speed Modifier" msgstr "Freisicht Geschwindigkeitsregler" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Sichtrotation gesperrt" @@ -6151,6 +6423,11 @@ msgid "XForm Dialog" msgstr "Transformationsdialog" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Am Boden einrasten" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Auswahlmodus (Q)" @@ -6432,10 +6709,6 @@ msgid "Add Empty" msgstr "Empty einfügen" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Bearbeite Animationsschleife" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Ändere FPS-Wert der Animation" @@ -6761,6 +7034,11 @@ msgid "Erase bitmask." msgstr "Bitmaske löschen." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Neue Nodes erstellen." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Neues Polygon erstellen." @@ -6941,6 +7219,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Als Standard für ‚%s‘ setzen" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Dupliziere Node(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vertex" @@ -6956,6 +7257,16 @@ msgstr "Licht" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Kachelpriorität bearbeiten" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Shader-Änderungen" + #: editor/project_export.cpp msgid "Runnable" msgstr "ausführbar" @@ -6969,8 +7280,17 @@ msgid "Delete preset '%s'?" msgstr "Vorlage ‚%s‘ löschen?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Export-Vorlagen für dieses Systeme fehlen / sind fehlerhaft:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6981,6 +7301,10 @@ msgid "Exporting All" msgstr "Exportiere alles" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Export-Vorlagen für dieses Systeme fehlen / sind fehlerhaft:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Vorlagen" @@ -7537,7 +7861,7 @@ msgstr "Ereignis hinzufügen" #: editor/project_settings_editor.cpp msgid "Button" -msgstr "Button" +msgstr "Taste" #: editor/project_settings_editor.cpp msgid "Left Button." @@ -8021,6 +8345,11 @@ msgid "Instantiated scenes can't become root" msgstr "Instantiierte Szenen können keine Wurzel werden" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Szenen-Wurzel erstellen" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Node(s) wirklich löschen?" @@ -8057,6 +8386,11 @@ msgid "Make Local" msgstr "Lokal machen" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Szenen-Wurzel erstellen" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Erzeuge Wurzel-Node:" @@ -8486,6 +8820,21 @@ msgid "Set From Tree" msgstr "Nach Szenenbaum einstellen" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ausspannen" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Tastenkürzel" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Ankerpunkte ändern" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Tastenkürzel" @@ -8692,6 +9041,10 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap-Auswahl duplizieren" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "GridMap zeichnen" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Gitterkarte" @@ -8994,10 +9347,6 @@ msgid "Change Expression" msgstr "Ausdruck ändern" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Node hinzufügen" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "VisualScript-Nodes entfernen" @@ -9082,6 +9431,11 @@ msgid "Change Input Value" msgstr "Eingabewert ändern" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "CanvasItem in Größe anpassen" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Das Function-Node kann nicht kopiert werden." @@ -9878,9 +10232,8 @@ msgid "Switch between hexadecimal and code values." msgstr "Wechselt zwischen Hexadezimal- und Zahlenwerten." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Füge aktuelle Farbe als Vorlage hinzu" +msgstr "Aktuelle Farbe als Vorlage hinzufügen." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9978,6 +10331,9 @@ msgstr "Zuweisung an Uniform." msgid "Varyings can only be assigned in vertex function." msgstr "Varyings können nur in Vertex-Funktion zugewiesen werden." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Warnungen:" @@ -10151,9 +10507,6 @@ msgstr "Varyings können nur in Vertex-Funktion zugewiesen werden." #~ msgid "Convert To Lowercase" #~ msgstr "In Kleinbuchstaben konvertieren" -#~ msgid "Snap To Floor" -#~ msgstr "Am Boden einrasten" - #~ msgid "Rotate 0 degrees" #~ msgstr "Drehe auf 0 Grad" @@ -10691,9 +11044,6 @@ msgstr "Varyings können nur in Vertex-Funktion zugewiesen werden." #~ msgid "Added:" #~ msgstr "Hinzugefügt:" -#~ msgid "Removed:" -#~ msgstr "Entfernt:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Atlas Untertextur konnte nicht gespeichert werden:" @@ -10962,9 +11312,6 @@ msgstr "Varyings können nur in Vertex-Funktion zugewiesen werden." #~ msgid "Error importing:" #~ msgstr "Fehler beim importieren:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Es ist nur eine Datei für eine große Textur erforderlich." - #~ msgid "Max Texture Size:" #~ msgstr "Maximale Texturgröße:" @@ -11191,9 +11538,6 @@ msgstr "Varyings können nur in Vertex-Funktion zugewiesen werden." #~ msgid "Resource Tools" #~ msgstr "Ressourcenwerkzeuge" -#~ msgid "GridMap Paint" -#~ msgstr "GridMap zeichnen" - #~ msgid "Tiles" #~ msgstr "Kacheln" diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index e324a988d5..74fd313a4a 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -87,6 +87,16 @@ msgstr "Node(s) duplizieren" msgid "Delete Selected Key(s)" msgstr "Node(s) löschen" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Script hinzufügen" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Ungültige Bilder löschen" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Bilder duplizieren" @@ -116,6 +126,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Typ ändern" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -168,6 +188,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -194,6 +218,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -246,6 +274,21 @@ msgid "Delete Key(s)" msgstr "Node(s) löschen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Typ ändern" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animations-Node" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Animations-Node" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -287,6 +330,16 @@ msgid "Anim Insert Key" msgstr "Anim Bild einfügen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Bild einfügen" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Node erstellen" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -311,6 +364,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -319,10 +376,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Transformationstyp" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim Ebene und Bild einfügen" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim Ebene und Bild einfügen" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -335,6 +407,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Node erstellen" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim verlängern" @@ -380,11 +457,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Node erstellen" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -485,6 +557,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1292,6 +1376,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1850,6 +1940,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3486,12 +3584,47 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animations-Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3532,6 +3665,29 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Script hinzufügen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3540,6 +3696,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Autoplay Umschalten" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3557,6 +3718,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Typ ändern" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3567,11 +3733,53 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Node von Szene" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Bild bewegen/einfügen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Verbindung zu Node:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Bild einfügen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Node(s) löschen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Typ ändern" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3587,6 +3795,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3825,6 +4039,22 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Bild bewegen/einfügen" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Transition-Node" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Add Node" +msgstr "Node" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3853,6 +4083,20 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Node" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Transition-Node" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4676,6 +4920,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5851,6 +6099,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Spiele angepasste Szene" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5963,10 +6220,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6011,7 +6264,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6104,6 +6357,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6112,6 +6371,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Selektiere Node(s) zum Importieren aus" @@ -6394,10 +6657,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6739,6 +6998,11 @@ msgstr "Oberfläche %d" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Node erstellen" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Node erstellen" @@ -6922,6 +7186,27 @@ msgid "TileSet" msgstr "Datei(en) öffnen" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Node(s) duplizieren" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6937,6 +7222,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Node Filter editieren" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Typ ändern" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6950,7 +7245,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6962,6 +7266,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7973,6 +8281,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Node(s) löschen?" @@ -8007,6 +8319,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "Node erstellen" @@ -8436,6 +8752,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8642,6 +8970,11 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Projekteinstellungen" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8948,11 +9281,6 @@ msgstr "Typ ändern" #: modules/visual_script/visual_script_editor.cpp #, fuzzy -msgid "Add Node" -msgstr "Node" - -#: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Remove VisualScript Nodes" msgstr "Ungültige Bilder löschen" @@ -9043,6 +9371,10 @@ msgid "Change Input Value" msgstr "Typ ändern" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 1565bb3f12..efb591227c 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -76,6 +76,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -105,6 +113,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -154,6 +171,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -178,6 +199,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -228,6 +253,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -269,6 +306,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -293,6 +338,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -301,10 +350,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -317,6 +378,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -359,10 +424,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -462,6 +523,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1254,6 +1327,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1794,6 +1873,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3369,12 +3456,43 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3414,6 +3532,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3422,6 +3560,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3439,6 +3581,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3448,11 +3594,47 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Delete Node" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3468,6 +3650,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3693,6 +3880,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3721,6 +3921,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4519,6 +4731,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5656,6 +5872,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5764,10 +5988,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5812,7 +6032,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5904,6 +6124,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5912,6 +6138,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6188,10 +6418,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6517,6 +6743,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6679,6 +6909,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6694,6 +6944,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6707,7 +6965,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6719,6 +6986,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7695,6 +7966,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7729,6 +8004,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8141,6 +8420,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8345,6 +8636,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8639,10 +8934,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8723,6 +9014,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/el.po b/editor/translations/el.po index 4895fc6b98..e5e0a8a5a3 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -85,6 +85,16 @@ msgstr "Διπλασιασμός επιλογής" msgid "Delete Selected Key(s)" msgstr "ΔιαγÏαφή επιλογής" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Î Ïοσθήκη σημείου" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Μετακίνηση σημείου" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Διπλασιασμός κλειδιών" @@ -114,6 +124,16 @@ msgid "Anim Change Call" msgstr "Anim Αλλαγή κλήσης" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Αλλαγή βÏόχου κίνησης" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Αλλαγή βÏόχου κίνησης" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Κομμάτι Ιδιότητας" @@ -163,6 +183,11 @@ msgid "Anim Clips:" msgstr "Αποσπάσματα κίνησης:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Αλλαγή τιμής πίνακα" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Εναλλαγή ÎºÎ¿Î¼Î¼Î±Ï„Î¹Î¿Ï on/off." @@ -187,6 +212,11 @@ msgid "Time (s): " msgstr "ΧÏόνος (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Φαινόμενο ÎτόπλεÏ" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Συνεχόμενη" @@ -237,6 +267,21 @@ msgid "Delete Key(s)" msgstr "ΔιαγÏαφή κλειδιών" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Αλλαγή ονόματος κίνησης:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "ÎœÎθοδος παÏεμβολής" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Αλλαγή βÏόχου κίνησης" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Anim ΑφαίÏεση κομματιοÏ" @@ -278,6 +323,16 @@ msgid "Anim Insert Key" msgstr "Anim εισαγωγή κλειδιοÏ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Αλλαγή FPS κίνησης" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Αναδιάταξη των AutoLoad" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" "Τα κομμάτια Î¼ÎµÏ„Î±ÏƒÏ‡Î·Î¼Î±Ï„Î¹ÏƒÎ¼Î¿Ï ÎµÏ†Î±Ïμόζονται μόνο σε κόμβους βασισμÎνους σε " @@ -309,6 +364,11 @@ msgid "Not possible to add a new track without a root" msgstr "ΑδÏνατη η Ï€Ïοσθήκη ÎºÎ¿Î¼Î¼Î±Ï„Î¹Î¿Ï Ï‡Ï‰Ïίς Ïίζα" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Î Ïοσθήκη κομματιοÏ" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "ΑδÏνατη η Ï€Ïοσθήκη κλειδιοÏ, λόγω άκυÏης διαδÏομής κομματιοÏ." @@ -317,10 +377,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "ΑδÏνατη η Ï€Ïοσθήκη κλειδιοÏ, το κομμάτι δεν είναι Ï„Ïπου Spatial" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Κομμάτι 3D μετασχηματισμοÏ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Î Ïοσθήκη κομματιοÏ" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "ΑδÏνατη η Ï€Ïοσθήκη ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î¼ÎµÎ¸ÏŒÎ´Î¿Ï…, λόγω άκυÏης διαδÏομής κομματιοÏ." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Κομμάτι κλήσης μεθόδου" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Δεν βÏÎθηκε η μÎθοδος στο αντικείμενο: " @@ -333,6 +408,10 @@ msgid "Clipboard is empty" msgstr "Το Ï€ÏόχειÏο είναι άδειο" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Επικόλληση κομματιών" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim ΜεγÎθυνση κλειδιών" @@ -377,10 +456,6 @@ msgid "Copy Tracks" msgstr "ΑντιγÏαφή κομματιών" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Επικόλληση κομματιών" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ΜεγÎθυνση επιλογής" @@ -482,6 +557,19 @@ msgstr "Επιλογή κομματιών για αντιγÏαφή:" msgid "Copy" msgstr "ΑντιγÏαφή" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Αποσπάσματα ήχου:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Αλλαγή μεγÎθους πίνακα" @@ -1298,6 +1386,12 @@ msgstr "" msgid "Packing" msgstr "ΠακετάÏισμα" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1899,6 +1993,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Αποθήκευση αλλαγών στο '%s' Ï€Ïιν το κλείσιμο;" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "ΑπÎτυχε η φόÏτωση πόÏου." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Μόνο Îνα αÏχείο είναι απαÏαίτητη για μεγάλη υφή." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Αποθήκευση σκηνή ως..." @@ -3566,12 +3670,49 @@ msgstr "ΦόÏτωσε.." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Μετακίνηση σημείου" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Αλλαγή χÏόνου ανάμειξης" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Αλλαγή χÏόνου ανάμειξης" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "ΆκυÏος Ï„Ïπος κόμβου. ΕπιτÏÎπονται μόνο Ïιζικοί κόμβοι." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Î Ïοσθήκη κόμβου" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Î Ïοσθήκη κίνησης" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "ΑφαίÏεση σημείου διαδÏομής" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3614,6 +3755,31 @@ msgid "Triangle already exists" msgstr "Το Ï„Ïίγωνο υπάÏχει ήδη" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Î Ïοσθήκη μεταβλητής" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Αλλαγή χÏόνου ανάμειξης" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Αλλαγή χÏόνου ανάμειξης" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "ΑφαίÏεση σημείου διαδÏομής" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "ΑφαίÏεση μεταβλητής" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "Το BlendSpace2D δεν ανήκει σε κόμβο AnimationTree." @@ -3622,6 +3788,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Δεν υπάÏχουν Ï„Ïίγωνα, οπότε είναι αδÏνατη η μίξη." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Εναλλαγή καθολικών υπογÏαφών AutoLoad" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "ΔημιουÏγία Ï„Ïιγώνων με την Îνωση σημείων." @@ -3639,6 +3810,11 @@ msgid "Blend:" msgstr "Ανάμειξη:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "ΑλλαγÎÏ‚ υλικοÏ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "ΕπεξεÏγασία φίλτÏων" @@ -3648,6 +3824,17 @@ msgid "Output node can't be added to the blend tree." msgstr "Ο κόμβος εξόδου δεν μποÏεί να Ï€Ïοστεθεί στο δÎντÏο μίξης." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Î ÏοσθÎστε κόμβο/-ους από δÎντÏο" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "ΛειτουÏγία μετακίνησης" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3655,6 +3842,39 @@ msgstr "" "άκυÏη." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "ΣυνδÎθηκε" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "ΑποσυνδÎθηκε" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Κίνηση" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "ΔιαγÏαφή Κόμβων" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Εναλλαγή ÎºÎ¿Î¼Î¼Î±Ï„Î¹Î¿Ï on/off." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Αλλαγή φίλτÏου τοπικών Ïυθμίσεων" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Δεν οÏίστηκε AnimationPlayer, άÏα αδÏνατη η ανάκτηση των ονομάτων των " @@ -3676,6 +3896,12 @@ msgstr "" "ανάκτηση των ονομάτων των κομματιών." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Όνομα κόμβου:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3902,6 +4128,21 @@ msgid "Cross-Animation Blend Times" msgstr "ΧÏόνοι ανάμειξης κινήσεων" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "ΛειτουÏγία μετακίνησης" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Î Ïοσθήκη μετάφÏασης" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Î Ïοσθήκη κόμβου" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "ΤÎλος" @@ -3930,6 +4171,20 @@ msgid "No playback resource set at path: %s." msgstr "ΚανÎνας πόÏος αναπαÏαγωγής στη διαδÏομή: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "ΑφαιÏÎθηκαν:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Κόμβος μετάβασης" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4754,6 +5009,10 @@ msgstr "Πατήστε το Shift για να επεξεÏγαστείτε εφΠmsgid "Bake GI Probe" msgstr "Î Ïοετοιμασία διεÏεÏνησης GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Στοιχείο %d" @@ -5948,6 +6207,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "ΔημιουÏγία σημείων εκπομπής από πλÎγμα" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Σκελετός..." @@ -6061,10 +6329,6 @@ msgid "Vertices" msgstr "ΚοÏυφÎÏ‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Πάνω όψη." @@ -6109,7 +6373,8 @@ msgid "Rear" msgstr "Πίσω" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Στοίχηση με την Ï€Ïοβολή" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6204,6 +6469,12 @@ msgid "Freelook Speed Modifier" msgstr "ΤαχÏτητα ελεÏθεÏου κοιτάγματος" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Εμφάνιση πληÏοφοÏιών" @@ -6213,6 +6484,11 @@ msgid "XForm Dialog" msgstr "Διάλογος XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "κουμπώματος στο πλÎγμα" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Επιλογή λειτουÏγίας (Q)" @@ -6500,10 +6776,6 @@ msgid "Add Empty" msgstr "Î Ïοσθήκη άδειου" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Αλλαγή βÏόχου κίνησης" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Αλλαγή FPS κίνησης" @@ -6847,6 +7119,11 @@ msgstr "ΔιαγÏαφή σημείων." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "ΔημιουÏγία νÎων κόμβων." + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "ΔημιουÏγία νÎου πολυγώνου από την αÏχή." @@ -7038,6 +7315,29 @@ msgid "TileSet" msgstr "ΣÏνολο πλακιδίων" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "ΟÏισμός ως Ï€Ïοεπιλογής για '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Î ÏόγÏαμμα σκίασης" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Διπλασιασμός κόμβων" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "ΚοÏυφÎÏ‚" @@ -7057,6 +7357,16 @@ msgstr "Δεξιά" msgid "VisualShader" msgstr "Î ÏόγÏαμμα σκίασης" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "ΕπεξεÏγασία φίλτÏων" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "ΑλλαγÎÏ‚ Ï€ÏογÏάμματος σκίασης" + #: editor/project_export.cpp msgid "Runnable" msgstr "ΕκτελÎσιμο" @@ -7070,9 +7380,17 @@ msgid "Delete preset '%s'?" msgstr "ΔιαγÏαφή διαμόÏφωσης '%s';" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν ή είναι κατεστÏαμμÎνα:" #: editor/project_export.cpp #, fuzzy @@ -7085,6 +7403,11 @@ msgid "Exporting All" msgstr "Εξαγωγή για %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν ή είναι κατεστÏαμμÎνα:" + +#: editor/project_export.cpp msgid "Presets" msgstr "ΔιαμοÏφώσεις" @@ -8121,6 +8444,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Βγάζει νόημα!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "ΔιαγÏαφή κόμβων;" @@ -8158,6 +8486,11 @@ msgstr "Κάνε τοπικό" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Βγάζει νόημα!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "ΔημιουÏγία κόμβου" @@ -8604,6 +8937,21 @@ msgid "Set From Tree" msgstr "ΟÏισμός από το δÎντÏο" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ομαλά Îξω" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "ΣυντομεÏσεις" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Αλλαγή αγκυÏών" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "ΣυντομεÏσεις" @@ -8819,6 +9167,10 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap Διπλασιασμός επιλογής" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "GridMap ΖωγÏαφική" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "ΧάÏτης δικτÏου" @@ -9122,10 +9474,6 @@ msgid "Change Expression" msgstr "Αλλαγή ÎκφÏασης" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Î Ïοσθήκη κόμβου" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "ΑφαίÏεση κόμβων VisualScript" @@ -9214,6 +9562,11 @@ msgid "Change Input Value" msgstr "Αλλαγή τιμής εισόδου" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Αλλαγή μεγÎθους CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "ΑδÏνατη η αντιγÏαφή του κόμβου συνάÏτησης." @@ -10085,6 +10438,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Î Ïοειδοποιήσεις:" @@ -10259,10 +10615,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "ΜετατÏοπή σε πεζά" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "κουμπώματος στο πλÎγμα" - #~ msgid "Rotate 0 degrees" #~ msgstr "ΠεÏιστÏοφή 0 μοίÏες" @@ -10792,9 +11144,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Î ÏοστÎθηκαν:" -#~ msgid "Removed:" -#~ msgstr "ΑφαιÏÎθηκαν:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "ΑδÏνατη η αποθήκευση υπό-εικόνας άτλαντα:" @@ -11066,9 +11415,6 @@ msgstr "" #~ msgid "Error importing:" #~ msgstr "Σφάλμα κατά την εισαγωγή:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Μόνο Îνα αÏχείο είναι απαÏαίτητη για μεγάλη υφή." - #~ msgid "Max Texture Size:" #~ msgstr "ÎœÎγιστο μÎγεθος υφής:" @@ -11291,9 +11637,6 @@ msgstr "" #~ msgid "Resource Tools" #~ msgstr "ΕÏγαλεία πόÏων" -#~ msgid "GridMap Paint" -#~ msgstr "GridMap ΖωγÏαφική" - #~ msgid "Tiles" #~ msgstr "Πλακίδια" diff --git a/editor/translations/es.po b/editor/translations/es.po index fd7e0c46e5..b6bed3ee52 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -42,7 +42,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-13 07:10+0000\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" "Last-Translator: Javier Ocampos <xavier.ocampos@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" @@ -119,6 +119,16 @@ msgstr "Duplicar Clave(s) Seleccionada(s)" msgid "Delete Selected Key(s)" msgstr "Eliminar Clave(s) Seleccionada(s)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Añadir punto" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Mover Puntos" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplicar claves de animación" @@ -148,6 +158,16 @@ msgid "Anim Change Call" msgstr "Cambiar llamada de animación" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Cambiar repetición de animación" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Cambiar repetición de animación" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Pista de Propiedades" @@ -197,6 +217,11 @@ msgid "Anim Clips:" msgstr "Clips de Anim:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Cambiar valor del array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Act./Desact. esta pista." @@ -221,6 +246,11 @@ msgid "Time (s): " msgstr "Tiempo (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Activar Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Continuo" @@ -271,6 +301,21 @@ msgid "Delete Key(s)" msgstr "Eliminar Clave(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Cambiar nombre de animación:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Modo de Interpolación" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Cambiar repetición de animación" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Quitar pista de animación" @@ -312,6 +357,16 @@ msgid "Anim Insert Key" msgstr "Insertar clave de animación" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Cambiar FPS de animación" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Reordenar Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Las pistas Transform solo aplican a nodos de tipo Spatial." @@ -342,6 +397,11 @@ msgid "Not possible to add a new track without a root" msgstr "No es posible agregar una nueva pista sin una raÃz" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Agregar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" "La ruta de la pista es inválida, por lo tanto no se pueden agregar claves." @@ -351,12 +411,27 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "La pista no es de tipo Spatial, no se puede insertar la clave" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Pista de Transformación 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Agregar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "La ruta de la pista es inválida, por ende no se pueden agregar claves de " "métodos." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Pista de Llamada a Métodos" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Método no encontrado en el objeto: " @@ -369,6 +444,10 @@ msgid "Clipboard is empty" msgstr "El portapapeles está vacÃo" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Pegar Pistas" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Escalar claves de animación" @@ -413,10 +492,6 @@ msgid "Copy Tracks" msgstr "Copiar Pistas" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Pegar Pistas" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Escalar selección" @@ -516,6 +591,19 @@ msgstr "Elegir pistas a copiar:" msgid "Copy" msgstr "Copiar" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Clips de Audio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimensionar array" @@ -585,9 +673,8 @@ msgid "Warnings" msgstr "Advertencias" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Números de lÃnea y columna" +msgstr "Números de lÃnea y columna." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1124,7 +1211,7 @@ msgstr "Mover bus de audio" #: editor/editor_audio_buses.cpp msgid "Save Audio Bus Layout As..." -msgstr "Guardar configuración de bus de audio como..." +msgstr "Guardar configuración de Bus de Audio como..." #: editor/editor_audio_buses.cpp msgid "Location for New Layout..." @@ -1147,9 +1234,8 @@ msgid "Add Bus" msgstr "Añadir bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Guardar configuración de bus de audio como..." +msgstr "Añade un nuevo Bus de Audio a esta configuración." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1331,6 +1417,12 @@ msgstr "" msgid "Packing" msgstr "Empaquetando" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1910,6 +2002,16 @@ msgid "Save changes to '%s' before closing?" msgstr "¿Guardar cambios de '%s' antes de cerrar?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Error al cargar el recurso." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Solo se requiere un archivo para textura grande." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Guardar escena como..." @@ -2438,9 +2540,8 @@ msgid "Save & Restart" msgstr "Guardar y Reiniciar" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "¡Gira cuando la ventana del editor redibuja!" +msgstr "Gira cuando la ventana del editor se redibuja." #: editor/editor_node.cpp msgid "Update Always" @@ -3559,6 +3660,22 @@ msgstr "Cargar..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Mover Puntos" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Cambiar tiempo de mezcla" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Cambiar tiempo de mezcla" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3566,6 +3683,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Añadir nodo" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Añadir animación" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Quitar punto de ruta" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3608,6 +3746,31 @@ msgid "Triangle already exists" msgstr "El triángulo ya existe" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Añadir variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Cambiar tiempo de mezcla" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Cambiar tiempo de mezcla" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Quitar punto de ruta" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Quitar variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D no pertenece a un nodo AnimationTree." @@ -3616,6 +3779,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "No hay ningún triángulo, asà que no se puede hacer blending." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Act/desact. globales de Autoload" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Crear triángulos conectando puntos." @@ -3633,6 +3801,11 @@ msgid "Blend:" msgstr "Mezcla:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Cambios del material" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editar filtros" @@ -3642,6 +3815,17 @@ msgid "Output node can't be added to the blend tree." msgstr "El nodo de salida no puede ser agregado al blend tree." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Añadir nodo(s) desde árbol" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Modo movimiento" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3649,6 +3833,39 @@ msgstr "" "inválida." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Conectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Desconectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Nueva Animación" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Eliminar nodo(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Act./Desact. esta pista." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Cambiar filtro de localización" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "No se asigno ningún reproductor de animación, asà que no se pudieron obtener " @@ -3670,6 +3887,12 @@ msgstr "" "no se pudieron obtener los nombres de las pistas." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nombre del nodo" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Agregar Nodo..." @@ -3897,6 +4120,21 @@ msgid "Cross-Animation Blend Times" msgstr "Cross-Animation Blend Times" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Modo movimiento" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Añadir traducción" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Añadir nodo" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Fin" @@ -3925,6 +4163,20 @@ msgid "No playback resource set at path: %s." msgstr "Ningún recurso de reproducción asignado en la ruta: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Eliminado:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nodo Transition" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4746,6 +4998,10 @@ msgstr "Mantén Mayús para editar las tangentes individualmente" msgid "Bake GI Probe" msgstr "Precalcular GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Elemento %d" @@ -5277,6 +5533,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"El polÃgono 2D tiene vértices internos, por lo que ya no se puede editar en " +"el viewport." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5898,6 +6156,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Este esqueleto no tiene huesos, crea algunos nodos Bone2D hijos." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Crear Pose de Descanso (De los Huesos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Crear Pose de Descanso (De los Huesos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Skeleton2D" @@ -6006,10 +6274,6 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vista superior." @@ -6054,7 +6318,8 @@ msgid "Rear" msgstr "Detrás" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Alinear con vista" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6146,6 +6411,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidad de vista libre" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Bloquear Rotación de Vista" @@ -6154,6 +6425,11 @@ msgid "XForm Dialog" msgstr "Diálogo XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Ajustar al suelo" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Modo de selección (Q)" @@ -6433,10 +6709,6 @@ msgid "Add Empty" msgstr "Añadir elemento vacÃo" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Cambiar repetición de animación" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Cambiar FPS de animación" @@ -6762,6 +7034,11 @@ msgid "Erase bitmask." msgstr "Borrar bitmask." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Crear nuevos nodos." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Crear un nuevo polÃgono." @@ -6940,6 +7217,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Configurar por defecto para '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplicar nodo(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vértice" @@ -6955,6 +7255,16 @@ msgstr "Luz" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editar Prioridad del Tile" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Cambios del shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Ejecutable" @@ -6968,9 +7278,17 @@ msgid "Delete preset '%s'?" msgstr "¿Eliminar preajuste '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Las plantillas de exportación para esta plataforma faltan/están corruptas:" #: editor/project_export.cpp msgid "Release" @@ -6981,6 +7299,11 @@ msgid "Exporting All" msgstr "Exportar Todo" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Las plantillas de exportación para esta plataforma faltan/están corruptas:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Ajustes preestablecidos" @@ -8021,6 +8344,11 @@ msgid "Instantiated scenes can't become root" msgstr "Las escenas instanciadas no pueden ser raÃz" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Convertir en raÃz de escena" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "¿Eliminar nodo(s)?" @@ -8057,6 +8385,11 @@ msgid "Make Local" msgstr "Crear local" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Convertir en raÃz de escena" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Crear Nodo RaÃz:" @@ -8486,6 +8819,21 @@ msgid "Set From Tree" msgstr "Establecer desde árbol" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Transición de salida" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Atajos" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Cambiar anclas" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Atajos" @@ -8694,6 +9042,11 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap Duplicar selección" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Coloreado de GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Mapa de cuadrÃcula" @@ -8996,10 +9349,6 @@ msgid "Change Expression" msgstr "Cambiar expresión" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Añadir nodo" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Quitar nodos de VisualScript" @@ -9084,6 +9433,11 @@ msgid "Change Input Value" msgstr "Cambiar valor de entrada" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Redimensionar CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "No se puede copiar el nodo de función." @@ -9880,9 +10234,8 @@ msgid "Switch between hexadecimal and code values." msgstr "Cambiar entre valores hexadecimales y de código." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Añadir el color actual como predeterminado" +msgstr "Añadir el color actual como preset." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9976,6 +10329,9 @@ msgstr "Asignación a uniform." msgid "Varyings can only be assigned in vertex function." msgstr "Solo se pueden asignar variaciones en funciones de vértice." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Advertencias:" @@ -10149,9 +10505,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Convert To Lowercase" #~ msgstr "Convertir a minúsculas" -#~ msgid "Snap To Floor" -#~ msgstr "Ajustar al suelo" - #~ msgid "Rotate 0 degrees" #~ msgstr "Rotar 0 grados" @@ -10698,9 +11051,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Added:" #~ msgstr "Añadido:" -#~ msgid "Removed:" -#~ msgstr "Eliminado:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No se pudo guardar la subtextura del altas:" @@ -10972,9 +11322,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Error importing:" #~ msgstr "Hubo un error al importar:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Solo se requiere un archivo para textura grande." - #~ msgid "Max Texture Size:" #~ msgstr "Tamaño máximo de textura:" @@ -11210,10 +11557,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgstr "Editar grupos" #, fuzzy -#~ msgid "GridMap Paint" -#~ msgstr "Coloreado de GridMap" - -#, fuzzy #~ msgid "Tiles" #~ msgstr "Archivo" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index cd6f0166ac..94950398af 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -90,6 +90,16 @@ msgstr "Duplicar Clave(s) Seleccionada(s)" msgid "Delete Selected Key(s)" msgstr "Eliminar Clave(s) Seleccionada(s)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Agregar punto" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Mover Puntos" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplicar Claves de Anim" @@ -119,6 +129,16 @@ msgid "Anim Change Call" msgstr "Cambiar Call de Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Cambiar Loop de Animación" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Cambiar Loop de Animación" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Pista de Propiedades" @@ -168,6 +188,11 @@ msgid "Anim Clips:" msgstr "Clips de Anim:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Cambiar Valor del Array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Act./Desact. esta pista." @@ -192,6 +217,11 @@ msgid "Time (s): " msgstr "Tiempo (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Activar Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ContÃnuo" @@ -242,6 +272,21 @@ msgid "Delete Key(s)" msgstr "Eliminar Clave(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Cambiar Nombre de Animación:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Modo de Interpolación" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Cambiar Loop de Animación" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Quitar pista de animación" @@ -283,6 +328,16 @@ msgid "Anim Insert Key" msgstr "Insertar Clave de Animación" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Cambiar FPS de Animación" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Reordenar Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Las pistas Transform solo aplican a nodos de tipo Spatial." @@ -313,6 +368,11 @@ msgid "Not possible to add a new track without a root" msgstr "No es posible agregar una nueva pista sin una raÃz" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Agregar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "La ruta de la pista es inválida, por ende no se pueden agregar claves." @@ -321,12 +381,27 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "La pista no es de tipo Spatial, no se puede insertar la clave" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Pista de Transformación 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Agregar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "La ruta de la pista es inválida, por ende no se pueden agregar claves de " "métodos." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Pista de Llamada a Métodos" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Método no encontrado en el objeto: " @@ -339,6 +414,10 @@ msgid "Clipboard is empty" msgstr "El portapapeles está vacÃo" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Pegar Pistas" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Escalar Keys de Anim" @@ -383,10 +462,6 @@ msgid "Copy Tracks" msgstr "Copiar Pistas" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Pegar Pistas" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Escalar Selección" @@ -486,6 +561,19 @@ msgstr "Elegir pistas a copiar:" msgid "Copy" msgstr "Copiar" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Clips de Audio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimencionar Array" @@ -1298,6 +1386,12 @@ msgstr "No se encontraron plantillas de exportación en la ruta esperada:" msgid "Packing" msgstr "Empaquetando" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1878,6 +1972,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Guardar cambios a '%s' antes de cerrar?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Fallo al cargar recurso." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Solo se requiere un archivo para textura grande." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Guardar Escena Como..." @@ -3525,6 +3629,22 @@ msgstr "Cargar..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Mover Puntos" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Cambiar Tiempo de Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Cambiar Tiempo de Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3532,6 +3652,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Agregar Nodo" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Agregar Animación" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Quitar Punto del Path" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3574,6 +3715,31 @@ msgid "Triangle already exists" msgstr "El triángulo ya existe" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Agregar Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Cambiar Tiempo de Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Cambiar Tiempo de Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Quitar Punto del Path" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Quitar Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D no pertenece a un nodo AnimationTree." @@ -3582,6 +3748,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "No hay ningún triángulo, asà que no se puede hacer blending." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Act/Desact. AutoLoad Globals" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Crear triángulos conectando puntos." @@ -3599,6 +3770,11 @@ msgid "Blend:" msgstr "Blend:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Cambios de Material" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editar Filtros" @@ -3608,6 +3784,17 @@ msgid "Output node can't be added to the blend tree." msgstr "El nodo de salida no puede ser agregado al blend tree." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Agregar Nodo(s) Desde Arbol" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Modo Mover" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3615,6 +3802,39 @@ msgstr "" "inválida." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Conectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Desconectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Nueva Animación" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Eliminar Nodo(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Act./Desact. esta pista." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Cambiar Filtro de Locale" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "No se asigno ningún reproductor de animación, asà que no se pudieron obtener " @@ -3636,6 +3856,12 @@ msgstr "" "no se pudieron obtener los nombres de las pistas." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nombre del Nodo" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Agregar Nodo..." @@ -3863,6 +4089,21 @@ msgid "Cross-Animation Blend Times" msgstr "Cross-Animation Blend Times" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Modo Mover" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Agregar Traducción" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Agregar Nodo" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Fin" @@ -3891,6 +4132,20 @@ msgid "No playback resource set at path: %s." msgstr "Ningún recurso de reproducción asignado en la ruta: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Removido:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nodo Transición" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4711,6 +4966,10 @@ msgstr "Mantené Shift para editar tangentes individualmente" msgid "Bake GI Probe" msgstr "Hacer Bake de GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Item %d" @@ -5858,6 +6117,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Este esqueleto no tiene huesos, crea algunos nodos Bone2D hijos." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Crear Pose de Descanso" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Crear Pose de Descanso" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Skeleton2D" @@ -5966,10 +6235,6 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vista Superior." @@ -6014,7 +6279,8 @@ msgid "Rear" msgstr "Detrás" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Alinear con vista" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6106,6 +6372,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de Velocidad de Vista Libre" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Rotación de Vista Trabada" @@ -6114,6 +6386,11 @@ msgid "XForm Dialog" msgstr "Dialogo XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Ajustar al suelo" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Modo Seleccionar (Q)" @@ -6393,10 +6670,6 @@ msgid "Add Empty" msgstr "Agregar VacÃo" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Cambiar Loop de Animación" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Cambiar FPS de Animación" @@ -6722,6 +6995,11 @@ msgid "Erase bitmask." msgstr "Borrar bitmask." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Crear nuevos nodos." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Crear un nuevo polÃgono." @@ -6899,6 +7177,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Asignar como Predeterminado para '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplicar Nodo(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vértice" @@ -6914,6 +7215,16 @@ msgstr "Luz" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editar Prioridad de Tile" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Cambios de Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Ejecutable" @@ -6927,10 +7238,17 @@ msgid "Delete preset '%s'?" msgstr "Eliminar preset '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Las plantillas de exportación para esta plataforma están faltando o " -"corruptas:" #: editor/project_export.cpp msgid "Release" @@ -6941,6 +7259,12 @@ msgid "Exporting All" msgstr "Exportar Todo" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Las plantillas de exportación para esta plataforma están faltando o " +"corruptas:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Presets" @@ -7981,6 +8305,11 @@ msgid "Instantiated scenes can't become root" msgstr "Las escenas instanciadas no pueden convertirse en raÃz" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Convertir en RaÃz de Escena" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Eliminar Nodo(s)?" @@ -8017,6 +8346,11 @@ msgid "Make Local" msgstr "Crear Local" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Convertir en RaÃz de Escena" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Crear Nodo RaÃz:" @@ -8447,6 +8781,21 @@ msgid "Set From Tree" msgstr "Setear Desde Arbol" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ease out" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Atajos" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Cambiar Anclas" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Atajos" @@ -8654,6 +9003,10 @@ msgid "GridMap Duplicate Selection" msgstr "Duplicar Selección en GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "Pintar GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Mapa de Grilla" @@ -8955,10 +9308,6 @@ msgid "Change Expression" msgstr "Cambiar Expresión" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Agregar Nodo" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Quitar Nodos VisualScript" @@ -9043,6 +9392,11 @@ msgid "Change Input Value" msgstr "Cambiar Valor de Entrada" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Redimensionar CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "No se puede copiar el nodo de función." @@ -9928,6 +10282,9 @@ msgstr "Asignación a uniform." msgid "Varyings can only be assigned in vertex function." msgstr "Solo se pueden asignar variaciones en funciones de vértice." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Advertencias:" @@ -10101,9 +10458,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Convert To Lowercase" #~ msgstr "Convertir A Minúscula" -#~ msgid "Snap To Floor" -#~ msgstr "Ajustar al suelo" - #~ msgid "Rotate 0 degrees" #~ msgstr "Rotar 0 grados" @@ -10642,9 +10996,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Added:" #~ msgstr "Agregado:" -#~ msgid "Removed:" -#~ msgstr "Removido:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No se pudo guardar la subtextura de altas:" @@ -10913,9 +11264,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Error importing:" #~ msgstr "Error al importar:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Solo se requiere un archivo para textura grande." - #~ msgid "Max Texture Size:" #~ msgstr "Tamaño Max. de Textura:" @@ -11147,9 +11495,6 @@ msgstr "Solo se pueden asignar variaciones en funciones de vértice." #~ msgid "Edit Groups" #~ msgstr "Editar Grupos" -#~ msgid "GridMap Paint" -#~ msgstr "Pintar GridMap" - #~ msgid "Tiles" #~ msgstr "Tiles" diff --git a/editor/translations/et.po b/editor/translations/et.po index 0b1cef1a31..f5edac889e 100644 --- a/editor/translations/et.po +++ b/editor/translations/et.po @@ -76,6 +76,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -105,6 +113,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -154,6 +171,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -178,6 +199,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -228,6 +253,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -269,6 +306,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -293,6 +338,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -301,10 +350,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -317,6 +378,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -359,10 +424,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -462,6 +523,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1254,6 +1327,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1794,6 +1873,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3369,12 +3456,43 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3414,6 +3532,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3422,6 +3560,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3439,6 +3581,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3448,11 +3594,47 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Delete Node" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3468,6 +3650,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3693,6 +3880,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3721,6 +3921,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4519,6 +4731,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5656,6 +5872,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5764,10 +5988,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5812,7 +6032,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5904,6 +6124,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5912,6 +6138,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6188,10 +6418,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6517,6 +6743,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6679,6 +6909,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6694,6 +6944,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6707,7 +6965,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6719,6 +6986,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7695,6 +7966,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7729,6 +8004,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8141,6 +8420,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8345,6 +8636,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8639,10 +8934,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8723,6 +9014,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index a0a64fe6d8..3b5cce13db 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -96,6 +96,16 @@ msgstr "کلید تکراری درست Ú©Ù†" msgid "Delete Selected Key(s)" msgstr "کلید‌ها را پاک Ú©Ù†" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "اÙزودن نقطه" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "برداشتن نقطه" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "تکرار کلید‌های انیمیشن" @@ -126,6 +136,16 @@ msgstr "Ùراخوانی را در انیمیشن تغییر بده" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "طول انیمیشن را تغییر بده" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "ویژگی:" @@ -175,6 +195,11 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "مقدار آرایه را تغییر بده" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -201,6 +226,10 @@ msgid "Time (s): " msgstr "زمان:" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "مستمر" @@ -253,6 +282,21 @@ msgid "Delete Key(s)" msgstr "Øذ٠گره(ها)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "تغییر مقدار دیکشنری" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "گره انیمیشن" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Øلقه انیمیشن را تغییر بده" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Øذ٠ترک انیمشین" @@ -294,6 +338,16 @@ msgid "Anim Insert Key" msgstr "کلید را در انیمیشن درج Ú©Ù†" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "طول انیمیشن را تغییر بده" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "مسیر به سمت گره:" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -318,6 +372,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "ترک را اضاÙÙ‡ Ú©Ù†" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -326,11 +385,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "درج ترک Ùˆ کلید در انیمیشن" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "ترک را اضاÙÙ‡ Ú©Ù†" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "درج ترک Ùˆ کلید در انیمیشن" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "VariableGet در اسکریپت پیدا نشد: " @@ -344,6 +418,11 @@ msgid "Clipboard is empty" msgstr "ØاÙظه پنهان خالی است!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "مسیر به سمت گره:" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "کلیدها را در انیمیشن تغییر مقیاس بده" @@ -389,11 +468,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "مسیر به سمت گره:" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "انتخاب شده را تغییر مقیاس بده" @@ -496,6 +570,19 @@ msgstr "" msgid "Copy" msgstr "Ú©Ù¾ÛŒ کردن" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "ترک را اضاÙÙ‡ Ú©Ù†" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "آرایه را تغییر اندازه بده" @@ -1312,6 +1399,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1876,6 +1969,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "ذخیره صØنه در ..." @@ -3514,12 +3615,47 @@ msgstr "بارگیری" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "برداشتن نقطه" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "اÙزودن گره" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "تکرار انیمیشن" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "برداشتن نقش" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3561,6 +3697,29 @@ msgid "Triangle already exists" msgstr "بارگذاری خودکار 's%' هم اکنون موجود است!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "اÙزودن متغیر" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "برداشتن نقش" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Øذ٠متغیر" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3569,6 +3728,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3586,6 +3749,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "تغییر بده" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "ویرایش صاÙÛŒ ها" @@ -3595,11 +3763,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "گره(ها) را از درخت اضاÙÙ‡ Ú©Ù†" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "نام گره:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "وصل شده" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "اتصال قطع شده" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "تغییر نام انیمیشن" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Øذ٠گره(ها)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "صاÙÛŒ بومی‌سازی تغییر کرد" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3615,6 +3826,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "نام گره:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3853,6 +4070,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Øرکت دادن گره(ها)" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "اÙزودن ترجمه" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "اÙزودن گره" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3882,6 +4114,20 @@ msgid "No playback resource set at path: %s." msgstr "در مسیر٠منبع نیست." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "برداشته شده:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "گره جابجای" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4703,6 +4949,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5891,6 +6141,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "پخش سÙارشی صØنه" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -6004,10 +6263,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6052,7 +6307,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6149,6 +6404,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "بومی‌سازی" @@ -6158,6 +6419,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "انتخاب Øالت" @@ -6442,10 +6707,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6790,6 +7051,11 @@ msgstr "Ú©Ùندی در آغاز" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "ساختن %s جدید" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "انتخاب شده را تغییر مقیاس بده" @@ -6973,6 +7239,27 @@ msgid "TileSet" msgstr "صدور مجموعه کاشی" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "تکرار کلید‌های انیمیشن" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6989,6 +7276,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "ویرایش صاÙÛŒ ها" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "تغییر بده" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7004,7 +7301,16 @@ msgid "Delete preset '%s'?" msgstr "آیا پرونده‌های انتخاب شده Øذ٠شود؟" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7017,6 +7323,10 @@ msgid "Exporting All" msgstr "صدور" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8030,6 +8340,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Øذ٠گره(ها)ØŸ" @@ -8066,6 +8380,11 @@ msgstr "Ù…ØÙ„ÛŒ" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "صØنه جدید" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "ساختن گره" @@ -8501,6 +8820,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ú©Ùندی در پایان" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8720,6 +9052,11 @@ msgid "GridMap Duplicate Selection" msgstr "انتخاب شده را به دو تا تکثیر Ú©Ù†" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "ترجیØات" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9036,10 +9373,6 @@ msgid "Change Expression" msgstr "انتقال را در انیمیشن تغییر بده" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "اÙزودن گره" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "کلیدهای نامعتبر را ØØ°Ù Ú©Ù†" @@ -9124,6 +9457,10 @@ msgid "Change Input Value" msgstr "تغییر مقدار ورودی" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10093,12 +10430,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "خارج-داخل" -#~ msgid "Change Anim Len" -#~ msgstr "طول انیمیشن را تغییر بده" - -#~ msgid "Change Anim Loop" -#~ msgstr "Øلقه انیمیشن را تغییر بده" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "کلید مقدار دارای نوع را در انیمیشن ایجاد Ú©Ù†" @@ -10248,9 +10579,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "اÙزوده شده:" -#~ msgid "Removed:" -#~ msgstr "برداشته شده:" - #~ msgid "Re-Importing" #~ msgstr "در Øال وارد کردن دوباره..." diff --git a/editor/translations/fi.po b/editor/translations/fi.po index 392fd0e2ad..531b9fb95c 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-02-13 07:10+0000\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" "Last-Translator: Tapani Niemi <tapani.niemi@kapsi.fi>\n" "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/" "godot/fi/>\n" @@ -89,6 +89,16 @@ msgstr "Kahdenna valitut avaimet" msgid "Delete Selected Key(s)" msgstr "Poista valitut avaimet" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Lisää piste" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Siirrä pisteitä" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Animaatio: Monista avaimet" @@ -118,6 +128,16 @@ msgid "Anim Change Call" msgstr "Animaatio: muuta kutsua" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Vaihda animaation luuppia" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Vaihda animaation luuppia" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Ominaisuusraita" @@ -167,6 +187,11 @@ msgid "Anim Clips:" msgstr "Animaatioleikkeet:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Vaihda taulukon arvoa" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Käytä tämä raita päälle/pois." @@ -191,6 +216,11 @@ msgid "Time (s): " msgstr "Aika (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Doppler käytössä" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Jatkuva" @@ -241,6 +271,21 @@ msgid "Delete Key(s)" msgstr "Poista avainruudut" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Vaihda animaation nimi:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Interpolaatiotila" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Vaihda animaation luuppia" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Poista animaatioraita" @@ -282,6 +327,16 @@ msgid "Anim Insert Key" msgstr "Animaatio: Lisää avain" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Vaihda animaation nopeutta" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Järjestele uudelleen automaattiset lataukset" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Raitojen muunnos toimii vain Spatial-pohjaisille solmuille." @@ -310,6 +365,11 @@ msgid "Not possible to add a new track without a root" msgstr "Uutta raitaa ei voida lisätä ilman juurta" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Lisää raita" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Raidan polku on virheellinen, joten ei voida lisätä avainruutua." @@ -318,10 +378,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Raita ei ole Spatial-tyyppinen, joten ei voida lisätä avainruutua" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D-muunnosraita" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Lisää raita" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "Raidan polku on virheellinen, joten ei voida lisätä metodin avainta." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Metodikutsuraita" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metodia ei löydy objektista: " @@ -334,6 +409,10 @@ msgid "Clipboard is empty" msgstr "Leikepöytä on tyhjä" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Liitä raidat" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Animaatio: Skaalaa avaimia" @@ -376,10 +455,6 @@ msgid "Copy Tracks" msgstr "Kopioi raidat" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Liitä raidat" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skaalaa valintaa" @@ -479,6 +554,19 @@ msgstr "Valitse kopioitavat raidat:" msgid "Copy" msgstr "Kopioi" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Äänileikkeet:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Muuta taulukon kokoa" @@ -548,9 +636,8 @@ msgid "Warnings" msgstr "Varoitukset" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Rivi- ja sarakenumerot" +msgstr "Rivi- ja sarakenumerot." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1109,9 +1196,8 @@ msgid "Add Bus" msgstr "Lisää väylä" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Tallenna ääniväylän asettelu nimellä..." +msgstr "Lisää tähän asetteluun uusi ääniväylä." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1292,6 +1378,12 @@ msgstr "Vientimallia ei löytynyt odotetusta polusta:" msgid "Packing" msgstr "Pakataan" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1865,6 +1957,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Tallennetaanko muutokset tiedostoon '%s' ennen sulkemista?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Resurssin lataaminen epäonnistui." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Vain yksi tiedosto vaaditaan suurikokoiselle tekstuurille." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Tallenna skene nimellä..." @@ -2381,9 +2483,8 @@ msgid "Save & Restart" msgstr "Tallenna & käynnistä uudelleen" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "Pyörii kun editorin ikkuna päivittyy!" +msgstr "Pyörii kun editorin ikkuna päivittyy." #: editor/editor_node.cpp msgid "Update Always" @@ -3500,6 +3601,22 @@ msgstr "Lataa..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Siirrä pisteitä" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Muuta sulautusaikaa" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Muuta sulautusaikaa" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3507,6 +3624,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Lisää solmu" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Lisää animaatio" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Poista polun piste" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3549,6 +3687,31 @@ msgid "Triangle already exists" msgstr "Kolmio on jo olemassa" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Lisää muuttuja" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Muuta sulautusaikaa" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Muuta sulautusaikaa" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Poista polun piste" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Poista muuttuja" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D ei kuulu AnimationTree solmuun." @@ -3557,6 +3720,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Kolmioita ei ole olemassa, joten mitään sulautusta ei tapahdu." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Aseta globaalien automaattilataus" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Luo kolmiot yhdistämällä pisteet." @@ -3574,6 +3742,11 @@ msgid "Blend:" msgstr "Sulautus:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Materiaalimuutokset" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Muokkaa suodattimia" @@ -3583,12 +3756,56 @@ msgid "Output node can't be added to the blend tree." msgstr "Lähtösolmua ei voida lisätä sulautuspuuhun." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Lisää solmut puusta" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Siirtotila" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" "Ei voida yhdistää, portti voi olla käytössä tai yhteys voi olla virheellinen." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Yhdistetty" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Yhteys katkaistu" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Uusi animaatio" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Poista solmu(t)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Käytä tämä raita päälle/pois." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Vaihdettu kielisuodatin" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Animaatiotoistinta ei ole asetettu, joten raitojen nimien haku ei onnistu." @@ -3608,6 +3825,12 @@ msgstr "" "nimien haku ei onnistu." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Solmun nimi" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Lisää solmu..." @@ -3833,6 +4056,21 @@ msgid "Cross-Animation Blend Times" msgstr "Lomittautuvien animaatioiden sulautusajat" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Siirtotila" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Lisää käännös" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Lisää solmu" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "End" @@ -3861,6 +4099,20 @@ msgid "No playback resource set at path: %s." msgstr "Polulle ei ole asetettu toistoresurssia: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Poistettu:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Siirtymäsolmu" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4682,6 +4934,10 @@ msgstr "Pidä shift pohjassa muokataksesi tangentteja yksitellen" msgid "Bake GI Probe" msgstr "Kehitä GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Kohde %d" @@ -5209,6 +5465,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"2D-polygonilla on sisäisiä kärkipisteitä, joten sitä ei voi enää muokata " +"näyttöruudussa." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5829,6 +6087,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Tällä luurangolla ei ole luita, luo joitakin Bone2D alisolmuja." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Tee lepoasento (luista)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Tee lepoasento (luista)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Skeleton2D" @@ -5937,10 +6205,6 @@ msgid "Vertices" msgstr "Kärkipisteet" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Pintanäkymä." @@ -5985,7 +6249,8 @@ msgid "Rear" msgstr "Taka" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Kohdista näkymään" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6077,6 +6342,12 @@ msgid "Freelook Speed Modifier" msgstr "Liikkumisen nopeussäädin" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Näkymän kierto lukittu" @@ -6085,6 +6356,11 @@ msgid "XForm Dialog" msgstr "XForm-ikkuna" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Tartu lattiaan" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Valintatila (Q)" @@ -6364,10 +6640,6 @@ msgid "Add Empty" msgstr "Lisää tyhjä" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Vaihda animaation luuppia" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Vaihda animaation nopeutta" @@ -6693,6 +6965,11 @@ msgid "Erase bitmask." msgstr "Pyyhi bittimaski." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Luo uusia solmuja." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Luo uusi polygoni." @@ -6870,6 +7147,29 @@ msgid "TileSet" msgstr "Ruutuvalikoima" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Aseta oletus valinnalle '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Kahdenna solmu(t)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vertex" @@ -6885,6 +7185,16 @@ msgstr "Valo" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Muokkaa ruudun prioriteettia" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Sävytinmuutokset" + #: editor/project_export.cpp msgid "Runnable" msgstr "Suoritettava" @@ -6898,8 +7208,17 @@ msgid "Delete preset '%s'?" msgstr "Poista esiasetus '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Vientimallit tälle alustalle puuttuvat tai ovat viallisia:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6910,6 +7229,10 @@ msgid "Exporting All" msgstr "Viedään kaikki" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Vientimallit tälle alustalle puuttuvat tai ovat viallisia:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Esiasetukset" @@ -7944,6 +8267,11 @@ msgid "Instantiated scenes can't become root" msgstr "Skenejen ilmentymiä ei voi asettaa juureksi" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Tee skenen juuri" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Poista solmu(t)?" @@ -7980,6 +8308,11 @@ msgid "Make Local" msgstr "Tee paikallinen" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Tee skenen juuri" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Luo juurisolmu:" @@ -8408,6 +8741,21 @@ msgid "Set From Tree" msgstr "Aseta puusta" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Hidasta lopussa" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Pikanäppäimet" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Muuta ankkureita" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Pikanäppäimet" @@ -8616,6 +8964,11 @@ msgid "GridMap Duplicate Selection" msgstr "Kahdenna valinta" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Ruudukon asetukset" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Ruudukko" @@ -8916,10 +9269,6 @@ msgid "Change Expression" msgstr "Vaihda lauseketta" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Lisää solmu" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Poista VisualScript solmut" @@ -9005,6 +9354,11 @@ msgid "Change Input Value" msgstr "Vaihda syötteen arvo" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Muokkaa CanvasItemin kokoa" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Ei voida kopioida funktiosolmua." @@ -9775,9 +10129,8 @@ msgid "Switch between hexadecimal and code values." msgstr "Vaihda heksadesimaali- ja koodiarvojen välillä." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Lisää nykyinen väri esiasetukseksi" +msgstr "Lisää nykyinen väri esiasetukseksi." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9871,6 +10224,9 @@ msgstr "Sijoitus uniformille." msgid "Varyings can only be assigned in vertex function." msgstr "Varying tyypin voi sijoittaa vain vertex-funktiossa." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Varoitukset:" @@ -10041,9 +10397,6 @@ msgstr "Varying tyypin voi sijoittaa vain vertex-funktiossa." #~ msgid "Convert To Lowercase" #~ msgstr "Muunna pieniksi kirjaimiksi" -#~ msgid "Snap To Floor" -#~ msgstr "Tartu lattiaan" - #~ msgid "Rotate 0 degrees" #~ msgstr "Käännä 0 astetta" @@ -10536,9 +10889,6 @@ msgstr "Varying tyypin voi sijoittaa vain vertex-funktiossa." #~ msgid "Added:" #~ msgstr "Lisätty:" -#~ msgid "Removed:" -#~ msgstr "Poistettu:" - #~ msgid "Error loading scene." #~ msgstr "Virhe ladatessa Sceneä." @@ -10705,9 +11055,6 @@ msgstr "Varying tyypin voi sijoittaa vain vertex-funktiossa." #~ msgid "Error importing:" #~ msgstr "Virhe tuotaessa:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Vain yksi tiedosto vaaditaan suurikokoiselle tekstuurille." - #~ msgid "Max Texture Size:" #~ msgstr "Tekstuurin enimmäiskoko:" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 4fe762d13b..08837ca582 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -53,12 +53,13 @@ # Rémi Bintein <reminus5@hotmail.fr>, 2018, 2019. # Sylvain Corsini <sylvain.corsini@gmail.com>, 2018. # Caye Pierre <pierrecaye@laposte.net>, 2019. +# Peter Kent <0.peter.kent@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-18 08:54+0000\n" -"Last-Translator: Caye Pierre <pierrecaye@laposte.net>\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" +"Last-Translator: Peter Kent <0.peter.kent@gmail.com>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" "Language: fr\n" @@ -133,6 +134,16 @@ msgstr "Dupliquer les clé(s) sélectionnée(s)" msgid "Delete Selected Key(s)" msgstr "Supprimer les clé(s) sélectionnée(s)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Ajouter un point" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Déplacer de points" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Dupliquer les clés d'animation" @@ -147,7 +158,7 @@ msgstr "Modifier le temps d'image-clé" #: editor/animation_track_editor.cpp msgid "Anim Change Transition" -msgstr "Modifier la transition" +msgstr "Changement du transition de l'animation" #: editor/animation_track_editor.cpp msgid "Anim Change Transform" @@ -162,6 +173,16 @@ msgid "Anim Change Call" msgstr "Anim: Change l'Appel" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Modifier la boucle d'animation" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Modifier la boucle d'animation" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Piste de propriété" @@ -211,6 +232,11 @@ msgid "Anim Clips:" msgstr "Clips d'animation :" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Modifier la valeur du tableau" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Activer/désactiver cette piste." @@ -235,6 +261,11 @@ msgid "Time (s): " msgstr "Temps (s) : " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Activer Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Continu" @@ -285,6 +316,21 @@ msgid "Delete Key(s)" msgstr "Supprimer clé(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Modifier le nom de l'animation :" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Mode d'interpolation" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Modifier la boucle d'animation" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Supprimer la piste d'animation" @@ -327,6 +373,16 @@ msgid "Anim Insert Key" msgstr "Insérer une clé d'animation" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Modifier le taux d'IPS de l'animation" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Ré-organiser les AutoLoads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" "Les pistes de transformation ne s'appliquent qu'aux nÅ“uds basés sur Spatial." @@ -359,6 +415,11 @@ msgid "Not possible to add a new track without a root" msgstr "Impossible d'ajouter une nouvelle piste sans racine" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Ajouter une piste" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Le chemin de la piste est invalide, impossible d'ajouter une clé." @@ -367,12 +428,27 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "La piste n'est pas de type Spatial, impossible d'insérer une clé" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Piste de transformation 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Ajouter une piste" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "Le chemin de la piste est invalide, impossible d'ajouter une clé d'appel de " "méthode." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Piste d'appel de méthode" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Méthode introuvable dans l'objet : " @@ -385,6 +461,10 @@ msgid "Clipboard is empty" msgstr "Le presse-papiers est vide" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Coller pistes" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Mettre à l'échelle les clés d'animation" @@ -431,10 +511,6 @@ msgid "Copy Tracks" msgstr "Copier pistes" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Coller pistes" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Mettre à l'échelle la sélection" @@ -480,7 +556,7 @@ msgstr "Utiliser les courbes de Bézier" #: editor/animation_track_editor.cpp msgid "Anim. Optimizer" -msgstr "Optimiser l'animation" +msgstr "Optimiser de l'animation" #: editor/animation_track_editor.cpp msgid "Max. Linear Error:" @@ -534,6 +610,19 @@ msgstr "Sélectionner les pistes à copier :" msgid "Copy" msgstr "Copier" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Clips audio :" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimensionner le tableau" @@ -603,9 +692,8 @@ msgid "Warnings" msgstr "Avertissements" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Numéros de ligne et de colonne" +msgstr "Numéros de ligne et de colonne." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1165,9 +1253,8 @@ msgid "Add Bus" msgstr "Ajouter un bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Enregistrer la disposition des bus audio sous…" +msgstr "Ajoutez un nouveau bus audio à cette disposition." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1348,6 +1435,12 @@ msgstr "Aucun modèle d'exportation n'a été trouvé au chemin prévu :" msgid "Packing" msgstr "Empaquetage" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1928,6 +2021,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Sauvegarder modifications de '%s' avant de quitter ?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Impossible de charger la ressource." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Enregistrer la scène sous…" @@ -2461,9 +2563,8 @@ msgid "Save & Restart" msgstr "Enregistrer et Redémarrer" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "Tourne lorsque la fenêtre de l'éditeur est repainte !" +msgstr "Tourne lorsque la fenêtre de l'éditeur est redessinée." #: editor/editor_node.cpp msgid "Update Always" @@ -3585,6 +3686,22 @@ msgstr "Charger..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Déplacer de points" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Changer le temps de mélange" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Changer le temps de mélange" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3593,6 +3710,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Ajouter un nÅ“ud" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Ajouter une animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Supprimer le point du chemin" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3636,6 +3774,31 @@ msgid "Triangle already exists" msgstr "Le triangle existe déjà " #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Ajouter une variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Changer le temps de mélange" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Changer le temps de mélange" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Supprimer le point du chemin" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Supprimer la variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D n'appartient pas à un nÅ“ud AnimationTree." @@ -3644,6 +3807,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Il n'existe pas de triangles, donc aucun mélange ne peut avoir lieu." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Activer les variables globales AutoLoad" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Créer des triangles en reliant les points." @@ -3662,6 +3830,11 @@ msgid "Blend:" msgstr "Mélange :" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Modifications de materiau" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editer les filtres" @@ -3671,6 +3844,17 @@ msgid "Output node can't be added to the blend tree." msgstr "Un nÅ“ud de sortie ne peut être ajouté à l'arborescence du mélange." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Ajouter un nÅ“ud à partir de l'arbre" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Mode déplacement" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3678,6 +3862,39 @@ msgstr "" "connexion peut être invalide." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Connecté" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Déconnecté" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Nouvelle animation" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Supprimer nÅ“ud(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Activer/désactiver cette piste." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Filtre de langue modifié" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Aucun lecteur d'animation défini, dès lors impossible de retrouver les noms " @@ -3699,6 +3916,12 @@ msgstr "" "impossible de récupérer les noms des pistes." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nom de nÅ“ud" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Ajouter un nÅ“ud..." @@ -3925,6 +4148,21 @@ msgid "Cross-Animation Blend Times" msgstr "Temps de mélange des entre animations" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Mode déplacement" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Ajouter une traduction" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Ajouter un nÅ“ud" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Fin" @@ -3954,6 +4192,20 @@ msgid "No playback resource set at path: %s." msgstr "Aucune ressource de lecture définie sur le chemin : %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Supprimer" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "NÅ“ud Transition" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4775,6 +5027,10 @@ msgstr "Maintenez l'appui sur Maj pour éditer les tangentes individuellement" msgid "Bake GI Probe" msgstr "Créer sonde IG (Illumination Globale)" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Objet %d" @@ -5307,6 +5563,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"Polygon 2D a des sommets internes, donc il ne peut plus être édité dans la " +"fenêtre d'affichage." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5927,6 +6185,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Ce squelette n'a pas d'os, créez des nÅ“uds Bone2D enfants." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Créer la position de repos (d'après les os)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Créer la position de repos (d'après les os)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Squelette 2D" @@ -6035,10 +6303,6 @@ msgid "Vertices" msgstr "Vertex" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "IPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vue de dessus." @@ -6083,7 +6347,8 @@ msgid "Rear" msgstr "Arrière" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Aligner avec la vue" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6177,6 +6442,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificateur de vitesse de la vue libre" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Verrouiller la rotation de la vue" @@ -6185,6 +6456,11 @@ msgid "XForm Dialog" msgstr "Dialogue XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Aligner l'objet sur le sol" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Sélectionner le mode (Q)" @@ -6466,10 +6742,6 @@ msgid "Add Empty" msgstr "Ajouter vide" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Modifier la boucle d'animation" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Modifier le taux d'IPS de l'animation" @@ -6795,6 +7067,11 @@ msgid "Erase bitmask." msgstr "Effacer le masque de bit." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Créer de nouveaux nÅ“uds." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Créer un nouveau polygone." @@ -6974,6 +7251,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Définir comme défaut pour '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Dupliquer le(s) nÅ“ud(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vertex" @@ -6989,6 +7289,16 @@ msgstr "Lumière" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Modifier la priorité de la tuile" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Modification de shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Exécutable" @@ -7002,8 +7312,17 @@ msgid "Delete preset '%s'?" msgstr "Supprimer pré-réglage '%s' ?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Modèles d'exportation manquants ou corrompus pour cette plateforme :" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -7014,6 +7333,10 @@ msgid "Exporting All" msgstr "Tout exporter" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Modèles d'exportation manquants ou corrompus pour cette plateforme :" + +#: editor/project_export.cpp msgid "Presets" msgstr "Pré-réglages" @@ -7252,7 +7575,7 @@ msgstr "Parcourir" #: editor/project_manager.cpp msgid "Renderer:" -msgstr "Moteur de rendu :" +msgstr "Moteur de rendre :" #: editor/project_manager.cpp msgid "OpenGL ES 3.0" @@ -8056,6 +8379,11 @@ msgid "Instantiated scenes can't become root" msgstr "Les scènes instanciées ne peuvent pas devenir la racine" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Choisir comme racine de scène" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Supprimer le(s) nÅ“ud(s) ?" @@ -8092,6 +8420,11 @@ msgid "Make Local" msgstr "Rendre local" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Choisir comme racine de scène" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Créer un nÅ“ud racine :" @@ -8522,6 +8855,21 @@ msgid "Set From Tree" msgstr "Définir depuis l'arbre" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Lent sur la fin" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Raccourcis" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Modifier les ancres" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Raccourcis" @@ -8730,6 +9078,11 @@ msgid "GridMap Duplicate Selection" msgstr "Sélection de la duplication de GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Paramètres GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Grille" @@ -9032,10 +9385,6 @@ msgid "Change Expression" msgstr "Changer l'expression" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Ajouter un nÅ“ud" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Supprimer nÅ“uds VisualScript" @@ -9120,6 +9469,11 @@ msgid "Change Input Value" msgstr "Changer nom de l'entrée" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Redimensionner l'élément de canevas" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Impossible de copier le nÅ“ud de fonction." @@ -9925,9 +10279,8 @@ msgid "Switch between hexadecimal and code values." msgstr "Alterner entre les valeurs hexadécimales ou brutes." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Ajouter la couleur courante comme pré-réglage" +msgstr "Ajouter la couleur courante comme pré-réglage." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -10023,6 +10376,9 @@ msgstr "Affectation à l'uniforme." msgid "Varyings can only be assigned in vertex function." msgstr "Les variations ne peuvent être affectées que dans la fonction vertex." +#~ msgid "FPS" +#~ msgstr "IPS" + #~ msgid "Warnings:" #~ msgstr "Avertissements :" diff --git a/editor/translations/he.po b/editor/translations/he.po index 7257d9c753..ce4aa15431 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -91,6 +91,15 @@ msgstr "למחוק ×ת ×”×§×‘×¦×™× ×”× ×‘×—×¨×™×?" msgid "Delete Selected Key(s)" msgstr "למחוק ×ת ×”×§×‘×¦×™× ×”× ×‘×—×¨×™×?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "הזזת × ×§×•×“×”" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -120,6 +129,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "החלפת ערך מילון" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -175,6 +194,11 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "החלפת ערך המערך" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -201,6 +225,10 @@ msgid "Time (s): " msgstr "זמן:" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "מתמשך" @@ -253,6 +281,21 @@ msgid "Delete Key(s)" msgstr "מחיקת שורה" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "החלפת ערך מילון" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "החלפת ערך מילון" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "×©× ×”× ×¤×©×” חדשה:" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -294,6 +337,16 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "× ×™×§×•×™ ×”×”× ×¤×©×”" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "סידור ×˜×¢×™× ×•×ª ×וטומטית מחדש" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -318,6 +371,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "הוספת רצועות חדשות." + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -326,11 +384,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "התמרה" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "הוספת רצועות חדשות." + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "הוספת רצועות חדשות." + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "×œ× × ×ž×¦× VariableGet בסקריפט: " @@ -344,6 +417,11 @@ msgid "Clipboard is empty" msgstr "לוח גזירי המש××‘×™× ×¨×™×§!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "הדבקת ×ž×©×ª× ×™×" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -390,11 +468,6 @@ msgid "Copy Tracks" msgstr "העתקת ×ž×©×ª× ×™×" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "הדבקת ×ž×©×ª× ×™×" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -497,6 +570,19 @@ msgstr "" msgid "Copy" msgstr "העתקה" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "מ×זין לשמע" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "×©×™× ×•×™ גודל המערך" @@ -1297,6 +1383,12 @@ msgstr "" msgid "Packing" msgstr "×ריזה" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1863,6 +1955,15 @@ msgid "Save changes to '%s' before closing?" msgstr "לשמור ×ת ×”×©×™× ×•×™×™× ×œÖ¾â€š%s’ ×œ×¤× ×™ הסגירה?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "×˜×¢×™× ×ª המש×ב × ×›×©×œ×”." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "שמירת ×¡×¦× ×” בש×…" @@ -3499,12 +3600,47 @@ msgstr "×˜×¢×™× ×”" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "הזזת × ×§×•×“×”" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "הזזת × ×§×•×“×”" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "תקריב ×”× ×¤×©×”." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "הסרת × ×§×•×“×” ×‘× ×ª×™×‘" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3547,6 +3683,28 @@ msgid "Triangle already exists" msgstr "הפעולה ‚%s’ כבר קיימת!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "הוספת רצועות חדשות." + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "הסרת × ×§×•×“×” ×‘× ×ª×™×‘" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3555,6 +3713,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "החלפת מצב מועדפי×" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3572,6 +3735,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "×©×™× ×•×™×™ חומרי×" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3581,11 +3749,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "×©× ×”×ž×¤×¨×§:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "מחובר" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "×ž× ×•×ª×§" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "×©× ×”× ×¤×©×” חדשה:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "מחיקת שורה" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "החלפת מצב מועדפי×" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "×©×™× ×•×™" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3601,6 +3812,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "×©× ×”×ž×¤×¨×§:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3834,6 +4051,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "מצב ×”×–×–×” (W)" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "מעברון" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3863,6 +4095,20 @@ msgid "No playback resource set at path: %s." msgstr "×œ× ×‘× ×ª×™×‘ המש×ב." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "הסרה" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "מעברון" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4678,6 +4924,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5858,6 +6108,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "× ×’×™× ×ª ×¡×¦× ×” בהת×מה ×ישית" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "×™×—×™×“× ×™" @@ -5969,10 +6228,6 @@ msgid "Vertices" msgstr "קודקודי×" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "מבט על." @@ -6017,7 +6272,8 @@ msgid "Rear" msgstr "×חורי" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "יישור ×¢× ×”×ª×¦×•×’×”" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6110,6 +6366,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "הצגת מידע" @@ -6119,6 +6381,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "בחירת מצב (Q)" @@ -6402,10 +6668,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6745,6 +7007,11 @@ msgstr "מחיקת × ×§×•×“×•×ª" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "יצירת %s חדש" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "יצירת מצולע" @@ -6923,6 +7190,28 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "הגדרה כבררת מחדל עבור ‚%s’" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "שכפול" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "קודקודי×" @@ -6940,6 +7229,15 @@ msgstr "ימין" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "הוספת מ×פיין גלובלי" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6953,7 +7251,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6966,6 +7273,10 @@ msgid "Exporting All" msgstr "ייצו×" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7967,6 +8278,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "שמירת ×¡×¦× ×”" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8002,6 +8318,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "שמירת ×¡×¦× ×”" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "יצירת תיקייה" @@ -8424,6 +8745,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "×©×™× ×•×™ הערה" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8629,6 +8963,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8924,10 +9262,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9010,6 +9344,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "החלפת מצב הערה" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9897,9 +10236,6 @@ msgstr "" #~ msgid "Change Default Value" #~ msgstr "×©×™× ×•×™ ערך בררת המחדל" -#~ msgid "Change Comment" -#~ msgstr "×©×™× ×•×™ הערה" - #~ msgid "Change Input Name" #~ msgstr "×©×™× ×•×™ ×©× ×§×œ×˜" diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 5aee390cc5..21993c701c 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -85,6 +85,14 @@ msgstr "चयनित चाबी (फ़ाइलें) डà¥à¤ªà¥à¤²à¤¿à msgid "Delete Selected Key(s)" msgstr "चयनित फ़ाइलें हटाà¤à¤‚?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim डà¥à¤ªà¥à¤²à¤¿à¤•à¥‡à¤Ÿ चाबी" @@ -118,6 +126,16 @@ msgid "Anim Change Call" msgstr "à¤à¤¨à¥€à¤®à¥‡à¤¶à¤¨ परिवरà¥à¤¤à¤¨ बà¥à¤²à¤¾à¤µà¤¾" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "शबà¥à¤¦ बदलें मूलà¥à¤¯" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "गà¥à¤£(Property) टà¥à¤°à¥ˆà¤•" @@ -168,6 +186,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -192,6 +214,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -244,6 +270,21 @@ msgid "Delete Key(s)" msgstr "à¤à¤¨à¥€à¤®à¥‡à¤¶à¤¨ को हटाने के लिठकà¥à¤‚जी" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "शबà¥à¤¦ बदलें मूलà¥à¤¯" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "शबà¥à¤¦ बदलें मूलà¥à¤¯" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "à¤à¤¨à¤¿à¤®à¥‡à¤¶à¤¨ लूप" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -285,6 +326,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "शबà¥à¤¦à¤•à¥‹à¤¶ कà¥à¤‚जी बदलें" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -309,6 +359,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "टà¥à¤°à¥ˆà¤• जोड़ें" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -317,10 +372,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3 डी टà¥à¤°à¥ˆà¤• रूपांतरण" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "टà¥à¤°à¥ˆà¤• जोड़ें" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "कॉल मेथड टà¥à¤°à¥ˆà¤•" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -333,6 +403,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -375,10 +449,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -480,6 +550,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "टà¥à¤°à¥ˆà¤• जोड़ें" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1311,6 +1394,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1859,6 +1948,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3456,12 +3553,45 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "पसंदीदा:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "à¤à¤¨à¤¿à¤®à¥‡à¤¶à¤¨ लूप" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3501,6 +3631,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "टà¥à¤°à¥ˆà¤• जोड़ें" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3509,6 +3660,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3526,6 +3681,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3535,11 +3694,51 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "जà¥à¤¡à¤¿à¤¯à¥‡" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "डिसà¥à¤•à¤¨à¥‡à¤•à¥à¤Ÿ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "à¤à¤¨à¤¿à¤®à¥‡à¤¶à¤¨ लूप" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "को हटा दें" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3555,6 +3754,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3782,6 +3986,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "अनà¥à¤µà¤¾à¤¦ में बदलाव करें:" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3810,6 +4028,20 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "मिटाना" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "अनà¥à¤µà¤¾à¤¦ में बदलाव करें:" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4614,6 +4846,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5767,6 +6003,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5876,10 +6120,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5924,7 +6164,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6016,6 +6256,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6024,6 +6270,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6301,10 +6551,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6637,6 +6883,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "à¤à¤• नया बनाà¤à¤‚" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "सदसà¥à¤¯à¤¤à¤¾ बनाà¤à¤‚" @@ -6810,6 +7061,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6825,6 +7097,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6838,7 +7118,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6850,6 +7139,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7832,6 +8125,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7866,6 +8163,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "à¤à¤• नया बनाà¤à¤‚" @@ -8280,6 +8581,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8485,6 +8798,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8781,10 +9098,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8865,6 +9178,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/hr.po b/editor/translations/hr.po index ba06a478bb..bb303f6e71 100644 --- a/editor/translations/hr.po +++ b/editor/translations/hr.po @@ -81,6 +81,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -110,6 +118,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -159,6 +176,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -183,6 +204,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -233,6 +258,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -274,6 +311,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -298,6 +343,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -306,10 +355,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -322,6 +383,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -364,10 +429,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -467,6 +528,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1259,6 +1332,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1799,6 +1878,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3374,12 +3461,43 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3419,6 +3537,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3427,6 +3565,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3444,6 +3586,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3453,11 +3599,47 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Delete Node" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3473,6 +3655,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3698,6 +3885,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3726,6 +3926,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4524,6 +4736,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5661,6 +5877,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5769,10 +5993,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5817,7 +6037,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5909,6 +6129,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5917,6 +6143,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6193,10 +6423,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6522,6 +6748,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6684,6 +6914,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6699,6 +6949,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6712,7 +6970,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6724,6 +6991,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7700,6 +7971,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7734,6 +8009,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8146,6 +8425,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8350,6 +8641,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8644,10 +8939,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8728,6 +9019,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index def006f056..273ad21282 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -94,6 +94,16 @@ msgstr "Kiválasztás megkettÅ‘zés" msgid "Delete Selected Key(s)" msgstr "Törli a kiválasztott fájlokat?" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Pont hozzáadása" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Pont Mozgatása" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Animáció kulcsok megkettÅ‘zése" @@ -123,6 +133,16 @@ msgid "Anim Change Call" msgstr "Animáció hÃvás változtatás" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Animáció Nevének Megváltoztatása:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -178,6 +198,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Tömb Értékének Megváltoztatása" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Zavarmentes mód váltása." @@ -205,6 +230,11 @@ msgid "Time (s): " msgstr "Ãttűnési IdÅ‘ (mp):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Doppler engedélyezése" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Folyamatos" @@ -258,6 +288,21 @@ msgid "Delete Key(s)" msgstr "Animáció kulcs törlés" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Animáció Nevének Megváltoztatása:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animáció Node" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Animáció hurok változtatás" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Animáció nyomvonal eltávolÃtás" @@ -299,6 +344,16 @@ msgid "Anim Insert Key" msgstr "Animáció kulcs beillesztés" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Animáció Nevének Megváltoztatása:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "AutoLoad-ok Ãtrendezése" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -323,6 +378,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Animáció nyomvonal hozzáadás" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -331,10 +391,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "UV Térkép Transzformálása" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Animáció nyomvonal hozzáadás" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Animáció nyomvonal és kulcs beillesztés" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -348,6 +423,11 @@ msgid "Clipboard is empty" msgstr "Az erÅ‘forrás vágólap üres!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Paraméterek Beillesztése" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Animáció kulcsok nyújtás" @@ -394,11 +474,6 @@ msgid "Copy Tracks" msgstr "Paraméterek Másolása" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Paraméterek Beillesztése" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Kiválasztás átméretezés" @@ -501,6 +576,19 @@ msgstr "" msgid "Copy" msgstr "Másolás" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Animáció nyomvonal hozzáadás" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Tömb Ãtméretezése" @@ -1315,6 +1403,12 @@ msgstr "" msgid "Packing" msgstr "Csomagolás" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1916,6 +2010,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Bezárás elÅ‘tt menti a '%s'-n végzett módosÃtásokat?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Nem sikerült betölteni az erÅ‘forrást." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Scene mentés másként..." @@ -3606,12 +3709,49 @@ msgstr "Betöltés" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Pont Mozgatása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Keverési IdÅ‘ MódosÃtása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Keverési IdÅ‘ MódosÃtása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Pont hozzáadása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animáció Hozzáadása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Útvonal Pont EltávolÃtása" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3654,6 +3794,30 @@ msgid "Triangle already exists" msgstr "HIBA: Animáció név már létezik!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Animáció nyomvonal hozzáadás" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Keverési IdÅ‘ MódosÃtása" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Keverési IdÅ‘ MódosÃtása" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Útvonal Pont EltávolÃtása" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3662,6 +3826,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "AutoLoad Globálisok Kapcsolása" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3679,6 +3848,11 @@ msgid "Blend:" msgstr "Keverés:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Változások FrissÃtése" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "SzűrÅ‘k Szerkesztése" @@ -3688,11 +3862,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Mozgás Mód" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Csatlakozva" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Kapcsolat bontva" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animáció" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Node létrehozás" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Zavarmentes mód váltása." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Animáció hossz változtatás" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3708,6 +3925,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node neve:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3943,6 +4166,21 @@ msgid "Cross-Animation Blend Times" msgstr "Animációk Közötti Keverési IdÅ‘k" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Mozgás Mód" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Ãtmenet" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3972,6 +4210,20 @@ msgid "No playback resource set at path: %s." msgstr "Nincs az erÅ‘forrás elérési útban." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "EltávolÃt" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Ãtmenet Node" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4811,6 +5063,10 @@ msgstr "Tartsa lenyomva a Shift gombot az érintÅ‘k egyenkénti szerkesztéséhe msgid "Bake GI Probe" msgstr "GI Szonda Besütése" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "%d elem" @@ -6004,6 +6260,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Kibocsátási Pontok Létrehozása A Mesh Alapján" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Egyke" @@ -6115,10 +6380,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6163,7 +6424,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6256,6 +6517,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6264,6 +6531,11 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Rácshoz illesztés" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6545,10 +6817,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6889,6 +7157,11 @@ msgstr "Jobb Egérgomb: Pont Törlése." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Új %s Létrehozása" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Új sokszög létrehozása a semmibÅ‘l." @@ -7070,6 +7343,29 @@ msgid "TileSet" msgstr "TileSet-re..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "BeállÃtás Alapértelmezettként '%s'-hez" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Ãrnyaló" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Animáció kulcsok megkettÅ‘zése" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7086,6 +7382,16 @@ msgstr "" msgid "VisualShader" msgstr "Ãrnyaló" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "SzűrÅ‘k Szerkesztése" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Ãrnyaló" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7099,7 +7405,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7112,6 +7427,10 @@ msgid "Exporting All" msgstr "Exportálás" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8106,6 +8425,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Scene mentés" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8142,6 +8466,11 @@ msgstr "Csontok Létrehozása" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Scene mentés" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Node létrehozás" @@ -8564,6 +8893,20 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Lassan Ki" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Horgonyok MódosÃtása" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8772,6 +9115,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9074,10 +9421,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9160,6 +9503,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "CanvasItem Szerkesztése" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10071,10 +10419,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Konvertálás Kisbetűsre" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Rácshoz illesztés" - #~ msgid "Bake!" #~ msgstr "Besütés!" @@ -10171,12 +10515,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Ki-Be" -#~ msgid "Change Anim Len" -#~ msgstr "Animáció hossz változtatás" - -#~ msgid "Change Anim Loop" -#~ msgstr "Animáció hurok változtatás" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Animáció tÃpusos érték kulcs létrehozás" diff --git a/editor/translations/id.po b/editor/translations/id.po index b850071957..08c16c0a34 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -17,12 +17,13 @@ # yursan9 <rizal.sagi@gmail.com>, 2016. # Evan Hyacinth <muhammad.ivan669@gmail.com>, 2018, 2019. # Guntur Sarwohadi <gsarwohadi@gmail.com>, 2019. +# Alphin Albukhari <alphinalbukhari5@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-01-13 15:07+0000\n" -"Last-Translator: Guntur Sarwohadi <gsarwohadi@gmail.com>\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" +"Last-Translator: Alphin Albukhari <alphinalbukhari5@gmail.com>\n" "Language-Team: Indonesian <https://hosted.weblate.org/projects/godot-engine/" "godot/id/>\n" "Language: id\n" @@ -30,7 +31,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.4-dev\n" +"X-Generator: Weblate 3.5-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -98,6 +99,16 @@ msgstr "Duplikat Key Terpilih" msgid "Delete Selected Key(s)" msgstr "Hapus Key Terpilih" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Tambahkan Sinyal" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Hapus Sinyal" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Tombol Duplikat Anim" @@ -127,6 +138,16 @@ msgid "Anim Change Call" msgstr "Ubah Panggilan Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Ubah Nama Animasi:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Track Properti" @@ -176,6 +197,11 @@ msgid "Anim Clips:" msgstr "Klip-klip Animasi:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Ubah Nilai Array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Alihkan track ini ke nyala/mati." @@ -200,6 +226,11 @@ msgid "Time (s): " msgstr "Waktu (d): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Aktifkan" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Lanjut" @@ -250,6 +281,21 @@ msgid "Delete Key(s)" msgstr "Hapus Key" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Ubah Nama Animasi:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Mode Interpolasi" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Ubah Perulangan Animasi" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Hapus Trek Anim" @@ -292,6 +338,16 @@ msgid "Anim Insert Key" msgstr "Sisipkan Key Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Ubah Nama Animasi:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Mengatur kembali Autoload-autoload" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Track transformasi hanya berlaku untuk node berbasis ruangan." @@ -321,6 +377,11 @@ msgid "Not possible to add a new track without a root" msgstr "Tidak memungkinkan untuk menambah track baru tanpa akar" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Tambah Track" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Tidak bisa menambahkan key karena path pada track tidak sah." @@ -329,11 +390,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Track bukan tipe Spatial, tidak bisa menambahkan key" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Track Transformasi 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Tambah Track" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "Tidak bisa menambahkan key untuk metode karena path pada track tidak sah." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Track Pemanggil Metode" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metode tidak ditemukan dalam objek: " @@ -346,6 +422,11 @@ msgid "Clipboard is empty" msgstr "Papan klip kosong" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Tempel Parameter" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Skala Kunci Anim" @@ -390,11 +471,6 @@ msgid "Copy Tracks" msgstr "Salin Parameter" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Tempel Parameter" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Seleksi Skala" @@ -443,15 +519,15 @@ msgstr "Gunakan Lengkungan Bezier" #: editor/animation_track_editor.cpp msgid "Anim. Optimizer" -msgstr "Anim. Optimisasi" +msgstr "Pengoptimal Animasi" #: editor/animation_track_editor.cpp msgid "Max. Linear Error:" -msgstr "Maks. Linier Error:" +msgstr "Error Linier Maksimum:" #: editor/animation_track_editor.cpp msgid "Max. Angular Error:" -msgstr "Maks. Angular Error:" +msgstr "Error Angular Maksimum:" #: editor/animation_track_editor.cpp msgid "Max Optimizable Angle:" @@ -459,7 +535,7 @@ msgstr "Maksimal Angle yang dapat Dioptimalkan:" #: editor/animation_track_editor.cpp msgid "Optimize" -msgstr "Optimasi" +msgstr "Optimalkan" #: editor/animation_track_editor.cpp msgid "Remove invalid keys" @@ -483,7 +559,7 @@ msgstr "Bersihkan" #: editor/animation_track_editor.cpp msgid "Scale Ratio:" -msgstr "Skala Rasio:" +msgstr "Rasio Skala:" #: editor/animation_track_editor.cpp msgid "Select tracks to copy:" @@ -497,6 +573,19 @@ msgstr "Pilih track untuk disalin:" msgid "Copy" msgstr "Kopy" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Klip-klip Suara:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Ubah ukuran Array" @@ -523,7 +612,7 @@ msgstr "Tidak ada yang cocok" #: editor/code_editor.cpp msgid "Replaced %d occurrence(s)." -msgstr "%d kejadian diganti." +msgstr "kejadian %d diganti." #: editor/code_editor.cpp editor/find_in_files.cpp msgid "Match Case" @@ -563,11 +652,11 @@ msgstr "Kebalikan Semula Pandangan" #: editor/code_editor.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Warnings" -msgstr "" +msgstr "Peringatan" #: editor/code_editor.cpp msgid "Line and column numbers." -msgstr "" +msgstr "Nomor Baris dan Kolom" #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -651,18 +740,17 @@ msgid "Disconnect '%s' from '%s'" msgstr "Memutuskan '%s' dari '%s'" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect all from signal: '%s'" -msgstr "Memutuskan '%s' dari '%s'" +msgstr "Memutuskan semua dari sinyal '%s'" #: editor/connections_dialog.cpp msgid "Connect..." -msgstr "Menyambungkan..." +msgstr "Sambungkan..." #: editor/connections_dialog.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Disconnect" -msgstr "Tidak tersambung" +msgstr "Putuskan" #: editor/connections_dialog.cpp msgid "Connect Signal: " @@ -1310,6 +1398,12 @@ msgstr "" msgid "Packing" msgstr "Mengemas" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1904,6 +1998,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Simpan perubahan '%s' sebelum tutup?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Gagal memuat resource." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Simpan Scene Sebagai..." @@ -3604,12 +3707,49 @@ msgstr "Muat" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Hapus Sinyal" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Ubah Waktu Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Ubah Waktu Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "Node tipe ini tidak dapat digunakan. Hanya node utama yang diijinkan." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Tambahkan Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Tambah Animasi" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Hapus Bidang dan Titik" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3654,6 +3794,31 @@ msgid "Triangle already exists" msgstr "KESALAHAN: Nama animasi sudah ada!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Tambahkan Variabel" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Ubah Waktu Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Ubah Waktu Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Hapus Bidang dan Titik" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Hapus Variabel" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D tidak dimiliki oleh sebuah node AnimationTree." @@ -3662,6 +3827,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Tidak ada segi tiga, pembauran tidak di terapkan." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Beralih AutoLoad Globals" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Buat segi tiga dengan menghubungkan titik-titik." @@ -3679,6 +3849,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Menyimpan perubahan-perubahan lokal..." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3689,12 +3864,56 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Tambahkan Node (Node-node) dari Tree" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Nama Node:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" "Tidak dapat terhubung, port mungkin sedang digunakan atau hubungan tidak sah." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Terhubung" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Terputus" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animasi" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Metode Publik:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Alihkan track ini ke nyala/mati." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Ganti Ukuran Kamera" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Tidak ada pemutar animasi disetel, jadi tidak bisa mendapatkan nama track." @@ -3714,6 +3933,12 @@ msgstr "" "nama track." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nama Node:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3958,6 +4183,21 @@ msgid "Cross-Animation Blend Times" msgstr "Waktu Berbaur Animasi-silang" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Salin Resource" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Transisi" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Tambahkan Node" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Akhir" @@ -3987,6 +4227,20 @@ msgid "No playback resource set at path: %s." msgstr "Tidak didalam path resource." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Dihapus:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Node Transisi" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4830,6 +5084,10 @@ msgstr "Tahan Shift untuk menyunting tangen kurva satu-persatu" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -6027,6 +6285,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Mainkan Custom Scene" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6141,10 +6408,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Tampilan Atas." @@ -6189,8 +6452,9 @@ msgid "Rear" msgstr "Belakang" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr "Tampilan Kanan." #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." @@ -6288,6 +6552,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6296,6 +6566,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Metode Publik:" @@ -6580,10 +6854,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6930,6 +7200,11 @@ msgstr "Beri Skala Seleksi" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Buat Baru %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Buat Bidang" @@ -7115,6 +7390,28 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Jadikan Baku untuk '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplikat Key" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7132,6 +7429,16 @@ msgstr "Kanan" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Sunting Filter" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Ubah" + #: editor/project_export.cpp #, fuzzy msgid "Runnable" @@ -7148,7 +7455,16 @@ msgid "Delete preset '%s'?" msgstr "Hapus file yang dipilih?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7161,6 +7477,10 @@ msgid "Exporting All" msgstr "Mengekspor untuk %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8191,6 +8511,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Simpan Scene" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8226,6 +8551,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Simpan Scene" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Buat Folder" @@ -8665,6 +8995,19 @@ msgid "Set From Tree" msgstr "Menyetel Dari Keturunan" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Beri Skala Seleksi" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8888,6 +9231,10 @@ msgid "GridMap Duplicate Selection" msgstr "Duplikat Pilihan" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9205,10 +9552,6 @@ msgid "Change Expression" msgstr "Ubah Pernyataan" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Tambahkan Node" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "Hapus Tombol-tombol yang tidak sah" @@ -9301,6 +9644,11 @@ msgid "Change Input Value" msgstr "Ubah Nilai Array" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Sunting CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10329,9 +10677,6 @@ msgstr "" #~ msgid "Change Anim Len" #~ msgstr "Ubah Panjang Animasi" -#~ msgid "Change Anim Loop" -#~ msgstr "Ubah Perulangan Animasi" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Buat Nilai Kunci Animasi Tertulis" @@ -10539,9 +10884,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Ditambahkan:" -#~ msgid "Removed:" -#~ msgstr "Dihapus:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Tidak dapat menyimpan sub tekstur atlas:" diff --git a/editor/translations/is.po b/editor/translations/is.po index 6b2588ca26..01875778cf 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -84,6 +84,14 @@ msgstr "Afrita val" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim TvÃteknir lyklar" @@ -118,6 +126,15 @@ msgid "Anim Change Call" msgstr "Útkall breyting sÃmtal" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -168,6 +185,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -193,6 +214,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp #, fuzzy msgid "Continuous" msgstr "Samfellt" @@ -248,6 +273,19 @@ msgid "Delete Key(s)" msgstr "Anim DELETE-lyklar" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Breytingar á Anim track" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp #, fuzzy msgid "Remove Anim Track" msgstr "Fjarlægja Anim track" @@ -290,6 +328,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Anim breyting umskipti" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -314,6 +361,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Anim bæta við lag" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -322,10 +374,24 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim bæta við lag" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim bæta við lag" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -339,6 +405,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -381,10 +451,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp #, fuzzy msgid "Scale Selection" msgstr "Val á kvarða" @@ -488,6 +554,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Anim bæta við lag" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1280,6 +1359,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1821,6 +1906,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3399,12 +3492,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Stillið breyting á:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3444,6 +3569,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Anim bæta við lag" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3452,6 +3598,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3469,6 +3619,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3478,11 +3632,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Stillið breyting á:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Anim DELETE-lyklar" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3498,6 +3690,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3724,6 +3921,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Hreyfa Viðbótar Lykil" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Stillið breyting á:" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3752,6 +3964,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Stillið breyting á:" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4552,6 +4777,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5692,6 +5921,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5800,10 +6037,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5848,7 +6081,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5940,6 +6173,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5948,6 +6187,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6224,10 +6467,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6558,6 +6797,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6728,6 +6971,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "TvÃteknir lyklar" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6743,6 +7007,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6756,7 +7028,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6768,6 +7049,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7748,6 +8033,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7782,6 +8071,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8194,6 +8487,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8399,6 +8704,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8694,10 +9003,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8778,6 +9083,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9551,10 +9860,6 @@ msgstr "" #~ msgstr "Færa Anim track niður" #, fuzzy -#~ msgid "Anim Track Change Interpolation" -#~ msgstr "Breytingar á Anim track" - -#, fuzzy #~ msgid "Anim Track Change Value Mode" #~ msgstr "Breyta gildisstilling à Anim track" @@ -9565,6 +9870,3 @@ msgstr "" #, fuzzy #~ msgid "Anim Add Key" #~ msgstr "Anim bæta við lykli" - -#~ msgid "Move Add Key" -#~ msgstr "Hreyfa Viðbótar Lykil" diff --git a/editor/translations/it.po b/editor/translations/it.po index 97f764a309..a859a8b3be 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -111,6 +111,16 @@ msgstr "Duplicare la(e) chiave selezionata(e)" msgid "Delete Selected Key(s)" msgstr "Eliminare la(e) Chiave(i) Selezionata(e)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Aggiungi punto" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Sposta Punto" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplica Key Animazione" @@ -141,6 +151,16 @@ msgstr "Anim Cambia Chiamata" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "Cambia Loop Animazione" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Cambia Loop Animazione" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "Proprietà :" @@ -195,6 +215,11 @@ msgid "Anim Clips:" msgstr "Clips" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Cambia Valore Array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Attiva/Disattiva la traccia." @@ -221,6 +246,11 @@ msgid "Time (s): " msgstr "Tempo (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Abilita Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Continuo" @@ -275,6 +305,21 @@ msgid "Delete Key(s)" msgstr "Elimina Nodo(i)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Cambia Nome Animazione:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Nodo Animazione" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Cambia Loop Animazione" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Rimuovi Traccia Animazione" @@ -316,6 +361,16 @@ msgid "Anim Insert Key" msgstr "Anim Inserisci Key" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Cambia FPS ANimazione" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Riordina gli Autoload" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -345,6 +400,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Bezier Track" +msgstr "Aggiungi Traccia" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Track path is invalid, so can't add a key." msgstr "Il tracciato non è valido, non è possibile aggiungere una chiave." @@ -354,11 +414,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "La traccia non è di tipo Spatial, impossibile aggiungere la chiave." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Trasformazione 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Aggiungi Traccia" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "Anim Inserisci Traccia e Key" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "Metodo non trovato nell'oggetto: " @@ -372,6 +447,11 @@ msgid "Clipboard is empty" msgstr "Gli appunti sono vuoti" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Incolla Parametri" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Scala Key" @@ -417,11 +497,6 @@ msgid "Copy Tracks" msgstr "Copia parametri" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Incolla Parametri" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Scala Selezione" @@ -521,6 +596,19 @@ msgstr "" msgid "Copy" msgstr "Copia" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Audio Listener" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Ridimensiona Array" @@ -1342,6 +1430,12 @@ msgstr "" msgid "Packing" msgstr "Impacchettando" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1924,6 +2018,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Salvare le modifiche a '%s' prima di chiudere?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Caricamento della risorsa fallito." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Solo un file è richiesto per una texture grande." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Salva Scena Come..." @@ -3617,12 +3721,49 @@ msgstr "Carica" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Sposta Punto" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Cambia tempo di Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Cambia tempo di Blend" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Aggiungi Nodo" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Aggiungi Animazione" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Rimuovi Punto Percorso" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3665,6 +3806,31 @@ msgid "Triangle already exists" msgstr "L'Azione '%s' esiste già !" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Aggiungi Variabile" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Cambia tempo di Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Cambia tempo di Blend" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Rimuovi Punto Percorso" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Rimuovi Variabile" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3673,6 +3839,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Abilita AutoLoad Globals" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3691,6 +3862,11 @@ msgid "Blend:" msgstr "Blend:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Cambiamenti dei Materiali" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Modifica Filtri" @@ -3700,11 +3876,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Aggiungi Nodo(i) Da Albero" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Modalità Movimento" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Connesso" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Disconnesso" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animazione" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Elimina Nodo(i)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Attiva/Disattiva la traccia." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Cambia tempo di Blend" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3720,6 +3940,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nome Nodo:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3958,6 +4184,21 @@ msgstr "Tempi di Blend Cross-Animation" #: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Move Node" +msgstr "Modalità Movimento" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Aggiungi Traduzione" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Aggiungi Nodo" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy msgid "End" msgstr "Fine(i)" @@ -3987,6 +4228,20 @@ msgid "No playback resource set at path: %s." msgstr "Non è nel percorso risorse." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Rimosso:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nodo Transizione" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4829,6 +5084,10 @@ msgstr "Tenere Premuto Shift per modificare le tangenti singolarmente" msgid "Bake GI Probe" msgstr "Cuoci GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Elemento %d" @@ -6031,6 +6290,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Crea Punti Emissione Da Mesh" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Scheletro..." @@ -6144,10 +6412,6 @@ msgid "Vertices" msgstr "Vertici" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vista dall'Alto." @@ -6192,7 +6456,8 @@ msgid "Rear" msgstr "Retro" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Allinea a vista" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6286,6 +6551,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificatore Velocità Vista Libera" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Visualizza Informazioni" @@ -6295,6 +6566,11 @@ msgid "XForm Dialog" msgstr "Finestra di XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Allinea alla griglia" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Modalità di Selezione (Q)" @@ -6582,10 +6858,6 @@ msgid "Add Empty" msgstr "Aggiungi vuoto" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Cambia Loop Animazione" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Cambia FPS ANimazione" @@ -6932,6 +7204,11 @@ msgstr "RMB: Elimina Punto." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Crea Nuovo %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Crea un nuovo poligono dal nulla." @@ -7117,6 +7394,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Imposta come Default per '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Shader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplica Nodo(i)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "Vertici" @@ -7135,6 +7435,16 @@ msgstr "Destra" msgid "VisualShader" msgstr "Shader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Modifica Filtri" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Cambiamenti delle Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Eseguibile" @@ -7149,9 +7459,17 @@ msgid "Delete preset '%s'?" msgstr "Eliminare preset '%s'?" #: editor/project_export.cpp -#, fuzzy -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Le export templates per questa piattaforma sono mancanti:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp #, fuzzy @@ -7164,6 +7482,11 @@ msgid "Exporting All" msgstr "Esportando per %s" #: editor/project_export.cpp +#, fuzzy +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Le export templates per questa piattaforma sono mancanti:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Presets" @@ -8214,6 +8537,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Nuova Scena di Root" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Elimina Nodo(i)?" @@ -8249,6 +8577,11 @@ msgstr "Rendi Locale" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Nuova Scena di Root" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Crea Nodo" @@ -8699,6 +9032,21 @@ msgid "Set From Tree" msgstr "Imposta da Tree" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ease Out" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Scorciatoie" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Cambia Ancore" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Scorciatoie" @@ -8925,6 +9273,11 @@ msgstr "Duplica Selezione" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy +msgid "GridMap Paint" +msgstr "Impostazioni Snap" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Grid Map" msgstr "Snap Griglia" @@ -9259,10 +9612,6 @@ msgid "Change Expression" msgstr "Cambia Espressione" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Aggiungi Nodo" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "Rimuovi key invalidi" @@ -9360,6 +9709,11 @@ msgstr "Cambia Nome Input" #: modules/visual_script/visual_script_editor.cpp #, fuzzy +msgid "Resize Comment" +msgstr "Modifica CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Can't copy the function node." msgstr "Non posso operare su '..'" @@ -10251,6 +10605,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #, fuzzy #~ msgid "Warnings:" #~ msgstr "Avvertimento" @@ -10425,10 +10782,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Converti In Minuscolo" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Allinea alla griglia" - #~ msgid "Rotate 0 degrees" #~ msgstr "Ruota a 0 gradi" @@ -10969,9 +11322,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Agginto:" -#~ msgid "Removed:" -#~ msgstr "Rimosso:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Impossibile salvare la substruttura dell'atlas:" @@ -11243,9 +11593,6 @@ msgstr "" #~ msgid "Error importing:" #~ msgstr "Errore di importazione:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Solo un file è richiesto per una texture grande." - #~ msgid "Max Texture Size:" #~ msgstr "Dimensione Texture Massima:" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index 863ed46ae1..93e7d244a4 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -25,7 +25,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-18 08:54+0000\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" "Last-Translator: nitenook <admin@alterbaum.net>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/" "godot/ja/>\n" @@ -39,7 +39,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 "Convert()ã«å¯¾ã—ã¦ç„¡åŠ¹ãªåž‹ã®å¼•æ•°ã§ã™ã€‚TYPE_ 定数を使ã£ã¦ãã ã•ã„。" +msgstr "convert() ã®å¼•æ•°ã®åž‹ãŒç„¡åŠ¹ã§ã™ã€‚TYPE_* 定数を使ã£ã¦ãã ã•ã„。" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/mono/glue/gd_glue.cpp @@ -100,6 +100,16 @@ msgstr "é¸æŠžä¸ã®ã‚ーを複製" msgid "Delete Selected Key(s)" msgstr "é¸æŠžä¸ã®ã‚ーを削除" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "ç‚¹ã‚’è¿½åŠ " + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "ãƒã‚¤ãƒ³ãƒˆã‚’移動" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "アニメーションã®ã‚ーを複製" @@ -129,6 +139,16 @@ msgid "Anim Change Call" msgstr "アニメーション呼出ã—ã®å¤‰æ›´" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "アニメーションã®ãƒ«ãƒ¼ãƒ—を変更" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "アニメーションã®ãƒ«ãƒ¼ãƒ—を変更" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "プãƒãƒ‘ティトラック" @@ -178,6 +198,11 @@ msgid "Anim Clips:" msgstr "アニメーションクリップ:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "é…列ã®å€¤ã‚’変更" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "ã“ã®ãƒˆãƒ©ãƒƒã‚¯ã® オン/オフ を切り替ãˆã€‚" @@ -202,6 +227,11 @@ msgid "Time (s): " msgstr "時間 (秒): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "有効ã«ã™ã‚‹" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "継続的" @@ -252,6 +282,21 @@ msgid "Delete Key(s)" msgstr "ã‚ーを削除" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "アニメーションåを変更:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "補間モード" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "アニメーションã®ãƒ«ãƒ¼ãƒ—を変更" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "アニメーショントラックを除去" @@ -295,6 +340,16 @@ msgid "Anim Insert Key" msgstr "アニメーションã‚ーを挿入" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "アニメーションã®FPSを変更" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "自動èªè¾¼ã¿ã®ä¸¦ã¹æ›¿ãˆ" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "トランスフォームトラックã¯ç©ºé–“ベースã®ãƒŽãƒ¼ãƒ‰ã«ã®ã¿é©ç”¨ã•ã‚Œã¾ã™ã€‚" @@ -326,6 +381,11 @@ msgid "Not possible to add a new track without a root" msgstr "root ãŒç„¡ã‘ã‚Œã°æ–°è¦ãƒˆãƒ©ãƒƒã‚¯ã¯è¿½åŠ ã§ãã¾ã›ã‚“" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "ãƒˆãƒ©ãƒƒã‚¯ã‚’è¿½åŠ " + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "トラックã®ãƒ‘スãŒç„¡åŠ¹ãªãŸã‚ã€ã‚ãƒ¼ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。" @@ -334,10 +394,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "トラック㌠spatial åž‹ã§ã¯ãªã„ãŸã‚ã€ã‚ーを挿入ã§ãã¾ã›ã‚“" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3Dトランスフォームトラック" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "ãƒˆãƒ©ãƒƒã‚¯ã‚’è¿½åŠ " + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "トラックã®ãƒ‘スãŒç„¡åŠ¹ãªãŸã‚ã€ãƒ¡ã‚½ãƒƒãƒ‰ã‚ãƒ¼ã‚’è¿½åŠ ã§ãã¾ã›ã‚“。" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "メソッド呼出ã—トラック" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "オブジェクトã«ãƒ¡ã‚½ãƒƒãƒ‰ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“: " @@ -350,6 +425,10 @@ msgid "Clipboard is empty" msgstr "クリップボードãŒç©ºã§ã™" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "トラックを貼り付ã‘" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "アニメーションã‚ーã®æ‹¡ç¸®" @@ -393,10 +472,6 @@ msgid "Copy Tracks" msgstr "トラックをコピー" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "トラックを貼り付ã‘" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "スケールã®é¸æŠž" @@ -496,6 +571,19 @@ msgstr "コピーã™ã‚‹ãƒˆãƒ©ãƒƒã‚¯ã‚’é¸æŠž:" msgid "Copy" msgstr "コピー" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "オーディオクリップ:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "é…列ã®ã‚µã‚¤ã‚ºã‚’変更" @@ -565,9 +653,8 @@ msgid "Warnings" msgstr "è¦å‘Š" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "è¡ŒåŠã³åˆ—番å·" +msgstr "行番å·ã¨åˆ—番å·ã€‚" #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1124,9 +1211,8 @@ msgid "Add Bus" msgstr "ãƒã‚¹ã‚’è¿½åŠ " #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "オーディオãƒã‚¹ã®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆã‚’別åã§ä¿å˜..." +msgstr "æ–°è¦ã‚ªãƒ¼ãƒ‡ã‚£ã‚ªãƒã‚¹ã‚’ã“ã®ãƒ¬ã‚¤ã‚¢ã‚¦ãƒˆã«è¿½åŠ ã™ã‚‹ã€‚" #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1301,6 +1387,12 @@ msgstr "エクスãƒãƒ¼ãƒˆ テンプレートãŒäºˆæƒ³ã•ã‚ŒãŸãƒ‘スã«è¦‹ã¤ã msgid "Packing" msgstr "パックã™ã‚‹" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1536,7 +1628,7 @@ msgid "" "$url]contribute one[/url][/color] or [color=$color][url=$url2]request one[/" "url][/color]." msgstr "" -"ç¾åœ¨ã€ã“ã®ã‚¯ãƒ©ã‚¹ã®ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€[color=$color][url=$url]寄付" +"ç¾åœ¨ã€ã“ã®ã‚¯ãƒ©ã‚¹ã®ãƒãƒ¥ãƒ¼ãƒˆãƒªã‚¢ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€[color=$color][url=$url]貢献" "[/url][/color]ã€ã¾ãŸã¯[color=$color][url=$url2]リクエスト[/url][/color]ã¯å¯èƒ½" "ã§ã™ã€‚" @@ -1553,8 +1645,8 @@ msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" msgstr "" -"ç¾åœ¨ã€ã“ã®ãƒ—ãƒãƒ‘ティã®èª¬æ˜Žã¯ã‚ã‚Šã¾ã›ã‚“。[color=$color][url=$url]寄付[/url][/" -"color]ã—ã¦ç§ãŸã¡ã‚’助ã‘ã¦ãã ã•ã„ï¼" +"ç¾åœ¨ã€ã“ã®ãƒ—ãƒãƒ‘ティã®èª¬æ˜Žã¯ã‚ã‚Šã¾ã›ã‚“。[color=$color][url=$url]貢献[/url][/" +"color]ã—ã¦ç§ãŸã¡ã‚’助ã‘ã¦ãã ã•ã„!" #: editor/editor_help.cpp msgid "Method Descriptions" @@ -1569,8 +1661,8 @@ msgid "" "There is currently no description for this method. Please help us by [color=" "$color][url=$url]contributing one[/url][/color]!" msgstr "" -"ç¾åœ¨ã€ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã®èª¬æ˜Žã¯ã‚ã‚Šã¾ã›ã‚“。[color=$color][url=$url]寄付[/url][/" -"color]ã—ã¦ç§ãŸã¡ã‚’助ã‘ã¦ãã ã•ã„ï¼" +"ç¾åœ¨ã€ã“ã®ãƒ¡ã‚½ãƒƒãƒ‰ã®èª¬æ˜Žã¯ã‚ã‚Šã¾ã›ã‚“。[color=$color][url=$url]貢献[/url][/" +"color]ã—ã¦ç§ãŸã¡ã‚’助ã‘ã¦ãã ã•ã„!" #: editor/editor_help_search.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp @@ -1873,6 +1965,16 @@ msgid "Save changes to '%s' before closing?" msgstr "é–‰ã˜ã‚‹å‰ã«ã€'%s' ã¸ã®å¤‰æ›´ã‚’ä¿å˜ã—ã¾ã™ã‹ï¼Ÿ" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "リソースã®èªè¾¼ã¿ã«å¤±æ•—ã—ã¾ã—ãŸã€‚" + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "大ããªãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ãŸã‚ã«ä¸€ã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦ã§ã™" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "åå‰ã‚’付ã‘ã¦ã‚·ãƒ¼ãƒ³ã‚’ä¿å˜..." @@ -2394,9 +2496,8 @@ msgid "Save & Restart" msgstr "ä¿å˜ã—ã¦å†èµ·å‹•" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "エディタウィンドウã®å†æ画時ã«ã‚¹ãƒ”ンã—ã¾ã™ï¼" +msgstr "エディタ ウィンドウã®å†æ画時ã«ã‚¹ãƒ”ンã—ã¾ã™ã€‚" #: editor/editor_node.cpp msgid "Update Always" @@ -3129,7 +3230,7 @@ msgstr "スクリプト作æˆ" #: editor/find_in_files.cpp msgid "Find in Files" -msgstr "ファイル内検索" +msgstr "複数ファイル内を検索" #: editor/find_in_files.cpp msgid "Find:" @@ -3314,8 +3415,9 @@ msgid "Reimport" msgstr "å†ã‚¤ãƒ³ãƒãƒ¼ãƒˆ" #: editor/import_dock.cpp +#, fuzzy msgid "Save scenes, re-import and restart" -msgstr "" +msgstr "シーンをä¿å˜ã—ã€å†ã‚¤ãƒ³ãƒãƒ¼ãƒˆã—ã¦å†èµ·å‹•" #: editor/import_dock.cpp msgid "Changing the type of an imported file requires editor restart." @@ -3502,12 +3604,49 @@ msgstr "èªã¿è¾¼ã‚€.." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "ãƒã‚¤ãƒ³ãƒˆã‚’移動" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "ブレンド時間ã®å¤‰æ›´" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "ブレンド時間ã®å¤‰æ›´" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "ã“ã®ã‚¿ã‚¤ãƒ—ã®ãƒŽãƒ¼ãƒ‰ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。ルートノードã®ã¿ãŒè¨±å¯ã•ã‚Œã¾ã™ã€‚" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ " + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ã‚’è¿½åŠ " + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "パスã®ãƒã‚¤ãƒ³ãƒˆã‚’除去" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3550,6 +3689,31 @@ msgid "Triangle already exists" msgstr "三角形ãŒæ—¢ã«å˜åœ¨ã—ã¾ã™" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "å¤‰æ•°ã‚’è¿½åŠ " + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "ブレンド時間ã®å¤‰æ›´" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "ブレンド時間ã®å¤‰æ›´" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "パスã®ãƒã‚¤ãƒ³ãƒˆã‚’除去" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "無効ãªã‚ーを削除" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "ブレンドシェイプ2Dã¯ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³ãƒ„リー ノードã«å±žã—ã¾ã›ã‚“。" @@ -3558,6 +3722,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "三角形ãŒå˜åœ¨ã—ãªã„ãŸã‚ã€ãƒ–レンドã§ãã¾ã›ã‚“。" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã®è‡ªå‹•èªè¾¼ã¿ã‚’切り替ãˆ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "点を繋ã„ã§ä¸‰è§’形を作æˆã™ã‚‹ã€‚" @@ -3575,6 +3744,11 @@ msgid "Blend:" msgstr "ブレンド:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "マテリアルã®å¤‰æ›´" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "フィルタã®ç·¨é›†" @@ -3584,11 +3758,55 @@ msgid "Output node can't be added to the blend tree." msgstr "出力ノードをブレンドツリーã«è¿½åŠ ã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "シーンã‹ã‚‰ã®ãƒŽãƒ¼ãƒ‰" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "è¿½åŠ ã—ãŸã‚ーを移動" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "接続ã§ãã¾ã›ã‚“。ãƒãƒ¼ãƒˆãŒä½¿ç”¨ä¸ã‹ã€æŽ¥ç¶šãŒç„¡åŠ¹ã§ã‚ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "接続ã—ã¾ã—ãŸ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "切æ–ã•ã‚Œã¾ã—ãŸ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "æ–°è¦ã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "ノードを削除" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "ã“ã®ãƒˆãƒ©ãƒƒã‚¯ã® オン/オフ を切り替ãˆã€‚" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "ブレンドã™ã‚‹æ™‚間を変更" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "アニメーションプレイヤーãŒè¨å®šã•ã‚Œã¦ã„ãªã„ãŸã‚ã€ãƒˆãƒ©ãƒƒã‚¯åã‚’å–å¾—ã§ãã¾ã›ã‚“。" @@ -3607,6 +3825,12 @@ msgstr "" "å¾—ã§ãã¾ã›ã‚“。" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "ノードå" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ ..." @@ -3832,6 +4056,21 @@ msgid "Cross-Animation Blend Times" msgstr "アニメーション間ã®ãƒ–レンド時間" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "è¿½åŠ ã—ãŸã‚ーを移動" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "ç¿»è¨³ã‚’è¿½åŠ " + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ " + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "終り" @@ -3860,6 +4099,20 @@ msgid "No playback resource set at path: %s." msgstr "パス（ %s ）ã«å†ç”Ÿãƒªã‚½ãƒ¼ã‚¹ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "å–り除ã„ãŸã®ã¯:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "トランジション ノード" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4194,6 +4447,8 @@ msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"ベイクã™ã‚‹ãƒ¡ãƒƒã‚·ãƒ¥ãŒã‚ã‚Šã¾ã›ã‚“。メッシュ㫠UV2ãƒãƒ£ãƒ³ãƒãƒ«ãŒå«ã¾ã‚Œã¦ãŠ" +"ã‚Šã€'Bake Light' フラグãŒã‚ªãƒ³ã«ãªã£ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¦ãã ã•ã„。" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." @@ -4355,7 +4610,7 @@ msgstr "回転モード" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Scale Mode" -msgstr "スケール（拡大縮å°ï¼‰ãƒ¢ãƒ¼ãƒ‰" +msgstr "スケールモード" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -4691,6 +4946,10 @@ msgstr "接線を個別ã«ç·¨é›†ã™ã‚‹ã«ã¯ã‚·ãƒ•ãƒˆã‚’押ã™" msgid "Bake GI Probe" msgstr "ã‚°ãƒãƒ¼ãƒãƒ«ã‚¤ãƒ«ãƒŸãƒãƒ¼ã‚·ãƒ§ãƒ³ã®äº‹å‰è¨ˆç®—" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "アイテム%d" @@ -5309,19 +5568,16 @@ msgid "UV" msgstr "UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Points" msgstr "点" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Polygons" -msgstr "ãƒãƒªã‚´ãƒ³->UV" +msgstr "ãƒãƒªã‚´ãƒ³" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Bones" -msgstr "ボーンを生æˆ" +msgstr "ボーン" #: editor/plugins/polygon_2d_editor_plugin.cpp #, fuzzy @@ -5337,9 +5593,8 @@ msgid "Shift: Move All" msgstr "Shift: ã™ã¹ã¦ç§»å‹•" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Shift+Ctrl: Scale" -msgstr "Shift+Ctrl: 縮尺（Scale）" +msgstr "Shift+Ctrl: スケール" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Move Polygon" @@ -5356,13 +5611,15 @@ msgstr "ãƒãƒªã‚´ãƒ³ã®ç¸®å°ºã‚’変更" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create a custom polygon. Enables custom polygon rendering." -msgstr "" +msgstr "カスタムãƒãƒªã‚´ãƒ³ã‚’生æˆã—ã€ã‚«ã‚¹ã‚¿ãƒ ãƒãƒªã‚´ãƒ³ã®æ画を有効ã«ã™ã‚‹ã€‚" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "" "Remove a custom polygon. If none remain, custom polygon rendering is " "disabled." msgstr "" +"カスタムãƒãƒªã‚´ãƒ³ã‚’削除ã™ã‚‹ã€‚ä»–ã«æ®‹ã£ã¦ã„ãªã„å ´åˆã€ã‚«ã‚¹ã‚¿ãƒ ãƒãƒªã‚´ãƒ³ã®æç”»ã¯ç„¡" +"効ã«ãªã‚Šã¾ã™ã€‚" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Paint weights with specified intensity." @@ -5494,9 +5751,8 @@ msgid "Path to AnimationPlayer is invalid" msgstr "AnimationPlayer ã¸ã®ãƒ‘スãŒç„¡åŠ¹ã§ã™" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Clear Recent Files" -msgstr "最近開ã„ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®è¨˜éŒ²ã‚’クリア" +msgstr "最近開ã„ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®å±¥æ´ã‚’クリア" #: editor/plugins/script_editor_plugin.cpp msgid "Close and save changes?" @@ -5763,9 +6019,8 @@ msgid "Only resources from filesystem can be dropped." msgstr "ファイルシステムã®ãƒªã‚½ãƒ¼ã‚¹ã®ã¿ãƒ‰ãƒãƒƒãƒ—ã§ãã¾ã™." #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Lookup Symbol" -msgstr "記å·ã™ã¹ã¦" +msgstr "シンボルを検索" #: editor/plugins/script_text_editor.cpp msgid "Pick Color" @@ -5834,9 +6089,8 @@ msgid "Clone Down" msgstr "下ã«è¤‡å†™" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Complete Symbol" -msgstr "記å·ã™ã¹ã¦" +msgstr "シンボルを補完" #: editor/plugins/script_text_editor.cpp msgid "Trim Trailing Whitespace" @@ -5876,9 +6130,8 @@ msgid "Find Previous" msgstr "å‰ã‚’検索" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Find in Files..." -msgstr "ファイルを絞り込む..." +msgstr "複数ファイル内を検索..." #: editor/plugins/script_text_editor.cpp msgid "Go to Function..." @@ -5903,6 +6156,15 @@ msgstr "ã“ã®skeletonã«ã¯ãƒœãƒ¼ãƒ³ãŒã‚ã‚Šã¾ã›ã‚“。åBone2Dノードをè #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "メッシュã‹ã‚‰æ”¾å‡ºç‚¹ã‚’生æˆ" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "スケルトン..." @@ -6019,10 +6281,6 @@ msgid "Vertices" msgstr "é ‚ç‚¹" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "フレームレート" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "上é¢å›³." @@ -6067,7 +6325,8 @@ msgid "Rear" msgstr "後é¢" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "シーンビューã«ã‚«ãƒ¡ãƒ©ã‚’åˆã‚ã›ã‚‹ï¼ˆAlign With View）" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6118,7 +6377,6 @@ msgid "View FPS" msgstr "フレームレートを表示" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Half Resolution" msgstr "åŠè§£åƒåº¦" @@ -6166,6 +6424,12 @@ msgid "Freelook Speed Modifier" msgstr "フリールックã®é€Ÿåº¦ã‚’調整" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "æƒ…å ±ã‚’è¡¨ç¤º" @@ -6175,6 +6439,11 @@ msgid "XForm Dialog" msgstr "Xformダイアãƒã‚°" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Snapモード:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "é¸æŠžãƒ¢ãƒ¼ãƒ‰ (Q)" @@ -6196,7 +6465,7 @@ msgstr "回転モード (E)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Scale Mode (R)" -msgstr "スケール（拡大縮å°ï¼‰ãƒ¢ãƒ¼ãƒ‰(R)" +msgstr "スケールモード (R)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Local Coords" @@ -6259,24 +6528,20 @@ msgid "Tool Select" msgstr "é¸æŠžãƒ„ール" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Tool Move" msgstr "移動ツール" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Tool Rotate" msgstr "回転ツール" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Tool Scale" -msgstr "拡大縮å°ãƒ„ール" +msgstr "スケールツール" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Toggle Freelook" -msgstr "フルスクリーンã®åˆ‡ã‚Šæ›¿ãˆ" +msgstr "フリールックã®åˆ‡ã‚Šæ›¿ãˆ" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy @@ -6466,10 +6731,6 @@ msgid "Add Empty" msgstr "ç©ºã‚’è¿½åŠ " #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "アニメーションã®ãƒ«ãƒ¼ãƒ—を変更" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "アニメーションã®FPSを変更" @@ -6822,6 +7083,11 @@ msgid "Erase bitmask." msgstr "点を消ã™ã€‚" #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "æ–°è¦ãƒŽãƒ¼ãƒ‰ã‚’作æˆã€‚" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "æ–°è¦ãƒãƒªã‚´ãƒ³ã‚’生æˆã€‚" @@ -6996,6 +7262,29 @@ msgid "TileSet" msgstr "タイルセット..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "'%s' ã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã¨ã—ã¦è¨å®š" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "シェーダー" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "ノードを複製" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "é ‚ç‚¹" @@ -7014,6 +7303,16 @@ msgstr "å³å´é¢" msgid "VisualShader" msgstr "シェーダー" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "タイル プãƒãƒ‘ティを編集" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "シェーダーã®å¤‰æ›´" + #: editor/project_export.cpp msgid "Runnable" msgstr "実行å¯èƒ½" @@ -7027,10 +7326,17 @@ msgid "Delete preset '%s'?" msgstr "プリセット '%s' を削除ã—ã¾ã™ã‹?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"ã“ã®ãƒ—ラットフォームã«å¯¾ã™ã‚‹ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ テンプレートãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ç ´æã—" -"ã¦ã„ã¾ã™:" #: editor/project_export.cpp #, fuzzy @@ -7043,6 +7349,12 @@ msgid "Exporting All" msgstr "%sã«ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆä¸" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"ã“ã®ãƒ—ラットフォームã«å¯¾ã™ã‚‹ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ テンプレートãŒè¦‹ã¤ã‹ã‚‰ãªã„ã‹ã€ç ´æã—" +"ã¦ã„ã¾ã™:" + +#: editor/project_export.cpp msgid "Presets" msgstr "åˆæœŸè¨å®šå€¤" @@ -8098,6 +8410,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "シーンをルートã«ã™ã‚‹" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "ノードを削除ã—ã¾ã™ã‹?" @@ -8135,6 +8452,11 @@ msgid "Make Local" msgstr "ãƒã‚±ãƒ¼ãƒ«" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "シーンをルートã«ã™ã‚‹" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "ルートノードを生æˆ:" @@ -8580,6 +8902,21 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "イージング(Ease Out)" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "ショートカット" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "アンカーを変更" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "ショートカット" @@ -8806,6 +9143,11 @@ msgid "GridMap Duplicate Selection" msgstr "é¸æŠžç¯„囲を複製" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "グリッドマップã®è¨å®š" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "グリッドマップ" @@ -9130,10 +9472,6 @@ msgid "Change Expression" msgstr "å¼ã‚’変更" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "ãƒŽãƒ¼ãƒ‰ã‚’è¿½åŠ " - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "VisualScriptノードを除去" @@ -9231,6 +9569,11 @@ msgstr "入力ã®åå‰ã‚’変更" #: modules/visual_script/visual_script_editor.cpp #, fuzzy +msgid "Resize Comment" +msgstr "CanvasItemをリサイズ" + +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Can't copy the function node." msgstr "'..'を処ç†ã§ãã¾ã›ã‚“" @@ -9395,7 +9738,7 @@ msgstr "" #: platform/android/export/export.cpp msgid "Package name is missing." -msgstr "" +msgstr "パッケージåãŒã‚ã‚Šã¾ã›ã‚“。" #: platform/android/export/export.cpp msgid "Package segments must be of non-zero length." @@ -9403,7 +9746,7 @@ msgstr "" #: platform/android/export/export.cpp msgid "The character '%s' is not allowed in Android application package names." -msgstr "" +msgstr "æ–‡å— '%s' ã¯Androidアプリケーション パッケージåã«ä½¿ç”¨ã§ãã¾ã›ã‚“。" #: platform/android/export/export.cpp msgid "A digit cannot be the first character in a package segment." @@ -9411,11 +9754,11 @@ msgstr "" #: platform/android/export/export.cpp msgid "The character '%s' cannot be the first character in a package segment." -msgstr "" +msgstr "æ–‡å— '%s' ã¯ãƒ‘ッケージ セグメントã®å…ˆé ã«ä½¿ç”¨ã§ãã¾ã›ã‚“。" #: platform/android/export/export.cpp msgid "The package must have at least one '.' separator." -msgstr "" +msgstr "パッケージã«ã¯ä¸€ã¤ä»¥ä¸Šã®åŒºåˆ‡ã‚Šæ–‡å— '.' ãŒå¿…è¦ã§ã™ã€‚" #: platform/android/export/export.cpp msgid "ADB executable not configured in the Editor Settings." @@ -9423,7 +9766,7 @@ msgstr "" #: platform/android/export/export.cpp msgid "OpenJDK jarsigner not configured in the Editor Settings." -msgstr "" +msgstr "OpenJDK jarsignerãŒã‚¨ãƒ‡ã‚£ã‚¿ãƒ¼è¨å®šã§è¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“。" #: platform/android/export/export.cpp msgid "Debug keystore not configured in the Editor Settings nor in the preset." @@ -9431,7 +9774,7 @@ msgstr "" #: platform/android/export/export.cpp msgid "Invalid public key for APK expansion." -msgstr "" +msgstr "APK expansion ã®å…¬é–‹éµãŒç„¡åŠ¹ã§ã™ã€‚" #: platform/android/export/export.cpp msgid "Invalid package name:" @@ -9439,7 +9782,7 @@ msgstr "無効ãªãƒ‘ッケージå:" #: platform/iphone/export/export.cpp msgid "Identifier is missing." -msgstr "" +msgstr "è˜åˆ¥åãŒã‚ã‚Šã¾ã›ã‚“。" #: platform/iphone/export/export.cpp msgid "Identifier segments must be of non-zero length." @@ -9456,15 +9799,15 @@ msgstr "" #: platform/iphone/export/export.cpp msgid "" "The character '%s' cannot be the first character in a Identifier segment." -msgstr "" +msgstr "æ–‡å— '%s' ã¯è˜åˆ¥å セグメントã®å…ˆé ã«ä½¿ç”¨ã§ãã¾ã›ã‚“。" #: platform/iphone/export/export.cpp msgid "The Identifier must have at least one '.' separator." -msgstr "" +msgstr "è˜åˆ¥åã«ã¯ä¸€ã¤ä»¥ä¸Šã®åŒºåˆ‡ã‚Šæ–‡å— '.' ãŒå¿…è¦ã§ã™ã€‚" #: platform/iphone/export/export.cpp msgid "App Store Team ID not specified - cannot configure the project." -msgstr "" +msgstr "App Store ãƒãƒ¼ãƒ ID ãŒæœªæŒ‡å®š - プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’構æˆã§ãã¾ã›ã‚“。" #: platform/iphone/export/export.cpp msgid "Invalid Identifier:" @@ -9951,7 +10294,7 @@ msgstr "見ã¤ã‹ã‚‰ãªã„アニメーション: '%s'" #: scene/animation/animation_tree.cpp msgid "In node '%s', invalid animation: '%s'." -msgstr "" +msgstr "ノード '%s', 無効ãªã‚¢ãƒ‹ãƒ¡ãƒ¼ã‚·ãƒ§ãƒ³: '%s'。" #: scene/animation/animation_tree.cpp msgid "Invalid animation: '%s'." @@ -9987,7 +10330,7 @@ msgstr "" #: scene/gui/color_picker.cpp msgid "Pick a color from the screen." -msgstr "" +msgstr "スクリーンã‹ã‚‰è‰²ã‚’é¸æŠžã—ã¦ãã ã•ã„。" #: scene/gui/color_picker.cpp #, fuzzy @@ -10090,11 +10433,15 @@ msgstr "" #: servers/visual/shader_language.cpp msgid "Assignment to uniform." -msgstr "" +msgstr "uniform ã¸ã®å‰²ã‚Šå½“ã¦ã€‚" #: servers/visual/shader_language.cpp +#, fuzzy msgid "Varyings can only be assigned in vertex function." -msgstr "" +msgstr "Varyingã¯é ‚点関数ã«ã®ã¿å‰²ã‚Šå½“ã¦ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚" + +#~ msgid "FPS" +#~ msgstr "フレームレート" #~ msgid "Warnings:" #~ msgstr "è¦å‘Š:" @@ -10267,10 +10614,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "å°æ–‡å—ã«å¤‰æ›" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Snapモード:" - #~ msgid "Rotate 0 degrees" #~ msgstr "0度回転" @@ -10842,9 +11185,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "åŠ ãˆãŸã®ã¯:" -#~ msgid "Removed:" -#~ msgstr "å–り除ã„ãŸã®ã¯:" - #, fuzzy #~ msgid "Could not save atlas subtexture:" #~ msgstr "アトラスã®è¦ç´ ã§ã‚るテクスãƒãƒ£ã®ä¿å˜ãŒã§ãã¾ã›ã‚“:" @@ -11174,10 +11514,6 @@ msgstr "" #~ msgstr "エラーをインãƒãƒ¼ãƒˆä¸:" #, fuzzy -#~ msgid "Only one file is required for large texture." -#~ msgstr "大ããªãƒ†ã‚¯ã‚¹ãƒãƒ£ã®ãŸã‚ã«ä¸€ã¤ãƒ•ã‚¡ã‚¤ãƒ«ãŒå¿…è¦ã§ã™" - -#, fuzzy #~ msgid "Max Texture Size:" #~ msgstr "最大テクスãƒãƒ£ã‚µã‚¤ã‚º:" diff --git a/editor/translations/ka.po b/editor/translations/ka.po index 37f7f2f2e9..0ef5840a20 100644 --- a/editor/translations/ka.po +++ b/editor/translations/ka.po @@ -87,6 +87,14 @@ msgstr "მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ გáƒáƒ¡áƒáƒ¦áƒ”ბ(ებ)ის áƒáƒ¡áƒ msgid "Delete Selected Key(s)" msgstr "წáƒáƒ•áƒ¨áƒáƒšáƒáƒ— მáƒáƒœáƒ˜áƒ¨áƒœáƒ£áƒšáƒ˜ ფáƒáƒ˜áƒšáƒ”ბი?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ¡áƒáƒ¦áƒ”ბების áƒáƒ¡áƒšáƒ˜áƒ¡ შექმნáƒ" @@ -117,6 +125,16 @@ msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ ძáƒáƒ®áƒ˜áƒšáƒ˜áƒ¡ ცვლილებá #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "áƒáƒœáƒ˜áƒ› სიგრძის შეცვლáƒ" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "áƒáƒ‘იექტზე დáƒáƒ™áƒ•áƒ˜áƒ ვებáƒ" @@ -171,6 +189,11 @@ msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ მáƒáƒœáƒáƒ™áƒ•áƒ”თები:" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "მáƒáƒ¡áƒ˜áƒ•áƒ˜áƒ¡ მნიშვნელáƒáƒ‘ის ცვლილებáƒ" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "ჩáƒáƒœáƒáƒ¬áƒ”რის ჩáƒáƒ თვრ/ გáƒáƒ›áƒáƒ თვáƒ" @@ -199,6 +222,10 @@ msgid "Time (s): " msgstr "დრრ(წáƒáƒ›áƒ˜): " #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "უწყვეტი" @@ -251,6 +278,21 @@ msgid "Delete Key(s)" msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ¡áƒáƒ¦áƒ”ბების წáƒáƒ¨áƒšáƒ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "ლექსიკáƒáƒœáƒ˜áƒ¡ მნიშვნელáƒáƒ‘ის შეცვლáƒ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "ინტერპáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡ რეჟიმი" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "áƒáƒœáƒ˜áƒ› ლუპის შეცვლáƒ" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ თრექის წáƒáƒ¨áƒšáƒ" @@ -296,6 +338,15 @@ msgid "Anim Insert Key" msgstr "áƒáƒœáƒ˜áƒ› გáƒáƒ¡áƒáƒ¦áƒ”ბის ჩáƒáƒ§áƒ”ნებáƒ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "áƒáƒœáƒ˜áƒ› სიგრძის შეცვლáƒ" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -321,6 +372,11 @@ msgstr "შეუძლებელირდáƒáƒáƒ›áƒáƒ¢áƒ áƒáƒ®áƒáƒšáƒ˜ #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Bezier Track" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ თრექის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Track path is invalid, so can't add a key." msgstr "ჩáƒáƒœáƒáƒ¬áƒ”რის მისáƒáƒ›áƒáƒ თი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ იáƒ, áƒáƒ¡áƒ” რáƒáƒ› შეუძლებელირგáƒáƒ¡áƒáƒ¦áƒ”ბის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ" @@ -329,12 +385,27 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "ჩáƒáƒœáƒáƒ¬áƒ”რი áƒáƒ áƒáƒ ის სივრცის სáƒáƒ®áƒ˜áƒ¡, ვერჩáƒáƒ¡áƒ•áƒáƒ›áƒ— გáƒáƒ¡áƒáƒ¦áƒ”ბს" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D გáƒáƒ დáƒáƒ¥áƒ›áƒœáƒ˜áƒ¡ დáƒáƒ™áƒ•áƒ˜áƒ ვებáƒ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ თრექის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "ჩáƒáƒœáƒáƒ¬áƒ”რის მისáƒáƒ›áƒáƒ თი áƒáƒ áƒáƒ¡áƒ¬áƒáƒ იáƒ, áƒáƒ¡áƒ” რáƒáƒ› შეუძლებელირმეთáƒáƒ“ური გáƒáƒ¡áƒáƒ¦áƒ”ბის " "დáƒáƒ›áƒáƒ¢áƒ”ბáƒ." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "მეთáƒáƒ“ის გáƒáƒ›áƒáƒ«áƒáƒ®áƒ”ბის დáƒáƒ™áƒ•áƒ˜áƒ ვებáƒ" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "მეთáƒáƒ“ი ვერმáƒáƒ˜áƒ«áƒ”ბნრáƒáƒ‘იექტში: " @@ -348,6 +419,10 @@ msgid "Clipboard is empty" msgstr "ბუფერი ცáƒáƒ იელიáƒ" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "áƒáƒœáƒ˜áƒ› გáƒáƒ¡áƒáƒ¦áƒ”ბების ზáƒáƒ›áƒ˜áƒ¡ შეცვლáƒ" @@ -390,10 +465,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "მáƒáƒœáƒ˜áƒ¨áƒ•áƒœáƒ˜áƒ¡ მáƒáƒ¡áƒ¨áƒ¢áƒáƒ‘ის ცვლილებáƒ" @@ -496,6 +567,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "ხმáƒáƒ•áƒáƒœáƒ˜ მáƒáƒœáƒáƒ™áƒ•áƒ”თები:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "მáƒáƒ¡áƒ˜áƒ•áƒ˜áƒ¡ ზáƒáƒ›áƒ˜áƒ¡ ცვლილებáƒ" @@ -1306,6 +1390,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1857,6 +1947,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3448,12 +3546,45 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "სáƒáƒ§áƒ•áƒáƒ ლები:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ ბრუნვáƒ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3494,6 +3625,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ თრექის დáƒáƒ›áƒáƒ¢áƒ”ბáƒ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3502,6 +3654,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3519,6 +3675,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3528,11 +3688,53 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "დáƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ ებáƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "კáƒáƒ•áƒ¨áƒ˜áƒ ის გáƒáƒ¬áƒ§áƒ•áƒ”ტáƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ áƒáƒžáƒ¢áƒ˜áƒ›áƒ˜áƒ–áƒáƒªáƒ˜áƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "წáƒáƒ¨áƒšáƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "ჩáƒáƒœáƒáƒ¬áƒ”რის ჩáƒáƒ თვრ/ გáƒáƒ›áƒáƒ თვáƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "áƒáƒœáƒ˜áƒ› სიგრძის შეცვლáƒ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3548,6 +3750,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3775,6 +3982,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "გáƒáƒ დáƒáƒ¡áƒ•áƒšáƒ" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3803,6 +4024,20 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "მáƒáƒ¨áƒáƒ ებáƒ" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "გáƒáƒ დáƒáƒ¡áƒ•áƒšáƒ" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4610,6 +4845,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5766,6 +6005,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5874,10 +6121,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5922,7 +6165,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6014,6 +6257,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6022,6 +6271,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6299,10 +6552,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6636,6 +6885,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "áƒáƒ®áƒáƒšáƒ˜ %s შექმნáƒ" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "შექმნáƒ" @@ -6809,6 +7063,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ გáƒáƒ¡áƒáƒ¦áƒ”ბების áƒáƒ¡áƒšáƒ˜áƒ¡ შექმნáƒ" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6824,6 +7099,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6837,7 +7120,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6849,6 +7141,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7830,6 +8126,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7864,6 +8164,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "კვáƒáƒœáƒ«áƒ—áƒáƒœ დáƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ ებáƒ:" @@ -8277,6 +8581,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8482,6 +8798,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8777,10 +9097,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8863,6 +9179,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9698,12 +10018,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "გáƒáƒ ედáƒáƒœ-შიგნით" -#~ msgid "Change Anim Len" -#~ msgstr "áƒáƒœáƒ˜áƒ› სიგრძის შეცვლáƒ" - -#~ msgid "Change Anim Loop" -#~ msgstr "áƒáƒœáƒ˜áƒ› ლუპის შეცვლáƒ" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "áƒáƒœáƒ˜áƒ›áƒáƒªáƒ˜áƒ˜áƒ¡ ტიპირებული გáƒáƒ¡áƒáƒ¦áƒ”ბის შექმნáƒ" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index ebf31640fc..817407e30a 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-18 08:54+0000\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" "Last-Translator: ì†¡íƒœì„ <xotjq237@gmail.com>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" @@ -92,6 +92,16 @@ msgstr "ì„ íƒí•œ 키를 ë³µì œ" msgid "Delete Selected Key(s)" msgstr "ì„ íƒí•œ 키를 ì‚ì œ" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "í¬ì¸íŠ¸ 추가" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "í¬ì¸íŠ¸ ì´ë™" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "ì• ë‹ˆë©”ì´ì…˜ 키 ë³µì œ" @@ -121,6 +131,16 @@ msgid "Anim Change Call" msgstr "ì• ë‹ˆë©”ì´ì…˜ 호출 변경" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "ì• ë‹ˆë©”ì´ì…˜ 루프 변경" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "ì• ë‹ˆë©”ì´ì…˜ 루프 변경" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "ì†ì„± 트랙" @@ -170,6 +190,11 @@ msgid "Anim Clips:" msgstr "ì• ë‹ˆë©”ì´ì…˜ í´ë¦½:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "ë°°ì—´ ê°’ 변경" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "ì´ íŠ¸ëž™ì„ í‚¤ê±°ë‚˜ ë•ë‹ˆë‹¤." @@ -194,6 +219,11 @@ msgid "Time (s): " msgstr "시간 (ì´ˆ): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "ë„플러 활성화" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ì—°ì†ì " @@ -244,6 +274,21 @@ msgid "Delete Key(s)" msgstr "키 ì‚ì œ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "ì• ë‹ˆë©”ì´ì…˜ ì´ë¦„ 변경:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "ë³´ê°„ 모드" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "ì• ë‹ˆë©”ì´ì…˜ 루프 변경" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "ì• ë‹ˆë©”ì´ì…˜ 트랙 ì‚ì œ" @@ -286,6 +331,16 @@ msgid "Anim Insert Key" msgstr "ì• ë‹ˆë©”ì´ì…˜ 키 삽입" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "ì• ë‹ˆë©”ì´ì…˜ FPS 변경" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "ì˜¤í† ë¡œë“œ ìž¬ì •ë ¬" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "변형 íŠ¸ëž™ì€ ì˜¤ì§ Spatial 기반 노드ì—만 ì ìš©ë©ë‹ˆë‹¤." @@ -315,6 +370,11 @@ msgid "Not possible to add a new track without a root" msgstr "루트 ì—†ì´ ìƒˆ íŠ¸ëž™ì„ ì¶”ê°€í• ìˆ˜ ì—†ìŒ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "트랙 추가" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "트랙 경로가 ìœ íš¨í•˜ì§€ 않습니다, 키를 추가하실 수 없습니다." @@ -323,10 +383,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "íŠ¸ëž™ì´ Spatial íƒ€ìž…ì´ ì•„ë‹™ë‹ˆë‹¤, 키를 삽입하실 수 없습니다" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D 변형 트랙" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "트랙 추가" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "트랙 경로가 ìœ íš¨í•˜ì§€ 않습니다, 메서드 키를 추가하실 수 없습니다." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "호출 메서드 트랙" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "ê°ì²´ì— 메서드가 없습니다: " @@ -339,6 +414,10 @@ msgid "Clipboard is empty" msgstr "í´ë¦½ë³´ë“œê°€ 비었습니다" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "트랙 붙여넣기" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "ì• ë‹ˆë©”ì´ì…˜ 키 í¬ê¸° ì¡°ì ˆ" @@ -381,10 +460,6 @@ msgid "Copy Tracks" msgstr "트랙 복사" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "트랙 붙여넣기" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ì„ íƒ í¬ê¸° ì¡°ì ˆ" @@ -418,7 +493,7 @@ msgstr "ì• ë‹ˆë©”ì´ì…˜ 최ì í™”" #: editor/animation_track_editor.cpp msgid "Clean-Up Animation" -msgstr "ì• ë‹ˆë©”ì´ì…˜ ì •ë¦¬" +msgstr "ì• ë‹ˆë©”ì´ì…˜ ì—†ì• ê¸°" #: editor/animation_track_editor.cpp msgid "Pick the node that will be animated:" @@ -484,6 +559,19 @@ msgstr "ë³µì‚¬í• íŠ¸ëž™ ì„ íƒ:" msgid "Copy" msgstr "복사하기" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "오디오 í´ë¦½:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "ë°°ì—´ í¬ê¸° 변경" @@ -553,9 +641,8 @@ msgid "Warnings" msgstr "ê²½ê³ " #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "ë¼ì¸ ë° ì»¬ëŸ¼ 번호" +msgstr "ë¼ì¸ ë° ì»¬ëŸ¼ 번호." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1112,9 +1199,8 @@ msgid "Add Bus" msgstr "버스 추가" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "오디오 버스 ë ˆì´ì•„ì›ƒì„ ë‹¤ë¥¸ ì´ë¦„으로 ì €ìž¥..." +msgstr "ì´ ë ˆì´ì•„ì›ƒì— ìƒˆ 오디오 버스를 추가합니다." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1291,6 +1377,12 @@ msgstr "ì˜ˆìƒ ê²½ë¡œì—ì„œ 내보내기 í…œí”Œë¦¿ì„ ì°¾ì„ ìˆ˜ 없습니다:" msgid "Packing" msgstr "패킹 중" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1862,6 +1954,16 @@ msgid "Save changes to '%s' before closing?" msgstr "닫기 ì „ì— '%s'ì— ë³€ê²½ì‚¬í•ì„ ì €ìž¥í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "리소스 불러오기 실패." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "í° í…스ì³ë¥¼ 위해서는 단 í•˜ë‚˜ì˜ íŒŒì¼ë§Œ 요구ë©ë‹ˆë‹¤." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "ì”¬ì„ ë‹¤ë¥¸ ì´ë¦„으로 ì €ìž¥..." @@ -2225,14 +2327,14 @@ msgstr "" #: editor/editor_node.cpp msgid "Visible Navigation" -msgstr "네비게ì´ì…˜ ë³´ì´ê¸°" +msgstr "내비게ì´ì…˜ ë³´ì´ê¸°" #: editor/editor_node.cpp msgid "" "Navigation meshes and polygons will be visible on the running game if this " "option is turned on." msgstr "" -"ì´ ì˜µì…˜ì´ í™œì„±í™” ë˜ì–´ ìžˆì„ ê²½ìš°, ê²Œìž„ì´ ì‹¤í–‰ë˜ëŠ” ë™ì•ˆ 네비게ì´ì…˜ 메시가 표시" +"ì´ ì˜µì…˜ì´ í™œì„±í™” ë˜ì–´ ìžˆì„ ê²½ìš°, ê²Œìž„ì´ ì‹¤í–‰ë˜ëŠ” ë™ì•ˆ 내비게ì´ì…˜ 메시가 표시" "ë©ë‹ˆë‹¤." #: editor/editor_node.cpp @@ -2381,9 +2483,8 @@ msgid "Save & Restart" msgstr "ì €ìž¥ & 다시 시작" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "ì—디터 윈ë„ìš°ê°€ 다시 ê·¸ë ¤ì§ˆ ë•Œ íšŒì „!" +msgstr "ì—디터 윈ë„ìš°ê°€ 다시 ê·¸ë ¤ì§ˆ ë•Œ íšŒì „í•©ë‹ˆë‹¤." #: editor/editor_node.cpp msgid "Update Always" @@ -3491,12 +3592,49 @@ msgstr "불러오기..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "í¬ì¸íŠ¸ ì´ë™" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "ë¸”ë Œë“œ 시간 변경" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "ë¸”ë Œë“œ 시간 변경" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "ì´ íƒ€ìž…ì˜ ë…¸ë“œë¥¼ ì‚¬ìš©í• ìˆ˜ 없습니다. ì˜¤ì§ ë£¨íŠ¸ 노드만 사용 가능합니다." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "노드 추가" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "ì• ë‹ˆë©”ì´ì…˜ 추가하기" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "경로 í¬ì¸íŠ¸ ì‚ì œ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3539,6 +3677,31 @@ msgid "Triangle already exists" msgstr "삼ê°í˜•ì´ ì´ë¯¸ 존재함" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "변수 추가" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "ë¸”ë Œë“œ 시간 변경" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "ë¸”ë Œë“œ 시간 변경" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "경로 í¬ì¸íŠ¸ ì‚ì œ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "변수 ì‚ì œ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2Dê°€ AnimationTree ë…¸ë“œì— ì†í•´ìžˆì§€ 않습니다." @@ -3547,6 +3710,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "삼ê°í˜•ì´ 존재하지 않습니다, ë¸”ëžœë”©ì´ ì¼ì–´ë‚˜ì§€ 않습니다." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "ì˜¤í† ë¡œë“œ 글로벌 í† ê¸€" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "í¬ì¸íŠ¸ë¥¼ 연결하여 삼ê°í˜• 만들기." @@ -3564,6 +3732,11 @@ msgid "Blend:" msgstr "ë¸”ë Œë“œ:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "머티리얼 변경" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "í•„í„° 편집" @@ -3573,11 +3746,55 @@ msgid "Output node can't be added to the blend tree." msgstr "ì¶œë ¥ 노드를 ë¸”ë Œë“œ íŠ¸ë¦¬ì— ì¶”ê°€í• ìˆ˜ 없습니다." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "트리ì—ì„œ 노드 추가" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "ì´ë™ 모드" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "ì—°ê²°í• ìˆ˜ 없습니다, í¬íŠ¸ê°€ 사용 중ì´ê±°ë‚˜ ìœ íš¨í•˜ì§€ 않는 연결입니다." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "ì—°ê²°ë¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "ì—°ê²° í•´ì œë¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "새로운 ì• ë‹ˆë©”ì´ì…˜" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "노드 ì‚ì œ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "ì´ íŠ¸ëž™ì„ í‚¤ê±°ë‚˜ ë•ë‹ˆë‹¤." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "ë¡œì¼€ì¼ í•„í„° 변경ë¨" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "ì„¤ì •í•œ ì• ë‹ˆë©”ì´ì…˜ í”Œë ˆì´ì–´ê°€ 없습니다, 트랙 ì´ë¦„ì„ ê²€ìƒ‰í• ìˆ˜ 없습니다." @@ -3596,6 +3813,12 @@ msgstr "" "ì„ ê²€ìƒ‰í• ìˆ˜ 없습니다." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "노드 ì´ë¦„" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "노드 추가하기..." @@ -3718,7 +3941,7 @@ msgstr "ì• ë‹ˆë©”ì´ì…˜ ë„구" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Animation" -msgstr "ì• ë‹ˆë©”ì´ì…˜(Animation)" +msgstr "ì• ë‹ˆë©”ì´ì…˜" #: editor/plugins/animation_player_editor_plugin.cpp msgid "New" @@ -3821,6 +4044,21 @@ msgid "Cross-Animation Blend Times" msgstr "êµì°¨-ì• ë‹ˆë©”ì´ì…˜ ë¸”ë Œë“œ 시간" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "ì´ë™ 모드" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "ë²ˆì— ì¶”ê°€" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "노드 추가" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "End" @@ -3849,6 +4087,20 @@ msgid "No playback resource set at path: %s." msgstr "ë‹¤ìŒ ê²½ë¡œì— ì„¤ì •ëœ ìž¬ìƒ ë¦¬ì†ŒìŠ¤ê°€ 없습니다: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "ì œê±°ë¨:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "ì „í™˜ 노드" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4661,6 +4913,10 @@ msgstr "Shift키를 ëˆ„ë¥´ê³ ìžˆìœ¼ë©´ 탄ì 트를 개별ì 으로 편집 ê°€ë msgid "Bake GI Probe" msgstr "GI 프로브 굽기" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "í•ëª© %d" @@ -4703,7 +4959,7 @@ msgstr "Convex 모양 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" -msgstr "네비게ì´ì…˜ 메시 만들기" +msgstr "내비게ì´ì…˜ 메시 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." @@ -4910,7 +5166,7 @@ msgstr "만들기" #: editor/plugins/navigation_polygon_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create Navigation Polygon" -msgstr "네비게ì´ì…˜ í´ë¦¬ê³¤ 만들기" +msgstr "내비게ì´ì…˜ í´ë¦¬ê³¤ 만들기" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Generating Visibility Rect" @@ -5185,6 +5441,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"Polygon2Dê°€ 내부 ê¼ì§“ì ì„ ê°–ê³ ìžˆìŠµë‹ˆë‹¤, ë” ì´ìƒ ë·°í¬íŠ¸ì—ì„œ ê¼ì§“ì ì„ íŽ¸ì§‘í• " +"수 없습니다." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5805,6 +6063,16 @@ msgstr "" "ì´ ìŠ¤ì¼ˆë ˆí†¤ì€ ë³¸ì„ ê°€ì§€ê³ ìžˆì§€ 않습니다, ìžì‹ìœ¼ë¡œ Bone2D 노드를 추가하세요." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "(본으로부터) íœ´ì‹ í¬ì¦ˆ 만들기" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "(본으로부터) íœ´ì‹ í¬ì¦ˆ 만들기" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "ìŠ¤ì¼ˆë ˆí†¤2D" @@ -5913,10 +6181,6 @@ msgid "Vertices" msgstr "버틱스" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "초당 í”„ë ˆìž„" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "윗면 보기." @@ -5961,7 +6225,8 @@ msgid "Rear" msgstr "ë’·ë©´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "ë·°ì— ì •ë ¬" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6053,6 +6318,12 @@ msgid "Freelook Speed Modifier" msgstr "ìžìœ ì‹œì ì†ë„ 변화" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "ë·° íšŒì „ ìž ê¹€" @@ -6061,6 +6332,11 @@ msgid "XForm Dialog" msgstr "XForm 대화 ìƒìž" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "ë°”ë‹¥ì— ìŠ¤ëƒ…" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "ì„ íƒ ëª¨ë“œ (Q)" @@ -6340,10 +6616,6 @@ msgid "Add Empty" msgstr "빈 í”„ë ˆìž„ 추가" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "ì• ë‹ˆë©”ì´ì…˜ 루프 변경" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "ì• ë‹ˆë©”ì´ì…˜ FPS 변경" @@ -6669,6 +6941,11 @@ msgid "Erase bitmask." msgstr "비트 ë§ˆìŠ¤í¬ ì§€ìš°ê¸°." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "새 노드 만들기." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "새로운 í´ë¦¬ê³¤ 만들기." @@ -6847,6 +7124,29 @@ msgid "TileSet" msgstr "TileSet(íƒ€ì¼ ì…‹)" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "'%s'ì„(를) 기본으로 ì§€ì •" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "비주얼 ì…°ì´ë”" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "노드 ë³µì œ" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "버í…스" @@ -6862,6 +7162,16 @@ msgstr "ë¹›" msgid "VisualShader" msgstr "비주얼 ì…°ì´ë”" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "í•„í„° ìš°ì„ ìˆœìœ„ 편집" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "ì…°ì´ë” 변경" + #: editor/project_export.cpp msgid "Runnable" msgstr "실행가능" @@ -6875,8 +7185,17 @@ msgid "Delete preset '%s'?" msgstr "'%s' í”„ë¦¬ì…‹ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "ì´ í”Œëž«í¼ì— 대한 내보내기 í…œí”Œë¦¿ì´ ì—†ê±°ë‚˜ ì†ìƒë¨:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6887,6 +7206,10 @@ msgid "Exporting All" msgstr "ëª¨ë‘ ë‚´ë³´ë‚´ê¸°" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "ì´ í”Œëž«í¼ì— 대한 내보내기 í…œí”Œë¦¿ì´ ì—†ê±°ë‚˜ ì†ìƒë¨:" + +#: editor/project_export.cpp msgid "Presets" msgstr "프리셋" @@ -7626,7 +7949,7 @@ msgstr "로케ì¼:" #: editor/project_settings_editor.cpp msgid "AutoLoad" -msgstr "ì˜¤í† ë¡œë“œ(AutoLoad)" +msgstr "ì˜¤í† ë¡œë“œ" #: editor/property_editor.cpp msgid "Ease In" @@ -7910,6 +8233,11 @@ msgid "Instantiated scenes can't become root" msgstr "ì¸ìŠ¤í„´íŠ¸í™”ëœ ì”¬ì€ ë£¨íŠ¸ê°€ ë 수 없습니다" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "씬 루트 만들기" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "노드를 ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" @@ -7946,6 +8274,11 @@ msgid "Make Local" msgstr "로컬로 만들기" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "씬 루트 만들기" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "루트 노드 만들기:" @@ -8372,6 +8705,21 @@ msgid "Set From Tree" msgstr "트리로부터 ì„¤ì •" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "완화 out" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "단축키" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "앵커 변경" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "단축키" @@ -8578,6 +8926,11 @@ msgid "GridMap Duplicate Selection" msgstr "그리드맵 ì„ íƒ ë³µì œ" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "그리드맵 ì„¤ì •" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "그리드맵" @@ -8727,7 +9080,7 @@ msgstr "NavMesh ë² ì´í¬" #: modules/recast/navigation_mesh_editor_plugin.cpp msgid "Clear the navigation mesh." -msgstr "네비게ì´ì…˜ 메시 지우기." +msgstr "내비게ì´ì…˜ 메시 지우기." #: modules/recast/navigation_mesh_generator.cpp msgid "Setting up Configuration..." @@ -8767,11 +9120,11 @@ msgstr "í´ë¦¬ 메시 ìƒì„± 중..." #: modules/recast/navigation_mesh_generator.cpp msgid "Converting to native navigation mesh..." -msgstr "네ì´í‹°ë¸Œ 네비게ì´ì…˜ 메시로 변환 중..." +msgstr "네ì´í‹°ë¸Œ 내비게ì´ì…˜ 메시로 변환 중..." #: modules/recast/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "네비게ì´ì…˜ 메시 ìƒì„±ê¸° ì„¤ì •:" +msgstr "내비게ì´ì…˜ 메시 ìƒì„±ê¸° ì„¤ì •:" #: modules/recast/navigation_mesh_generator.cpp msgid "Parsing Geometry..." @@ -8879,10 +9232,6 @@ msgid "Change Expression" msgstr "í‘œí˜„ì‹ ë³€ê²½" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "노드 추가" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "비주얼 스í¬ë¦½íŠ¸ 노드 ì‚ì œ" @@ -8967,6 +9316,11 @@ msgid "Change Input Value" msgstr "ìž…ë ¥ ê°’ 변경" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "CanvasItem í¬ê¸° ì¡°ì ˆ" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "함수 노드를 ë³µì‚¬í• ìˆ˜ 없습니다." @@ -9371,7 +9725,7 @@ msgid "" "node. It only provides navigation data." msgstr "" "NavigationPolygonInstanceì€ Navigation2D ë…¸ë“œì˜ í•˜ìœ„ì— ìžˆì–´ì•¼ 합니다. ì´ê²ƒì€ " -"네비게ì´ì…˜ ë°ì´íƒ€ë§Œì„ ì œê³µí•©ë‹ˆë‹¤." +"내비게ì´ì…˜ ë°ì´í„°ë§Œì„ ì œê³µí•©ë‹ˆë‹¤." #: scene/2d/parallax_layer.cpp msgid "" @@ -9568,8 +9922,8 @@ msgid "" "NavigationMeshInstance must be a child or grandchild to a Navigation node. " "It only provides navigation data." msgstr "" -"NavigationMeshInstanceì€ Navigation ë…¸ë“œì˜ í•˜ìœ„ì— ìžˆì–´ì•¼ 합니다. ì´ê²ƒì€ 네비" -"게ì´ì…˜ ë°ì´íƒ€ë§Œì„ ì œê³µí•©ë‹ˆë‹¤." +"NavigationMeshInstanceì€ Navigation ë…¸ë“œì˜ í•˜ìœ„ì— ìžˆì–´ì•¼ 합니다. ì´ê²ƒì€ 내비" +"게ì´ì…˜ ë°ì´í„°ë§Œì„ ì œê³µí•©ë‹ˆë‹¤." #: scene/3d/particles.cpp msgid "" @@ -9723,9 +10077,8 @@ msgid "Switch between hexadecimal and code values." msgstr "16 진수나 코드 값으로 ì „í™˜í•©ë‹ˆë‹¤." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "현재 색ìƒì„ 프리셋으로 추가" +msgstr "현재 색ìƒì„ 프리셋으로 추가합니다." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9818,6 +10171,9 @@ msgstr "ê· ì¼í•˜ê²Œ 배치함." msgid "Varyings can only be assigned in vertex function." msgstr "Varyings는 ì˜¤ì§ ë²„í…스 함수ì—서만 ì§€ì •í• ìˆ˜ 있습니다." +#~ msgid "FPS" +#~ msgstr "초당 í”„ë ˆìž„" + #~ msgid "Warnings:" #~ msgstr "ê²½ê³ :" @@ -9987,9 +10343,6 @@ msgstr "Varyings는 ì˜¤ì§ ë²„í…스 함수ì—서만 ì§€ì •í• ìˆ˜ 있습니다. #~ msgid "Convert To Lowercase" #~ msgstr "소문ìžë¡œ 변환" -#~ msgid "Snap To Floor" -#~ msgstr "ë°”ë‹¥ì— ìŠ¤ëƒ…" - #~ msgid "Rotate 0 degrees" #~ msgstr "0ë„ íšŒì „" @@ -10514,9 +10867,6 @@ msgstr "Varyings는 ì˜¤ì§ ë²„í…스 함수ì—서만 ì§€ì •í• ìˆ˜ 있습니다. #~ msgid "Added:" #~ msgstr "추가ë¨:" -#~ msgid "Removed:" -#~ msgstr "ì œê±°ë¨:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "ì•„í‹€ë¼ìŠ¤ 서브 í…스ì³ë¥¼ ì €ìž¥í• ìˆ˜ 없습니다:" @@ -10775,9 +11125,6 @@ msgstr "Varyings는 ì˜¤ì§ ë²„í…스 함수ì—서만 ì§€ì •í• ìˆ˜ 있습니다. #~ msgid "Error importing:" #~ msgstr "ê°€ì ¸ì˜¤ê¸° ì—러:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "í° í…스ì³ë¥¼ 위해서는 단 í•˜ë‚˜ì˜ íŒŒì¼ë§Œ 요구ë©ë‹ˆë‹¤." - #~ msgid "Max Texture Size:" #~ msgstr "최대 í…ìŠ¤ì³ ì‚¬ì´ì¦ˆ:" diff --git a/editor/translations/lt.po b/editor/translations/lt.po index 4985518381..cf5799620e 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -84,6 +84,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -115,6 +123,16 @@ msgid "Anim Change Call" msgstr "Animacija: Pakeisti IÅ¡kvietimÄ…" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Animacijos Nodas" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -166,6 +184,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -193,6 +215,10 @@ msgid "Time (s): " msgstr "TrukmÄ—:" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -245,6 +271,21 @@ msgid "Delete Key(s)" msgstr "IÅ¡trinti EfektÄ…" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Animacijos Nodas" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animacijos Nodas" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Animacijos Nodas" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Animacija: Panaikinti Takelį" @@ -286,6 +327,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Animacijos Nodas" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -310,6 +360,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Animacija: PridÄ—ti Takelį" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -318,10 +373,24 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Animacija: PridÄ—ti Takelį" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Animacija: PridÄ—ti Takelį" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -334,6 +403,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -379,10 +452,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -483,6 +552,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Animacija: PridÄ—ti Takelį" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1282,6 +1364,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1832,6 +1920,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3434,12 +3530,45 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "MÄ—gstamiausi:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animacijos Nodas" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3480,6 +3609,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Animacija: PridÄ—ti Takelį" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3488,6 +3638,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3505,6 +3659,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Redaguoti Filtrus" @@ -3514,11 +3672,51 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Naujas pavadinimas:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Atsijungti" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animacija" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "IÅ¡trinti EfektÄ…" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3534,6 +3732,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Naujas pavadinimas:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3764,6 +3968,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Mix Nodas" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Transition Nodas" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3792,6 +4011,20 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Panaikinti" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Transition Nodas" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4602,6 +4835,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5758,6 +5995,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5866,10 +6111,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5914,7 +6155,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6006,6 +6247,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6014,6 +6261,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Pasirinkite Nodus, kuriuos norite importuoti" @@ -6293,10 +6544,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6630,6 +6877,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Sukurti NaujÄ…" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Keisti Poligono SkalÄ™" @@ -6805,6 +7057,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplikuoti" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6820,6 +7093,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Redaguoti Filtrus" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6833,7 +7115,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6845,6 +7136,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7834,6 +8129,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7868,6 +8167,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "Prijunkite prie Nodo:" @@ -8285,6 +8588,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8490,6 +8805,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8785,10 +9104,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8871,6 +9186,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/lv.po b/editor/translations/lv.po index 60475bea45..8cf29d32cb 100644 --- a/editor/translations/lv.po +++ b/editor/translations/lv.po @@ -86,6 +86,14 @@ msgstr "DublikÄta IzvÄ“le" msgid "Delete Selected Key(s)" msgstr "IzdzÄ“st izvÄ“lÄ“tos failus?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -115,6 +123,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "AnimÄciju Cilpa" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -164,6 +182,10 @@ msgid "Anim Clips:" msgstr "AnimÄcijas klipi:" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -188,6 +210,10 @@ msgid "Time (s): " msgstr "Laiks (s): " #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "NepÄrtraukti" @@ -238,6 +264,21 @@ msgid "Delete Key(s)" msgstr "IzdzÄ“st atslÄ“gvietnes" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "AnimÄcijas tÄlummaiņa." + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "InterpolÄcijas režīms" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "AnimÄcijas tÄlummaiņa." + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Noņemt animÄcijas celiņu" @@ -279,6 +320,16 @@ msgid "Anim Insert Key" msgstr "Anim ievietot atslÄ“gievietni" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "AnimÄcijas tÄlummaiņa." + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "IelÄ«mÄ“t celiņus" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -307,6 +358,11 @@ msgid "Not possible to add a new track without a root" msgstr "Nevar izveidot jaunu celiņu bez saknes" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Pievienot celiņu" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -315,10 +371,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Anim ievietot celiņu un atslÄ“gvietni" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Pievienot celiņu" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim ievietot celiņu un atslÄ“gvietni" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metode netika atrasta objektÄ: " @@ -331,6 +402,10 @@ msgid "Clipboard is empty" msgstr "Starpliktuve ir tukÅ¡a" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "IelÄ«mÄ“t celiņus" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim pÄrvietot atslÄ“gievietnes" @@ -374,10 +449,6 @@ msgid "Copy Tracks" msgstr "KopÄ“t celiņus" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "IelÄ«mÄ“t celiņus" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "MÄ“roga IzvÄ“le" @@ -479,6 +550,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Audio klipi:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1286,6 +1370,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1835,6 +1925,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3426,12 +3524,45 @@ msgstr "IelÄdÄ“t" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "FavorÄ«ti:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "AnimÄciju Cilpa" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3472,6 +3603,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Pievienot celiņu" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3480,6 +3632,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3497,6 +3653,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3506,11 +3666,51 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Savienot" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "OptimizÄ“t animÄciju" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "IzdzÄ“st" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "NomainÄ«t" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3526,6 +3726,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3753,6 +3958,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Pievienot celiņu" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3781,6 +4000,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Noņemt" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4585,6 +4817,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5741,6 +5977,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5849,10 +6093,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5897,7 +6137,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5989,6 +6229,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5997,6 +6243,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6274,10 +6524,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6612,6 +6858,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Izveidot Jaunu %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Izveidot" @@ -6786,6 +7037,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "DublicÄ“t atslÄ“gvietnes" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6801,6 +7073,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6814,7 +7094,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6826,6 +7115,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7805,6 +8098,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7839,6 +8136,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "Izveidot Jaunu %s" @@ -8253,6 +8554,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8458,6 +8771,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8753,10 +9070,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8837,6 +9150,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/ml.po b/editor/translations/ml.po index 346181c489..1521d0a841 100644 --- a/editor/translations/ml.po +++ b/editor/translations/ml.po @@ -82,6 +82,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -111,6 +119,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -160,6 +177,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -184,6 +205,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -234,6 +259,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -275,6 +312,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -299,6 +344,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -307,10 +356,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -323,6 +384,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -365,10 +430,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -468,6 +529,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1260,6 +1333,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1800,6 +1879,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3375,12 +3462,43 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3420,6 +3538,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3428,6 +3566,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3445,6 +3587,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3454,11 +3600,47 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Delete Node" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3474,6 +3656,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3699,6 +3886,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3727,6 +3927,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4525,6 +4737,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5662,6 +5878,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5770,10 +5994,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5818,7 +6038,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5910,6 +6130,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5918,6 +6144,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6194,10 +6424,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6523,6 +6749,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6685,6 +6915,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6700,6 +6950,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6713,7 +6971,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6725,6 +6992,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7701,6 +7972,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7735,6 +8010,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8147,6 +8426,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8351,6 +8642,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8645,10 +8940,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8729,6 +9020,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/ms.po b/editor/translations/ms.po index a336b59d6f..70640a39da 100644 --- a/editor/translations/ms.po +++ b/editor/translations/ms.po @@ -86,6 +86,14 @@ msgstr "Anim Menduakan Kunci" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Menduakan Kunci" @@ -116,6 +124,15 @@ msgid "Anim Change Call" msgstr "Anim Ubah Panggilan" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -166,6 +183,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -191,6 +212,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -242,6 +267,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Buang Trek Anim" @@ -283,6 +320,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Anim Ubah Peralihan" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -307,6 +353,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Anim Tambah Trek" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -315,10 +366,24 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim Tambah Trek" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim Tambah Trek" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -331,6 +396,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -373,10 +442,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -477,6 +542,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Anim Tambah Trek" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1269,6 +1347,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1809,6 +1893,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3384,12 +3476,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Set Peralihan ke:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3429,6 +3553,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Anim Tambah Trek" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3437,6 +3582,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3454,6 +3603,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3463,11 +3616,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Set Peralihan ke:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Semua Pilihan" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3483,6 +3674,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3709,6 +3905,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Set Peralihan ke:" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3737,6 +3947,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Set Peralihan ke:" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4536,6 +4759,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5673,6 +5900,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5781,10 +6016,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5829,7 +6060,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5921,6 +6152,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5929,6 +6166,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6205,10 +6446,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6538,6 +6775,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6702,6 +6943,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Anim Menduakan Kunci" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6717,6 +6979,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6730,7 +7000,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6742,6 +7021,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7720,6 +8003,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7754,6 +8041,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8166,6 +8457,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8371,6 +8674,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8666,10 +8973,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8750,6 +9053,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index ada2ff1569..d5ed37e58c 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -97,6 +97,16 @@ msgstr "Dupliser valgte nøkler/taster" msgid "Delete Selected Key(s)" msgstr "Slett valgte nøkler/taster" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Legg til punkt" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Flytt Punkt" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Dupliser Nøkler" @@ -127,6 +137,16 @@ msgstr "Anim Forandre Kall" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "Endre Animasjonsnavn:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "Egenskapsspor" @@ -186,6 +206,11 @@ msgstr "Anim-klipp:" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Endre Array-verdi" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Vis/skjul distraksjonsfri modus." @@ -213,6 +238,10 @@ msgid "Time (s): " msgstr "X-Fade Tid (s):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Kontinuerlig" @@ -266,6 +295,21 @@ msgid "Delete Key(s)" msgstr "Anim Fjern Nøkler" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Endre Animasjonsnavn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animasjonsnode" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Endre Anim-Løkke" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Fjern Anim-Spor" @@ -308,6 +352,16 @@ msgstr "Anim Sett Inn Nøkkel" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Step" +msgstr "Endre Animasjonsnavn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Omorganiser Autoloads" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Transformasjonsspor kan kun brukes pÃ¥ Spatial-baserte noder." @@ -340,6 +394,11 @@ msgstr "Ikke mulig Ã¥ legge til et nytt spor uten en rot" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Bezier Track" +msgstr "Anim Legg til Spor" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Track path is invalid, so can't add a key." msgstr "Sporsti er ugyldig, sÃ¥ kan ikke legge til en nøkkel." @@ -350,10 +409,25 @@ msgstr "Spor er ikke av type Spatial, kan ikke legge til nøkkel" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Transform Track Key" +msgstr "3D transformasjonsspor" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim Legg til Spor" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Track path is invalid, so can't add a method key." msgstr "Sporsti er ugyldig, sÃ¥ kan ikke legge til metodenøkkel." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Kall metode-spor" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metode ikke funnet i objekt: " @@ -367,6 +441,11 @@ msgid "Clipboard is empty" msgstr "Ressurs-utklippstavle er tom!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Lim inn Parametre" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Skalér Nøkler" @@ -416,11 +495,6 @@ msgid "Copy Tracks" msgstr "Kopier Parametre" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Lim inn Parametre" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skaler Utvalg" @@ -523,6 +597,19 @@ msgstr "Velg spor Ã¥ kopiere:" msgid "Copy" msgstr "Lim inn" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Lydklipp:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Endre størrelsen pÃ¥ Array" @@ -1345,6 +1432,12 @@ msgstr "Ingen eksportmal funnet pÃ¥ forventet søkesti:" msgid "Packing" msgstr "Pakking" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1946,6 +2039,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Lagre endringer til '%s' før lukking?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Kunne ikke laste ressurs." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Lagre Scene Som..." @@ -3672,12 +3774,49 @@ msgstr "Last" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Flytt Punkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Endre Blend-Tid" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Endre Blend-Tid" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Legg til punkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Legg til Animasjon" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Fjern Stipunkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3720,6 +3859,30 @@ msgid "Triangle already exists" msgstr "ERROR: Animasjonsnavnet finnes allerede!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Anim Legg til Spor" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Endre Blend-Tid" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Endre Blend-Tid" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Fjern Stipunkt" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3728,6 +3891,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Veksle AutoLoad Globals" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3746,6 +3914,11 @@ msgid "Blend:" msgstr "Blend:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Forandre" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Rediger Filtre" @@ -3755,11 +3928,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Legg til node(r) fra tre" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Flytt Modus" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Tilkoblet" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Frakoblet" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animasjon" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Kutt Noder" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Vis/skjul distraksjonsfri modus." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Endre Anim Lengde" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3775,6 +3992,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nodenavn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -4014,6 +4237,21 @@ msgid "Cross-Animation Blend Times" msgstr "Kryss-Animasjon Blend-Tid" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Flytt Modus" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Overgang" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -4043,6 +4281,20 @@ msgid "No playback resource set at path: %s." msgstr "Ikke i resource path." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Fjern" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Overgang Node" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4890,6 +5142,10 @@ msgstr "Hold Shift for Ã¥ endre tangenter individuelt" msgid "Bake GI Probe" msgstr "Bak GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Element %d" @@ -6089,6 +6345,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Fjern Ben" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6202,10 +6467,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6250,8 +6511,9 @@ msgid "Rear" msgstr "Bak" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr "Høyrevisning" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." @@ -6344,6 +6606,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Vis Informasjon" @@ -6354,6 +6622,11 @@ msgstr "" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Snap til rutenett" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "Select Mode (Q)" msgstr "Velg Modus" @@ -6636,10 +6909,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6986,6 +7255,11 @@ msgstr "Høyreklikk: Slett Punkt." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Lag ny %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Lag en ny polygon fra bunnen." @@ -7170,6 +7444,28 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Sett som Standard for '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Anim Dupliser Nøkler" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7186,6 +7482,16 @@ msgstr "Høyre" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Rediger Filtre" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Forandre" + #: editor/project_export.cpp msgid "Runnable" msgstr "Kjørbar" @@ -7199,7 +7505,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7212,6 +7527,10 @@ msgid "Exporting All" msgstr "Eksporter" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8221,6 +8540,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Lagre Scene" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8257,6 +8581,11 @@ msgstr "Lag Ben" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Lagre Scene" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Lag Node" @@ -8685,6 +9014,20 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Gli ut" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Endre Anker" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8898,6 +9241,10 @@ msgid "GridMap Duplicate Selection" msgstr "Dupliser Utvalg" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9208,10 +9555,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9302,6 +9645,11 @@ msgid "Change Input Value" msgstr "Anim Forandre Verdi" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Endre CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10211,10 +10559,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Konverter til smÃ¥ versaler" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Snap til rutenett" - #~ msgid "Rotate 0 degrees" #~ msgstr "Roter 0 grader" @@ -10282,12 +10626,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Ut-Inn" -#~ msgid "Change Anim Len" -#~ msgstr "Endre Anim Lengde" - -#~ msgid "Change Anim Loop" -#~ msgstr "Endre Anim-Løkke" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Anim Lag Typet Verdi Nøkkel" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 7bb0a80b52..541763f376 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -110,6 +110,16 @@ msgstr "Kopieer Geselecteerde Key(s)" msgid "Delete Selected Key(s)" msgstr "Geselecteerde Key(s) Verwijderen" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Punt toevoegen" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Beweeg Punt" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Dupliceer Keys" @@ -139,6 +149,16 @@ msgid "Anim Change Call" msgstr "Anim Wijzig Aanroep" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Verander Animatie Lus" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Verander Animatie Lus" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Eigenschap Track" @@ -188,6 +208,11 @@ msgid "Anim Clips:" msgstr "Animatieclips:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Wijzig Array Waarde" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Aan-uitschakelaar Track." @@ -213,6 +238,11 @@ msgid "Time (s): " msgstr "Tijd (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Inschakelen Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Doorlopend" @@ -263,6 +293,21 @@ msgid "Delete Key(s)" msgstr "Verwijder Key(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Verander Animatie Naam:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Interpolatiemodus" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Verander Animatie Lus" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Verwijder Anim Track" @@ -304,6 +349,16 @@ msgid "Anim Insert Key" msgstr "Anim Key Invoegen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Verander Animatie FPS" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Herschik Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" "Transformatie tracks zijn alleen te gebruiken met nodes die een dimensionale " @@ -334,6 +389,11 @@ msgid "Not possible to add a new track without a root" msgstr "Niet mogelijk om een nieuwe track toe te voegen zonder een root" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Track Toevoegen" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Track path is niet geldig, dus kan geen key toevoegen." @@ -342,10 +402,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Track is niet van het type Spatial, kan geen key invoegen" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D Transformatie Track" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Track Toevoegen" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "Track path is niet geldig, dus kan geen methode key toevoegen." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Methode Invocatie Track" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Methode niet gevonden in object " @@ -358,6 +433,10 @@ msgid "Clipboard is empty" msgstr "Klembord is leeg" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Plak sporen" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Schaal Keys" @@ -403,10 +482,6 @@ msgid "Copy Tracks" msgstr "Kopieer sporen" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Plak sporen" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Schaal selectie" @@ -508,6 +583,19 @@ msgstr "Selecteer sporen om te kopieren:" msgid "Copy" msgstr "Kopiëren" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Audioclips:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Array Grootte Wijzigen" @@ -1324,6 +1412,12 @@ msgstr "Geen exporteersjabloon gevonden op het verwachte pad:" msgid "Packing" msgstr "Inpakken" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1909,6 +2003,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Sla wijzigen aan '%s' op voor het afsluiten?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Mislukt om resource te laden." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Sla Scene Op Als..." @@ -3558,6 +3661,22 @@ msgstr "Laden..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Beweeg Punt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Wijzig overlooptijd" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Wijzig overlooptijd" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3565,6 +3684,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Node Toevoegen" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Voeg Animatie Toe" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Verwijder Pad Punt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3607,6 +3747,31 @@ msgid "Triangle already exists" msgstr "Driehoek bestaat al" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Variabele Toevoegen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Wijzig overlooptijd" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Wijzig overlooptijd" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Verwijder Pad Punt" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Verwijder Variabele" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D hoort niet bij een AnimationTree knoop." @@ -3615,6 +3780,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "AutoLoad-Globalen omschakelen" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Maak driehoeken door punten te verbinden." @@ -3632,6 +3802,11 @@ msgid "Blend:" msgstr "Mengen:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Materiaal Wijzigingen" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Filters Bewerken" @@ -3641,6 +3816,17 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Voeg Node(s) Toe Uit Tree" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Verplaatsingsmodus" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3648,6 +3834,39 @@ msgstr "" "ongeldig zijn." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Verbonden" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Verbinding Verbroken" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animatie" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Alles Selecteren" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Aan-uitschakelaar Track." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Wijzig Anim Lengte" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "Geen animatiespeler ingesteld, spoornamen konden niet worden gevonden." @@ -3666,6 +3885,12 @@ msgstr "" "niet worden gevonden." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node Naam:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Voeg knoop toe..." @@ -3893,6 +4118,21 @@ msgid "Cross-Animation Blend Times" msgstr "Cross-animatie mixtijden" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Verplaatsingsmodus" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Voeg vertaling toe" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Node Toevoegen" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Einde" @@ -3923,6 +4163,20 @@ msgid "No playback resource set at path: %s." msgstr "Niet in resource pad." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Verwijderd:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Overgangsknoop" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4753,6 +5007,10 @@ msgstr "Houd Shift ingedrukt om de raaklijnen individueel te bewerken" msgid "Bake GI Probe" msgstr "Bak GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Item %d" @@ -5953,6 +6211,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Creëer Emissie Punten Vanuit Mesh" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6066,10 +6333,6 @@ msgid "Vertices" msgstr "Vertices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Bovenaanzicht." @@ -6114,7 +6377,8 @@ msgid "Rear" msgstr "Achter" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Uitlijnen met zicht" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6208,6 +6472,12 @@ msgid "Freelook Speed Modifier" msgstr "Vrijekijk Snelheid Modificator" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Bekijk Informatie" @@ -6217,6 +6487,11 @@ msgid "XForm Dialog" msgstr "XForm Dialoog" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Uitlijnen op raster" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Selectiestand (Q)" @@ -6505,10 +6780,6 @@ msgid "Add Empty" msgstr "Lege Toevoegen" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Verander Animatie Lus" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Verander Animatie FPS" @@ -6845,6 +7116,11 @@ msgid "Erase bitmask." msgstr "Bitmasker wissen." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Nieuwe knopen maken." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Nieuwe veelhoek aanmaken." @@ -7035,6 +7311,29 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Stel in als Standaard voor '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Shader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Dupliceer Graaf Knooppunt(en)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "Vertices" @@ -7054,6 +7353,16 @@ msgstr "Rechts" msgid "VisualShader" msgstr "Shader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Filters Bewerken" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Shader Wijzigingen" + #: editor/project_export.cpp msgid "Runnable" msgstr "Uitvoerbaar" @@ -7067,7 +7376,16 @@ msgid "Delete preset '%s'?" msgstr "Verwijder voorinstelling '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7081,6 +7399,10 @@ msgid "Exporting All" msgstr "Aan het exporteren voor %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "Voorinstelling" @@ -8100,6 +8422,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Klinkt logisch!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8136,6 +8463,11 @@ msgstr "Maak Botten" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Klinkt logisch!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Creëer Node" @@ -8561,6 +8893,21 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Rustig Afzetten" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Snelkoppelingen" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Wijzig Ankers" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Snelkoppelingen" @@ -8773,6 +9120,10 @@ msgid "GridMap Duplicate Selection" msgstr "Dupliceer Selectie" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9090,10 +9441,6 @@ msgid "Change Expression" msgstr "Verander Expressie" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Node Toevoegen" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "Verwijder ongeldige keys" @@ -9191,6 +9538,11 @@ msgid "Change Input Value" msgstr "Wijzig Array Waarde" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Formaat van CanvasItem wijzigen" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10035,6 +10387,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Waarschuwingen:" @@ -10198,10 +10553,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Converteer Naar Kleine Letters" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Uitlijnen op raster" - #~ msgid "Rotate 0 degrees" #~ msgstr "0 Graden Roteren" @@ -10305,9 +10656,6 @@ msgstr "" #~ msgid "Move Shader Graph Node" #~ msgstr "Verplaats Shader Graaf Knooppunten" -#~ msgid "Duplicate Graph Node(s)" -#~ msgstr "Dupliceer Graaf Knooppunt(en)" - #~ msgid "Delete Shader Graph Node(s)" #~ msgstr "Verwijder Shader Graaf Knooppunt(en)" @@ -10365,9 +10713,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Uit-In" -#~ msgid "Change Anim Len" -#~ msgstr "Wijzig Anim Lengte" - #~ msgid "Change Anim Loop" #~ msgstr "Wijzig Anim Lus" @@ -10611,9 +10956,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Toegevoegd:" -#~ msgid "Removed:" -#~ msgstr "Verwijderd:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Kon atlas subtexture niet opslaan:" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 5e3e330c84..a211de63b7 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -30,11 +30,12 @@ # Szymon Nowakowski <smnbdg13@gmail.com>, 2019. # Nie Powiem <blazek10@tlen.pl>, 2019. # Sebastian Hojka <sibibibi1@gmail.com>, 2019. +# Robert <vizz0@onet.pl>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-18 08:54+0000\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" "Last-Translator: Tomek <kobewi4e@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" @@ -112,6 +113,16 @@ msgstr "Duplikuj klucz(e)" msgid "Delete Selected Key(s)" msgstr "UsuÅ„ klucz(e)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Dodaj punkt" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "PrzesuÅ„ punkty" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplikuj klucze" @@ -141,6 +152,16 @@ msgid "Anim Change Call" msgstr "Animacja - wywoÅ‚anie funkcji" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "ZmieÅ„ pÄ™tle animacji" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "ZmieÅ„ pÄ™tle animacji" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Åšcieżka wÅ‚aÅ›ciwoÅ›ci" @@ -190,6 +211,11 @@ msgid "Anim Clips:" msgstr "Klipy animacji:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "ZmieÅ„ Wartość Tablicy" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "WÅ‚Ä…cz/wyÅ‚Ä…cz tÄ™ Å›cieżkÄ™." @@ -214,6 +240,11 @@ msgid "Time (s): " msgstr "Czas (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Efekt Dopplera" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "CiÄ…gÅ‚e" @@ -264,6 +295,21 @@ msgid "Delete Key(s)" msgstr "UsuÅ„ klucz(e)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "ZmieÅ„ nazwÄ™ animacji:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Sposób interpolacji" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "ZmieÅ„ pÄ™tle animacji" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "UsuÅ„ Å›cieżkÄ™ animacji" @@ -306,6 +352,16 @@ msgid "Anim Insert Key" msgstr "Wstaw klatkÄ™ kluczowÄ…" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "ZmieÅ„ FPS animacji" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Przestaw Autoloady" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Åšcieżki przeksztaÅ‚ceÅ„ dziaÅ‚ajÄ… tylko z wÄ™zÅ‚ami bazujÄ…cymi na Spatial." @@ -335,6 +391,11 @@ msgid "Not possible to add a new track without a root" msgstr "Nie da siÄ™ dodać nowej Å›cieżki bez korzenia" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Dodaj Å›cieżkÄ™" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Åšcieżka jest nieprawidÅ‚owa, wiÄ™c nie można wstawić klucza." @@ -343,10 +404,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Åšcieżka nie jest typu Spatial, nie można wstawić klucza" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Åšcieżka przeksztaÅ‚cenia 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Dodaj Å›cieżkÄ™" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "Åšcieżka jest nieprawidÅ‚owa, wiÄ™c nie można wstawić klucza metody." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Åšcieżka wywoÅ‚ania metody" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metoda nie znaleziona w obiekcie: " @@ -359,6 +435,10 @@ msgid "Clipboard is empty" msgstr "Schowek jest pusty" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Wklej Å›cieżki" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Przeskaluj klatki kluczowe" @@ -402,10 +482,6 @@ msgid "Copy Tracks" msgstr "Kopiuj Å›cieżki" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Wklej Å›cieżki" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skaluj zaznaczone" @@ -505,6 +581,19 @@ msgstr "Wybierz Å›cieżki do skopiowania:" msgid "Copy" msgstr "Kopiuj" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Klipy dźwiÄ™kowe:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "ZmieÅ„ rozmiar Tablicy" @@ -1312,6 +1401,12 @@ msgstr "Nie znaleziono szablonu eksportu w przewidywanej lokalizacji:" msgid "Packing" msgstr "Pakowanie" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1887,6 +1982,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Zapisać zmiany w '%s' przed zamkniÄ™ciem?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Nie udaÅ‚o siÄ™ wczytać zasobu." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Tylko jeden plik jest wymagany dla dużych tekstur." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Zapisz scenÄ™ jako..." @@ -3039,7 +3144,7 @@ msgstr "Duplikowanie Folderu:" #: editor/filesystem_dock.cpp msgid "Open Scene(s)" -msgstr "Otwórz ScenÄ™/y" +msgstr "Otwórz scenÄ™/y" #: editor/filesystem_dock.cpp msgid "Instance" @@ -3055,7 +3160,7 @@ msgstr "UsuÅ„ z ulubionych" #: editor/filesystem_dock.cpp msgid "Edit Dependencies..." -msgstr "Edytuj ZależnoÅ›ci..." +msgstr "Edytuj zależnoÅ›ci..." #: editor/filesystem_dock.cpp msgid "View Owners..." @@ -3523,6 +3628,22 @@ msgstr "Wczytaj..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "PrzesuÅ„ punkty" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "ZmieÅ„ czas mieszania" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "ZmieÅ„ czas mieszania" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3530,6 +3651,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Dodaj wÄ™zeÅ‚" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Dodaj animacjÄ™" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "UsuÅ„ punkt Å›cieżki" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3572,6 +3714,31 @@ msgid "Triangle already exists" msgstr "TrójkÄ…t już istnieje" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Dodaj zmiennÄ…" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "ZmieÅ„ czas mieszania" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "ZmieÅ„ czas mieszania" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "UsuÅ„ punkt Å›cieżki" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "UsuÅ„ zmiennÄ…" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D nie należy do wÄ™zÅ‚a AnimationTree." @@ -3580,6 +3747,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Nie ma żadnego trójkÄ…ta, wiÄ™c nie może zajść mieszanie." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "PrzeÅ‚Ä…cz automatycznie Å‚adowane zmienne globalne" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Utwórz trójkÄ…ty poprzez Å‚Ä…czenie punktów." @@ -3597,6 +3769,11 @@ msgid "Blend:" msgstr "Mieszanie:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Zmiany materiaÅ‚u" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Edytuj filtry" @@ -3606,6 +3783,17 @@ msgid "Output node can't be added to the blend tree." msgstr "WÄ™zeÅ‚ wyjÅ›ciowy nie może być dodany do drzewa mieszania." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Dodaj wÄ™zeÅ‚(y) z drzewa" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Tryb przesuwania" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3613,6 +3801,39 @@ msgstr "" "nieprawidÅ‚owe." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "PodÅ‚Ä…czony" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "RozÅ‚Ä…czono" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animacje" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "UsuÅ„ wÄ™zeÅ‚ (wÄ™zÅ‚y)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "WÅ‚Ä…cz/wyÅ‚Ä…cz tÄ™ Å›cieżkÄ™." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "ZmieÅ„Â filtr ustawieÅ„Â lokalizacji" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Nie ustawiono odtwarzacza animacji, wiÄ™c nie można uzyskać nazw Å›cieżek." @@ -3632,6 +3853,12 @@ msgstr "" "uzyskać nazw Å›cieżek." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nazwa wÄ™zÅ‚a" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Dodaj wÄ™zeÅ‚..." @@ -3860,6 +4087,21 @@ msgid "Cross-Animation Blend Times" msgstr "Czasy przejÅ›cia pomiÄ™dzy animacjami" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Tryb przesuwania" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Dodaj tÅ‚umaczenie" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Dodaj wÄ™zeÅ‚" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Koniec" @@ -3888,6 +4130,20 @@ msgid "No playback resource set at path: %s." msgstr "Nie znaleziono zasobu do odtworzenia w Å›cieżce: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "UsuniÄ™te:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "WÄ™zeÅ‚ PrzejÅ›cia" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4315,6 +4571,7 @@ msgstr "PrzesuÅ„ CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Presets for the anchors and margins values of a Control node." msgstr "" +"Ustawienia wstÄ™pne dla wartoÅ›ci zakotwiczeÅ„ i marginesów wÄ™zÅ‚a sterujÄ…cego." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "" @@ -4347,9 +4604,8 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/texture_region_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp scene/gui/graph_edit.cpp -#, fuzzy msgid "Zoom Reset" -msgstr "Wyzeruj powiÄ™kszenie" +msgstr "Zresetuj powiÄ™kszenie" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Select Mode" @@ -4708,6 +4964,10 @@ msgstr "Przytrzymaj Shift aby edytować styczne indywidualnie" msgid "Bake GI Probe" msgstr "Wypal sondÄ™ GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Element %d" @@ -5128,9 +5388,8 @@ msgid "Click: Add Point" msgstr "Klik: Dodaj Punkt" #: editor/plugins/path_2d_editor_plugin.cpp -#, fuzzy msgid "Left Click: Split Segment (in curve)" -msgstr "Podziel Segment (na krzywej)" +msgstr "LPM: Podziel Segment (na krzywej)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp @@ -5243,43 +5502,40 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"WielokÄ…t 2D ma wewnÄ™trzne wierzchoÅ‚ki, wiÄ™c nie można go już edytować w " +"oknie roboczym." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" msgstr "Utwórz wielokÄ…t i UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Create Internal Vertex" -msgstr "Utwórz nowÄ… prowadnicÄ™ poziomÄ…" +msgstr "Utwórz wewnÄ™trzny wierzchoÅ‚ek" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Internal Vertex" -msgstr "UsuÅ„ punkt Å›cieżki" +msgstr "UsuÅ„ wewnÄ™trzny wierzchoÅ‚ek" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Invalid Polygon (need 3 different vertices)" -msgstr "" +msgstr "NieprawidÅ‚owy wielokÄ…t (potrzebujesz 3 różnych wierzchoÅ‚ków)" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Add Custom Polygon" -msgstr "Edytuj wielokÄ…t" +msgstr "Dodaj niestandardowy wielokÄ…t" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Remove Custom Polygon" -msgstr "UsuÅ„Â wielokÄ…t i punkt" +msgstr "UsuÅ„ niestandardowy wielokÄ…t" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Transform UV Map" msgstr "Przekształć MapÄ™ UV" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Transform Polygon" -msgstr "Typ przeksztaÅ‚cenia" +msgstr "Przekształć wielokÄ…t" #: editor/plugins/polygon_2d_editor_plugin.cpp #, fuzzy @@ -5287,9 +5543,8 @@ msgid "Paint Bone Weights" msgstr "Maluj wagi koÅ›ci" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Open Polygon 2D UV editor." -msgstr "WielokÄ…t 2D UV Edytor" +msgstr "Otwórz Polygon 2D UV editor." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Polygon 2D UV Editor" @@ -5305,9 +5560,8 @@ msgid "Points" msgstr "Punkt" #: editor/plugins/polygon_2d_editor_plugin.cpp -#, fuzzy msgid "Polygons" -msgstr "WielokÄ…t->UV" +msgstr "WielokÄ…t" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Bones" @@ -5462,7 +5716,7 @@ msgstr "Otwórz w edytorze" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Load Resource" -msgstr "Wczytaj Zasób" +msgstr "Wczytaj zasób" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "ResourcePreloader" @@ -5875,6 +6129,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Ten szkielet nie ma koÅ›ci. Stwórz jakieÅ› wÄ™zÅ‚y potomne Bone2D." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Utwórz pozÄ™ spoczynkowÄ… (z koÅ›ci)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Utwórz pozÄ™ spoczynkowÄ… (z koÅ›ci)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Szkielet 2D" @@ -5983,10 +6247,6 @@ msgid "Vertices" msgstr "WierzchoÅ‚ki" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "Klatki na sekundÄ™" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Widok z góry." @@ -6031,7 +6291,8 @@ msgid "Rear" msgstr "TyÅ‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Wyrównaj z widokiem" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6124,6 +6385,12 @@ msgid "Freelook Speed Modifier" msgstr "Zmiennik prÄ™dkoÅ›ci \"Wolnego widoku\"" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Obroty widoku zablokowane" @@ -6132,6 +6399,11 @@ msgid "XForm Dialog" msgstr "Okno dialogowe XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "PrzyciÄ…gaj do siatki" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Tryb zaznaczenia (Q)" @@ -6414,10 +6686,6 @@ msgid "Add Empty" msgstr "Dodaj pusty" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "ZmieÅ„ pÄ™tle animacji" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "ZmieÅ„ FPS animacji" @@ -6748,6 +7016,11 @@ msgid "Erase bitmask." msgstr "Wyczyść maskÄ™ bitowÄ…." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Utwórz nowe wÄ™zÅ‚y." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Utwórz nowy wielokÄ…t." @@ -6943,6 +7216,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Ustaw jako domyÅ›lne dla '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Shader wizualny" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplikuj wÄ™zeÅ‚(y)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "WierzchoÅ‚ek" @@ -6958,6 +7254,16 @@ msgstr "ÅšwiatÅ‚o" msgid "VisualShader" msgstr "Shader wizualny" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Edytuj filtry" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Zmiany Shadera" + #: editor/project_export.cpp msgid "Runnable" msgstr "Uruchamiany" @@ -6971,8 +7277,17 @@ msgid "Delete preset '%s'?" msgstr "Usunąć predefiniowane '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Brakuje szablonów eksportu dla tej platformy lub sÄ… uszkodzone:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6983,6 +7298,10 @@ msgid "Exporting All" msgstr "Eksportowanie wszystkiego" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Brakuje szablonów eksportu dla tej platformy lub sÄ… uszkodzone:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Profile eksportu" @@ -7988,6 +8307,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "ZmieÅ„ na korzeÅ„ sceny" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "UsuÅ„ wÄ™zeÅ‚(y)?" @@ -8024,6 +8348,11 @@ msgid "Make Local" msgstr "Zrób lokalne" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "ZmieÅ„ na korzeÅ„ sceny" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Utwórz korzeÅ„:" @@ -8452,6 +8781,21 @@ msgid "Set From Tree" msgstr "Ustaw z drzewa" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Åagodne wyjÅ›cie" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Skróty" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "ZmieÅ„ zakotwiczenie" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Skróty" @@ -8658,6 +9002,11 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap duplikuj zaznaczenie" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Ustawienia GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Grid Map" @@ -8958,10 +9307,6 @@ msgid "Change Expression" msgstr "ZmieÅ„ wyrażenie" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Dodaj wÄ™zeÅ‚" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Usuwanie wÄ™złów VisualScript" @@ -9045,6 +9390,11 @@ msgid "Change Input Value" msgstr "ZmieÅ„ wartość wejÅ›ciowÄ…" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "ZmieÅ„ rozmiar CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Nie można skopiować wÄ™zÅ‚a funkcji." @@ -9926,6 +10276,9 @@ msgstr "Przypisanie do uniformu." msgid "Varyings can only be assigned in vertex function." msgstr "Varying może być przypisane tylko w funkcji wierzchoÅ‚ków." +#~ msgid "FPS" +#~ msgstr "Klatki na sekundÄ™" + #~ msgid "Warnings:" #~ msgstr "Ostrzeżenia:" @@ -10101,10 +10454,6 @@ msgstr "Varying może być przypisane tylko w funkcji wierzchoÅ‚ków." #~ msgid "Convert To Lowercase" #~ msgstr "MaÅ‚e litery" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "PrzyciÄ…gaj do siatki" - #~ msgid "Rotate 0 degrees" #~ msgstr "Obróć o 0 stopni" @@ -10600,9 +10949,6 @@ msgstr "Varying może być przypisane tylko w funkcji wierzchoÅ‚ków." #~ msgid "Added:" #~ msgstr "Dodane:" -#~ msgid "Removed:" -#~ msgstr "UsuniÄ™te:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Nie udaÅ‚o siÄ™ zapisać tekstury atlasu:" @@ -10866,9 +11212,6 @@ msgstr "Varying może być przypisane tylko w funkcji wierzchoÅ‚ków." #~ msgid "Error importing:" #~ msgstr "BÅ‚Ä…d importowania:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Tylko jeden plik jest wymagany dla dużych tekstur." - #~ msgid "Max Texture Size:" #~ msgstr "Maksymalny rozmiar tekstury:" diff --git a/editor/translations/pr.po b/editor/translations/pr.po index c52676597c..a48c2fac95 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -91,6 +91,16 @@ msgstr "Yar, Blow th' Selected Down!" msgid "Delete Selected Key(s)" msgstr "Yar, Blow th' Selected Down!" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Add Signal" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Discharge ye' Signal" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -125,6 +135,15 @@ msgid "Anim Change Call" msgstr "Change yer Anim Call" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -174,6 +193,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -199,6 +222,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -251,6 +278,18 @@ msgid "Delete Key(s)" msgstr "Yar, Blow th' Selected Down!" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -292,6 +331,16 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Change yer Anim Transition" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Paste yer Node" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -316,6 +365,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -324,10 +377,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp #, fuzzy msgid "Method not found in object: " msgstr "VariableGet be in davy jones locker! Not in th' script: " @@ -341,6 +406,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Paste yer Node" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -383,11 +453,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Paste yer Node" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -488,6 +553,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1291,6 +1368,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1845,6 +1928,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3453,12 +3544,47 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Discharge ye' Signal" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Add Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Yer functions:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Discharge ye' Function" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3498,6 +3624,29 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Add Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Discharge ye' Function" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Discharge ye' Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3506,6 +3655,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3523,6 +3676,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Change" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3533,11 +3691,53 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Add Node(s) From yer Tree" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Find ye Node Type" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Slit th' Node" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Yer functions:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Slit th' Node" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Change" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3553,6 +3753,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3782,6 +3987,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Forge yer Node!" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Add Function" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Add Node" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3810,6 +4030,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4620,6 +4852,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5782,6 +6018,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5892,10 +6136,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5940,7 +6180,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6032,6 +6272,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6040,6 +6286,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Slit th' Node" @@ -6319,10 +6569,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6662,6 +6908,11 @@ msgstr "Yar, Blow th' Selected Down!" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Yar, Blow th' Selected Down!" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Yar, Blow th' Selected Down!" @@ -6843,6 +7094,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Rename Variable" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6858,6 +7130,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Edit yer Variable:" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Change" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6871,7 +7153,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6884,6 +7175,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7871,6 +8166,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7905,6 +8204,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8328,6 +8631,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8539,6 +8854,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8846,10 +9165,6 @@ msgid "Change Expression" msgstr "Swap yer Expression" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Add Node" - -#: modules/visual_script/visual_script_editor.cpp #, fuzzy msgid "Remove VisualScript Nodes" msgstr "Discharge ye' Variable" @@ -8944,6 +9259,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 4282c467b8..9e9ead344e 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -38,7 +38,7 @@ # Pedro Pacheco <pedroxixipa@hotmail.com>, 2018, 2019. # Bruno Henrique <nimbusdroid@gmail.com>, 2018, 2019. # Luciano Scilletta <lucianoscilletta@gmail.com>, 2018. -# Julio Yagami <juliohenrique31501234@hotmail.com>, 2018. +# Julio Yagami <juliohenrique31501234@hotmail.com>, 2018, 2019. # Fernando Martinez <contact@fernandodev.com>, 2018. # Marcelo <mitissa@gmail.com>, 2018, 2019. # Walter Bolitto <wrcarval@live.com>, 2018, 2019. @@ -51,12 +51,14 @@ # Alan Valmorbida <alanvalmorbida@gmail.com>, 2019. # João Vitor Ferreira Cavalcante <jvfecav@gmail.com>, 2019. # Thiago Amendola <amendolathiago@gmail.com>, 2019. +# Raphael Nogueira Campos <raphaelncampos@gmail.com>, 2019. +# Dimenicius <vinicius.costa.92@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2019-02-14 02:10+0000\n" -"Last-Translator: Alan Valmorbida <alanvalmorbida@gmail.com>\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" +"Last-Translator: Julio Yagami <juliohenrique31501234@hotmail.com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" "Language: pt_BR\n" @@ -130,6 +132,16 @@ msgstr "Duplicar Chave(s) Selecionada(s)" msgid "Delete Selected Key(s)" msgstr "Excluir Chave(s) Selecionada(s)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Adicionar ponto" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Mover pontos" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Duplicar Chave na Anim" @@ -159,6 +171,16 @@ msgid "Anim Change Call" msgstr "Alterar Chamada da Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Alterar Repetição da Animação" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Alterar Repetição da Animação" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Trilha de Propriedade" @@ -208,6 +230,11 @@ msgid "Anim Clips:" msgstr "Clipes de Animação:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Alterar Valor do Vetor" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Ligar/desligar esta trilha." @@ -232,6 +259,11 @@ msgid "Time (s): " msgstr "Tempo (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Habilitar Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ContÃnuo" @@ -282,6 +314,21 @@ msgid "Delete Key(s)" msgstr "Deletar Chave(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Alterar Nome da Animação:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Modo de Interpolação" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Alterar Repetição da Animação" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Remover Trilha da Anim" @@ -323,6 +370,16 @@ msgid "Anim Insert Key" msgstr "Inserir Chave na Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Alterar FPS da Animação" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Reordenar Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" "As faixas de transformação aplicam-se apenas aos nós baseados no espaço." @@ -353,6 +410,11 @@ msgid "Not possible to add a new track without a root" msgstr "Não é possÃvel adicionar uma nova trilha sem uma raiz" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Adicionar Trilha" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Caminho da trilha é inválido,então não pode adicionar uma chave." @@ -361,11 +423,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Trilha não é do tipo Espacial,não pode inserir chave" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Trilha de transformação 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Adicionar Trilha" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "Caminho da trilha é inválido,então não pode adicionar uma chave de método." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Trilha de método de chamada" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Método não encontrado no objeto: " @@ -378,6 +455,10 @@ msgid "Clipboard is empty" msgstr "Ãrea de transferência vazia" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Colar Trilhas" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Alterar Escala das Chaves na Anim" @@ -421,10 +502,6 @@ msgid "Copy Tracks" msgstr "Copiar Trilhas" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Colar Trilhas" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Selecionar Escala" @@ -524,6 +601,19 @@ msgstr "Selecionar trilhas para copiar:" msgid "Copy" msgstr "Copiar" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Clipes de Ãudio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimensionar Vetor" @@ -593,9 +683,8 @@ msgid "Warnings" msgstr "Avisos" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Números de linha e coluna" +msgstr "Números de linha e coluna." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1154,9 +1243,8 @@ msgid "Add Bus" msgstr "Adicionar Canal" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Salvar Layout de Canais de Ãudio Como..." +msgstr "Adiciona um novo Canal de Ãudio a esse layout." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1334,6 +1422,12 @@ msgstr "Nenhum template para exportação foi encontrado no caminho esperado:" msgid "Packing" msgstr "Empacotando" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1910,6 +2004,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Salvar alterações em '%s' antes de fechar?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Falha ao carregar recurso." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Apenas um arquivo é requerido para textura grande." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Salvar Cena Como..." @@ -2434,9 +2538,8 @@ msgid "Save & Restart" msgstr "Salvar e Reiniciar" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "Gira quando a janela do editor atualiza!" +msgstr "Gira quando a janela do editor atualiza." #: editor/editor_node.cpp msgid "Update Always" @@ -3551,6 +3654,22 @@ msgstr "Carregar..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Mover pontos" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Alterar Tempo de Mistura" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Alterar Tempo de Mistura" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3558,6 +3677,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Adicionar Nó" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Adicionar Animação" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Remover Ponto do Caminho" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3600,6 +3740,31 @@ msgid "Triangle already exists" msgstr "Triângulo já existe" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Adicionar Variável" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Alterar Tempo de Mistura" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Alterar Tempo de Mistura" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Remover Ponto do Caminho" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Remover Variável" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D não pertence ao nó AnimationTree." @@ -3608,6 +3773,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Não existem triângulos, então nenhuma mistura pode acontecer." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Alternar Auto Carregamentos de Globais" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Crie triângulos conectando pontos." @@ -3625,6 +3795,11 @@ msgid "Blend:" msgstr "Misturar:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Alterações de Material" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editar Filtros" @@ -3634,12 +3809,56 @@ msgid "Output node can't be added to the blend tree." msgstr "Nós de saÃda não pode ser adicionado à árvore de mistura." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Adicionar Nó(s) a Partir da Ãrvore" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Modo Mover" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" "Incapaz de conectar, a porta pode estar em uso ou a conexão é inválida." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Conectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Desconectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Nova animação" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Excluir Nó(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Ligar/desligar esta trilha." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "FIltro de Idiomas Alterado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Nenhum reprodutor de animação foi definido, então não é possÃvel obter os " @@ -3661,6 +3880,12 @@ msgstr "" "possÃvel obter os nomes das trilhas." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nome do nó" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Adicionar nó..." @@ -3889,6 +4114,21 @@ msgid "Cross-Animation Blend Times" msgstr "Tempos de Mistura de Animação Cruzada" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Modo Mover" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Adicionar Tradução" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Adicionar Nó" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Fim" @@ -3902,7 +4142,7 @@ msgstr "Sincronizar" #: editor/plugins/animation_state_machine_editor.cpp msgid "At End" -msgstr "No final" +msgstr "No Fim" #: editor/plugins/animation_state_machine_editor.cpp msgid "Travel" @@ -3917,6 +4157,20 @@ msgid "No playback resource set at path: %s." msgstr "Sem recurso de playback definido no caminho: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Removido:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nó Transition" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4342,15 +4596,14 @@ msgstr "Mover CanvaItem" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Presets for the anchors and margins values of a Control node." msgstr "" +"Predefinições para os valores de âncoras e margens de um nó de controle." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "" "Children of containers have their anchors and margins values overridden by " "their parent." msgstr "" -"Filhos de contêineres tem suas posições e tamanhos sobrescritos pelos seus " -"pais." +"Filhos de contêineres tem sua âncora e margens sobrescritos pelos seus pais." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Anchors only" @@ -4738,6 +4991,10 @@ msgstr "Segure Shift para editar tangentes individualmente" msgid "Bake GI Probe" msgstr "Cozinhar Sonda GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Item %d" @@ -5265,6 +5522,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"Polygon2D tem vértices internos, portanto não pode mais ser editado no " +"Viewport." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5886,6 +6145,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Este esqueleto não tem ossos, crie alguns nós filhos Bone2D." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Faça Resto Pose (De Ossos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Faça Resto Pose (De Ossos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Esqueleto2D" @@ -5994,10 +6263,6 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Visão Superior." @@ -6042,7 +6307,8 @@ msgid "Rear" msgstr "Traseira" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Alinhar com Visão" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6134,6 +6400,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidade da Visão Livre" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Ver Rotação Bloqueada" @@ -6142,6 +6414,11 @@ msgid "XForm Dialog" msgstr "Diálogo XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Encaixar na grade" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Modo de Seleção (Q)" @@ -6357,9 +6634,8 @@ msgid "Post" msgstr "Pós" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Nameless gizmo" -msgstr "Gaveta sem nome" +msgstr "Coisa sem nome" #: editor/plugins/sprite_editor_plugin.cpp msgid "Sprite is empty!" @@ -6423,10 +6699,6 @@ msgid "Add Empty" msgstr "Adicionar Vazio" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Alterar Repetição da Animação" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Alterar FPS da Animação" @@ -6752,6 +7024,11 @@ msgid "Erase bitmask." msgstr "Apagar o bitmask." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Criar novos nós." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Criar um novo polÃgono." @@ -6928,6 +7205,29 @@ msgid "TileSet" msgstr "Conjunto de Telha" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Definir como Padrão para '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplicar Nó(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vértice" @@ -6943,6 +7243,16 @@ msgstr "Luz" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editar prioridade da telha" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Alterações de Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Executável" @@ -6956,10 +7266,17 @@ msgid "Delete preset '%s'?" msgstr "Excluir definição '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Modelos de exportação para esta plataforma não foram encontrados/estão " -"corrompidos:" #: editor/project_export.cpp msgid "Release" @@ -6970,6 +7287,12 @@ msgid "Exporting All" msgstr "Exportando tudo" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Modelos de exportação para esta plataforma não foram encontrados/estão " +"corrompidos:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Predefinições" @@ -7259,7 +7582,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" @@ -7272,13 +7594,12 @@ msgid "" "the 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 do Godot 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." +"Aviso: você não poderá mais abrir o projeto com versões anteriores do Godot." #: editor/project_manager.cpp msgid "" @@ -7992,7 +8313,6 @@ msgid "Duplicate Node(s)" msgstr "Duplicar Nó(s)" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Can't reparent nodes in inherited scenes, order of nodes can't change." msgstr "" "Não é possÃvel re-hierarquizar nós em cenas herdadas, a ordem dos nós não " @@ -8007,6 +8327,11 @@ msgid "Instantiated scenes can't become root" msgstr "Cenas instanciadas não podem se tornar raiz" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Fazer Raiz de Cena" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Excluir Nó(s)?" @@ -8043,6 +8368,11 @@ msgid "Make Local" msgstr "Tornar Local" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Fazer Raiz de Cena" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Criar nó raiz:" @@ -8471,6 +8801,21 @@ msgid "Set From Tree" msgstr "Definir a partir da árvore" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Suavizar final" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Atalhos" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Alterar Âncoras" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Atalhos" @@ -8677,6 +9022,10 @@ msgid "GridMap Duplicate Selection" msgstr "Duplicar Seleção do GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "Pintura GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Mapa de Grade" @@ -8977,10 +9326,6 @@ msgid "Change Expression" msgstr "Alterar Expressão" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Adicionar Nó" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Remover Nodes VisualScript" @@ -9065,6 +9410,11 @@ msgid "Change Input Value" msgstr "Alterar Valor da Entrada" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Redimensionar o CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Não é possÃvel copiar o nó de função." @@ -9252,9 +9602,10 @@ msgstr "OpenJDK jarsigner não configurado nas opções do Editor." #: platform/android/export/export.cpp msgid "Debug keystore not configured in the Editor Settings nor in the preset." msgstr "" +"Porta-chaves de depuração não configurado nas Configurações do Editor e nem " +"na predefinição." #: platform/android/export/export.cpp -#, fuzzy msgid "Invalid public key for APK expansion." msgstr "Chave pública inválida para expansão de APK." @@ -9267,9 +9618,8 @@ msgid "Identifier is missing." msgstr "Identificador está ausente." #: platform/iphone/export/export.cpp -#, fuzzy msgid "Identifier segments must be of non-zero length." -msgstr "O identificador deve ter comprimento diferente de zero." +msgstr "Os segmentos de identificador devem ter comprimento diferente de zero." #: platform/iphone/export/export.cpp msgid "The character '%s' is not allowed in Identifier." @@ -9301,7 +9651,6 @@ msgid "Invalid Identifier:" msgstr "O nome não é um identificador válido:" #: platform/iphone/export/export.cpp -#, fuzzy msgid "Required icon is not specified in the preset." msgstr "Ãcone necessário não especificado na predefinição." @@ -9346,7 +9695,6 @@ msgid "Invalid product GUID." msgstr "GUID de produto inválido." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid publisher GUID." msgstr "GUID do editor inválido." @@ -9355,37 +9703,32 @@ msgid "Invalid background color." msgstr "Cor de fundo inválida." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid Store Logo image dimensions (should be 50x50)." msgstr "Dimensões inválidas do logo da loja (deve ser 50x50)." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid square 44x44 logo image dimensions (should be 44x44)." msgstr "Dimensões inválidas do logo quadrado de 44x44 (deve ser 44x44)." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid square 71x71 logo image dimensions (should be 71x71)." msgstr "Dimensões inválidas do logo quadrado de 71x71 (deve ser 71x71)." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid square 150x150 logo image dimensions (should be 150x150)." msgstr "Dimensões inválidas do logo quadrado de 150x150 (deve ser 150x150)." #: platform/uwp/export/export.cpp -#, fuzzy msgid "Invalid square 310x310 logo image dimensions (should be 310x310)." msgstr "Dimensões inválidas do logo quadrado de 310x310 (deve ser 310x310)." #: platform/uwp/export/export.cpp msgid "Invalid wide 310x150 logo image dimensions (should be 310x150)." -msgstr "" +msgstr "Dimensões inválidas de logo retangular de 310x150 (deve ser 310x150)." #: platform/uwp/export/export.cpp msgid "Invalid splash screen image dimensions (should be 620x300)." -msgstr "" +msgstr "Dimensões inválidas da tela de abertura (deve ser 620x300)." #: scene/2d/animated_sprite.cpp msgid "" @@ -9503,6 +9846,9 @@ msgid "" "Use the CPUParticles2D node instead. You can use the \"Convert to " "CPUParticles\" option for this purpose." msgstr "" +"PartÃculas baseadas em GPU não são suportadas pelo driver de vÃdeo GLES2.\n" +"Use o nó CPUParticles2D como substituto. Você pode usar a opção \"Converter " +"para CPUParticles\" para este propósito." #: scene/2d/particles_2d.cpp scene/3d/particles.cpp msgid "" @@ -9699,6 +10045,9 @@ msgid "" "Use the CPUParticles node instead. You can use the \"Convert to CPUParticles" "\" option for this purpose." msgstr "" +"PartÃculas baseadas em GPU não são suportadas pelo driver de vÃdeo GLES2.\n" +"Use o nó CPUParticles como substituto. Você pode usar a opção \"Converter " +"para CPUParticles\" para este propósito." #: scene/3d/particles.cpp msgid "" @@ -9719,13 +10068,12 @@ msgid "PathFollow only works when set as a child of a Path node." msgstr "PathFollow só funciona quando definido como filho de um nó Path." #: scene/3d/path.cpp -#, fuzzy msgid "" "PathFollow ROTATION_ORIENTED requires \"Up Vector\" enabled in its parent " "Path's Curve resource." msgstr "" -"OrientedPathFollow requer \"Up Vector\" habilitado no recurso Curva do " -"Caminho pai." +"PathFollow ROTATION_ORIENTED requer \"Up Vector\" habilitado no recurso " +"Curva do Caminho pai." #: scene/3d/physics_body.cpp msgid "" @@ -9835,7 +10183,7 @@ msgstr "Este nó foi reprovado. Use AnimationTree em vez disso." #: scene/gui/color_picker.cpp msgid "Pick a color from the screen." -msgstr "" +msgstr "Escolha uma cor da tela." #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -9843,12 +10191,11 @@ msgstr "Modo Bruto" #: scene/gui/color_picker.cpp msgid "Switch between hexadecimal and code values." -msgstr "" +msgstr "Alterne entre valores haxadecimais e de código." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Adicionar cor atual como uma predefinição" +msgstr "Adicionar cor atual como uma predefinição." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9942,6 +10289,9 @@ msgstr "Atribuição à uniforme." msgid "Varyings can only be assigned in vertex function." msgstr "Variáveis só podem ser atribuÃdas na função de vértice." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Avisos:" @@ -10117,10 +10467,6 @@ msgstr "Variáveis só podem ser atribuÃdas na função de vértice." #~ msgid "Convert To Lowercase" #~ msgstr "Converter Para Minúsculo" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Encaixar na grade" - #~ msgid "Rotate 0 degrees" #~ msgstr "Rotacionar 0 degraus" @@ -10659,9 +11005,6 @@ msgstr "Variáveis só podem ser atribuÃdas na função de vértice." #~ msgid "Added:" #~ msgstr "Adicionado:" -#~ msgid "Removed:" -#~ msgstr "Removido:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Não foi possÃvel salvar Subtextura do Atlas:" @@ -10929,9 +11272,6 @@ msgstr "Variáveis só podem ser atribuÃdas na função de vértice." #~ msgid "Error importing:" #~ msgstr "Erro ao importar:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Apenas um arquivo é requerido para textura grande." - #~ msgid "Max Texture Size:" #~ msgstr "Tamanho Máximo de Textura:" @@ -11163,9 +11503,6 @@ msgstr "Variáveis só podem ser atribuÃdas na função de vértice." #~ msgid "Edit Groups" #~ msgstr "Editar Grupos" -#~ msgid "GridMap Paint" -#~ msgstr "Pintura GridMap" - #, fuzzy #~ msgid "Tiles" #~ msgstr " Arquivos" diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index ef090612ca..4a80776647 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -94,6 +94,16 @@ msgstr "Duplicar Chave(s) Selecionada(s)" msgid "Delete Selected Key(s)" msgstr "Apagar Chave(s) Selecionada(s)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Adicionar Ponto" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Mover Ponto" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Duplicar Chaves" @@ -123,6 +133,16 @@ msgid "Anim Change Call" msgstr "Anim Mudar Chamada" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Mudar Ciclo da Animação" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Mudar Ciclo da Animação" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Pista de Propriedades" @@ -172,6 +192,11 @@ msgid "Anim Clips:" msgstr "Clips Anim:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Mudar valor do Array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Alternar esta pista on/off." @@ -196,6 +221,11 @@ msgid "Time (s): " msgstr "Tempo (s): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Doppler Ativo" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ContÃnuo" @@ -246,6 +276,21 @@ msgid "Delete Key(s)" msgstr "Apagar Chave(s)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Mudar o Nome da Animação:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Modo de Interpolação" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Mudar Ciclo da Animação" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Remover Pista de Animação" @@ -289,6 +334,16 @@ msgid "Anim Insert Key" msgstr "Anim Inserir Chave" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Mudar FPS da Animação" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Reorganizar Carregamentos Automáticos" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Pistas de Transformação só se aplicam a nós de base Espacial." @@ -319,6 +374,11 @@ msgid "Not possible to add a new track without a root" msgstr "Não é possÃvel adicionar nova pista sem uma raÃz" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Adicionar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Caminho da pista é inválido, não se consegue adicionar uma chave." @@ -327,11 +387,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Pista não do tipo Spatial, não se consegue inserir chave" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Pista de Transformação 3D" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Adicionar Pista" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" "Caminho da pista é inválido, não se consegue adicionar uma chave método." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Chamar Pista Método" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Método não encontrado no objeto: " @@ -344,6 +419,10 @@ msgid "Clipboard is empty" msgstr "Ãrea de Transferência está vazia" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Colar Pistas" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Escalar Chaves" @@ -387,10 +466,6 @@ msgid "Copy Tracks" msgstr "Copiar Pistas" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Colar Pistas" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Escalar Selecção" @@ -490,6 +565,19 @@ msgstr "Selecionar pistas a copiar:" msgid "Copy" msgstr "Copiar" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Clips Ãudio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Redimensionar Array" @@ -1302,6 +1390,12 @@ msgstr "Nenhum modelo de exportação encontrado no caminho previsto:" msgid "Packing" msgstr "Empacotamento" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1881,6 +1975,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Guardar alterações a '%s' antes de fechar?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Falha ao carregar recurso." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Guardar Cena como..." @@ -3514,12 +3617,49 @@ msgstr "Carregar..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Mover Ponto" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Mudar tempo de Mistura" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Mudar tempo de Mistura" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "Este tipo de nó não pode ser usado. Apenas nós raiz são permitidos." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Adicionar Nó" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Adicionar Animação" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Remover Ponto de Caminho" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3562,6 +3702,31 @@ msgid "Triangle already exists" msgstr "Já existe triângulo" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Adicionar Variável" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Mudar tempo de Mistura" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Mudar tempo de Mistura" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Remover Ponto de Caminho" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Remover Variável" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D não pertence a um nó AnimationTree." @@ -3570,6 +3735,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Não existem triângulos, nenhuma mistura pode ocorrer." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Alternar Globals de carregamento automático" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Criar triângulos ligando pontos." @@ -3587,6 +3757,11 @@ msgid "Blend:" msgstr "Mistura:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Mudanças de Material" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editar filtros" @@ -3596,12 +3771,56 @@ msgid "Output node can't be added to the blend tree." msgstr "SaÃda do nó não pode ser adicionada à árvore de mistura." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Adicionar Nó da Ãrvore" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Modo mover" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" "Incapaz de conectar, porta pode estar em uso ou conexão pode ser inválida." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Ligado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Desconectado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animação" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Apagar Nó(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Alternar esta pista on/off." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Filtro de localização alterado" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Reprodutor de animação não definido, sendo incapaz de recolher nome das " @@ -3622,6 +3841,12 @@ msgstr "" "de recolher nome das faixas." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nome do Nó" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Adicionar Nó.." @@ -3848,6 +4073,21 @@ msgid "Cross-Animation Blend Times" msgstr "Tempos de Mistura de Animação cruzada" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Modo mover" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Adicionar tradução" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Adicionar Nó" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Fim" @@ -3876,6 +4116,20 @@ msgid "No playback resource set at path: %s." msgstr "Nenhum recurso de playback definido no caminho: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Remover" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nó Transition" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4693,6 +4947,10 @@ msgstr "Pressione Shift para editar tangentes individualmente" msgid "Bake GI Probe" msgstr "Consolidar Sonda GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Item %d" @@ -5838,6 +6096,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "Este esqueleto não tem ossos, crie alguns nós Bone2D filhos." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Criar Pose de Descanso (a partir de Ossos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Criar Pose de Descanso (a partir de Ossos)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "Esqueleto2D" @@ -5946,10 +6214,6 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Vista de topo." @@ -5994,7 +6258,8 @@ msgid "Rear" msgstr "Trás" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Alinhar com a vista" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6086,6 +6351,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidade Freelook" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Rotação da Vista Bloqueada" @@ -6094,6 +6365,11 @@ msgid "XForm Dialog" msgstr "Diálogo XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Ajustar ao Fundo" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Modo seleção (Q)" @@ -6374,10 +6650,6 @@ msgid "Add Empty" msgstr "Adicionar vazio" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Mudar Ciclo da Animação" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Mudar FPS da Animação" @@ -6706,6 +6978,11 @@ msgid "Erase bitmask." msgstr "Apagar bitmask." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Criar novos nós." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Criar um novo polÃgono." @@ -6883,6 +7160,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Definir como Padrão para '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VIsualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplicar Nó(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Vértice" @@ -6898,6 +7198,16 @@ msgstr "Luz" msgid "VisualShader" msgstr "VIsualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editar Prioridade de Tile" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Alterações do Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "Executável" @@ -6911,9 +7221,17 @@ msgid "Delete preset '%s'?" msgstr "Apagar predefinição '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Modelos de exportação para esta plataforma estão ausentes/corrompidos :" #: editor/project_export.cpp msgid "Release" @@ -6924,6 +7242,11 @@ msgid "Exporting All" msgstr "A Exportar Tudo" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Modelos de exportação para esta plataforma estão ausentes/corrompidos :" + +#: editor/project_export.cpp msgid "Presets" msgstr "Predefinições" @@ -7957,6 +8280,11 @@ msgid "Instantiated scenes can't become root" msgstr "Cenas instantâneas não se podem tornar root" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Tornar Nó Raiz" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Apagar Nó(s)?" @@ -7993,6 +8321,11 @@ msgid "Make Local" msgstr "Tornar Local" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Tornar Nó Raiz" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Criar Nó Raiz:" @@ -8421,6 +8754,21 @@ msgid "Set From Tree" msgstr "Definir a partir da árvore" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Ease out" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Atalhos" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Mudar âncoras" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Atalhos" @@ -8627,6 +8975,11 @@ msgid "GridMap Duplicate Selection" msgstr "Seleção duplicada de GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Configurações do GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Mapa de grelha" @@ -8927,10 +9280,6 @@ msgid "Change Expression" msgstr "Mudar Expressão" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Adicionar Nó" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Remover Nós VisualScript" @@ -9015,6 +9364,11 @@ msgid "Change Input Value" msgstr "Mudar valor de entrada" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Redimensionar CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "ImpossÃvel copiar o Nó Função." @@ -9886,6 +10240,9 @@ msgstr "Atribuição a uniforme." msgid "Varyings can only be assigned in vertex function." msgstr "Variações só podem ser atribuÃdas na função vértice." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "Avisos:" @@ -10053,9 +10410,6 @@ msgstr "Variações só podem ser atribuÃdas na função vértice." #~ msgid "Convert To Lowercase" #~ msgstr "Converter em minúsculas" -#~ msgid "Snap To Floor" -#~ msgstr "Ajustar ao Fundo" - #~ msgid "Rotate 0 degrees" #~ msgstr "Rodar 0 graus" diff --git a/editor/translations/ro.po b/editor/translations/ro.po index c19c594ac6..7e471609e7 100644 --- a/editor/translations/ro.po +++ b/editor/translations/ro.po @@ -87,6 +87,16 @@ msgstr "DuplicaÈ›i Cheile Selectate" msgid "Delete Selected Key(s)" msgstr "ÅžtergeÈ›i Cheile Selectate" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Adaugă punct" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Deplasare punct" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Clonare Chei" @@ -116,6 +126,16 @@ msgid "Anim Change Call" msgstr "Anim Schimbare apelare" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Schimbă Numele AnimaÈ›iei:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -171,6 +191,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "SchimbaÈ›i Valoarea Array-ului" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Comutează modul fără distrageri." @@ -198,6 +223,11 @@ msgid "Time (s): " msgstr "Timp X-Decolorare (s):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Activare mod Doppler" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Continuu" @@ -251,6 +281,21 @@ msgid "Delete Key(s)" msgstr "Anim ȘtergeÈ›i Cheile" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Schimbă Numele AnimaÈ›iei:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Nod de AnimaÈ›ie" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "SchimbaÈ›i Bucla Anim" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Elimină Pista Anim" @@ -292,6 +337,16 @@ msgid "Anim Insert Key" msgstr "Anim InseraÈ›i Cheie" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Schimbă Numele AnimaÈ›iei:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "RearanjaÈ›i Autoload-urile" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -316,6 +371,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Anim AdăugaÈ›i Pistă" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -324,10 +384,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Transformare hartă UV" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim AdăugaÈ›i Pistă" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Anim InseraÈ›i Pistă È™i Cheie" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -341,6 +416,11 @@ msgid "Clipboard is empty" msgstr "Clip-board de resurse gol !" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "LipiÅ£i Parametrii" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim ScalaÈ›i Cheile" @@ -387,11 +467,6 @@ msgid "Copy Tracks" msgstr "Copie Parametrii" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "LipiÅ£i Parametrii" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ScalaÈ›i SelecÈ›ia" @@ -494,6 +569,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Anim AdăugaÈ›i Pistă" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "RedimensionaÈ›i Array-ul" @@ -1314,6 +1402,12 @@ msgstr "" msgid "Packing" msgstr "Ambalare" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1910,6 +2004,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Salvează schimbările la ’%s’ înainte de ieÈ™ire?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "ÃŽncărcarea resursei a eÈ™uat." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Salvează scena ca..." @@ -3600,12 +3703,49 @@ msgstr "ÃŽncărcaÈ›i" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Deplasare punct" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Schimbă Timpul Amestecului" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Schimbă Timpul Amestecului" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Adaugă punct" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Adaugă AnimaÈ›ia" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Ștergere punct cale" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3648,6 +3788,30 @@ msgid "Triangle already exists" msgstr "EROARE: Numele animaÈ›iei există deja!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Anim AdăugaÈ›i Pistă" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Schimbă Timpul Amestecului" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Schimbă Timpul Amestecului" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Ștergere punct cale" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3656,6 +3820,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "ComutaÈ›i Globale AutoLoad" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3673,6 +3842,11 @@ msgid "Blend:" msgstr "Amestec:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Modificări ale Actualizării" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Editează Filtrele" @@ -3682,11 +3856,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Mod Mutare" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Conectat" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Deconectat" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "AnimaÈ›ie" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Creează Nod" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Comutează modul fără distrageri." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "SchimbaÈ›i Lung Anim" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3702,6 +3919,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Nume Nod:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3936,6 +4159,21 @@ msgid "Cross-Animation Blend Times" msgstr "Timpi de Amestecare Cross-AnimaÈ›ie" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Mod Mutare" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "TranziÈ›ie" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3965,6 +4203,20 @@ msgid "No playback resource set at path: %s." msgstr "Nu în calea de resurse." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "ȘtergeÈ›i" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Nod TranziÈ›ie" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4801,6 +5053,10 @@ msgstr "Èšine apăsat Shift pentru a edita individual tangentele" msgid "Bake GI Probe" msgstr "Procesează Sonda GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Obiect %d" @@ -5988,6 +6244,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Creează Puncte de Emisie Din Mesh" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton (Unicat)" @@ -6099,10 +6364,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6147,7 +6408,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6241,6 +6502,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Curăță RotaÈ›ia Cursorului" @@ -6250,6 +6517,11 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Snap pe grilă" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6530,10 +6802,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6874,6 +7142,11 @@ msgstr "RMB: Șterge Punctul." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "CreaÈ›i %s Nou" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Creează un nou poligon de la zero." @@ -7055,6 +7328,28 @@ msgid "TileSet" msgstr "Set_de_Plăci..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Setează ca Implicit pentru '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Anim Clonare Chei" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7070,6 +7365,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Editează Filtrele" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7083,7 +7387,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7096,6 +7409,10 @@ msgid "Exporting All" msgstr "Exportare" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8096,6 +8413,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Salvează Scena" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8132,6 +8454,11 @@ msgstr "Creează Oase" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Salvează Scena" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Creează Nod" @@ -8555,6 +8882,20 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Facilitare din" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Modifică Ancorele" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8763,6 +9104,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9058,10 +9403,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9144,6 +9485,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Editează ObiectulPânză" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10029,10 +10375,6 @@ msgstr "" #~ msgid "Search in files" #~ msgstr "Căutare Clase" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Snap pe grilă" - #~ msgid "Bake!" #~ msgstr "Coacere!" @@ -10087,12 +10429,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Afară-ÃŽnăuntru" -#~ msgid "Change Anim Len" -#~ msgstr "SchimbaÈ›i Lung Anim" - -#~ msgid "Change Anim Loop" -#~ msgstr "SchimbaÈ›i Bucla Anim" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Anim CreaÈ›i Cheie Valoare Typed" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 2bc51dcbfb..0964776b0f 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -36,12 +36,13 @@ # Alexander Danilov <modos189@protonmail.com>, 2019. # Sergey Nakhov <true.stalin.exe@gmail.com>, 2019. # Bumerang <it.bumerang@gmail.com>, 2019. +# Viorel <vrila.noroc@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-13 16:10+0000\n" -"Last-Translator: Bumerang <it.bumerang@gmail.com>\n" +"PO-Revision-Date: 2019-02-23 17:17+0000\n" +"Last-Translator: Viorel <vrila.noroc@gmail.com>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" "Language: ru\n" @@ -117,6 +118,16 @@ msgstr "Дублировать выделенные ключ(и)" msgid "Delete Selected Key(s)" msgstr "Удалить выделенные ключ(и)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Добавить точку" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Передвинуть Точку" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Дублировать ключи" @@ -146,6 +157,16 @@ msgid "Anim Change Call" msgstr "Изменить вызов анимации" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Изменить цикличноÑÑ‚ÑŒ анимации" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Изменить цикличноÑÑ‚ÑŒ анимации" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Трек Параметра" @@ -195,6 +216,11 @@ msgid "Anim Clips:" msgstr "Дорожки Ðнимации:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Изменить значение маÑÑива" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Переключить Ñтот трек вкл/выкл." @@ -220,6 +246,11 @@ msgid "Time (s): " msgstr "Ð’Ñ€ÐµÐ¼Ñ (Ñек.): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "ДоплеровÑкий режим" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ÐепрерывнаÑ" @@ -270,6 +301,21 @@ msgid "Delete Key(s)" msgstr "Удалить ключ(ключи)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Изменить Ð¸Ð¼Ñ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ð¸:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Режим Перехода" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Изменить цикличноÑÑ‚ÑŒ анимации" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Удалить дорожку" @@ -311,6 +357,16 @@ msgid "Anim Insert Key" msgstr "Ð’Ñтавить ключ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Изменить FPS анимации" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "ПереÑтановка автозагрузок" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Трек транÑформации применÑетÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ к оÑнованным на Spatial узлам." @@ -339,6 +395,11 @@ msgid "Not possible to add a new track without a root" msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ новый трек без корневого узла" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Добавить новый Трек" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "Путь трека некорректен, потому Ð½ÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ключ." @@ -347,10 +408,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Трек не имеет тип Spatial, Ð½ÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ключ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Трек 3D ПреобразованиÑ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Добавить новый Трек" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "Путь трека некорректен, потому Ð½ÐµÐ»ÑŒÐ·Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚ÑŒ ключ метода." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Трек Вызова Метода" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Ð’ объекте нет такого метода: " @@ -363,6 +439,10 @@ msgid "Clipboard is empty" msgstr "Буфер обмена пуÑÑ‚" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Ð’Ñтавить Треки" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "МаÑштабировать ключи" @@ -407,10 +487,6 @@ msgid "Copy Tracks" msgstr "Копировать Треки" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Ð’Ñтавить Треки" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "МаÑштабировать выбранное" @@ -510,6 +586,19 @@ msgstr "Выбрать треки Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ:" msgid "Copy" msgstr "Копировать" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Ðудио Дорожки:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Изменить размер МаÑÑива" @@ -579,8 +668,9 @@ msgid "Warnings" msgstr "ПредупреждениÑ" #: editor/code_editor.cpp +#, fuzzy msgid "Line and column numbers." -msgstr "" +msgstr "Ðомер линии и Ñтолбца" #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1321,6 +1411,12 @@ msgstr "Шаблоны ÑкÑпорта не найдены по ожидаемРmsgid "Packing" msgstr "Упаковывание" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1898,6 +1994,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Сохранить Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð² «%s» перед закрытием?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Ðе удалоÑÑŒ загрузить реÑурÑ." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Только один файл необходим Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ текÑтуры." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Сохранить Ñцену как..." @@ -3534,6 +3640,22 @@ msgstr "Загрузка..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Передвинуть Точку" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3541,6 +3663,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Добавить узел" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Добавить анимацию" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Удалить точку пути" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3583,6 +3726,31 @@ msgid "Triangle already exists" msgstr "Треугольник уже ÑущеÑтвует" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Добавить переменную" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Удалить точку пути" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Удалить переменную" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D не принадлежит Узлу AnimationTree." @@ -3591,6 +3759,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Ðевозможно Ñмешивать, поÑкольку отÑутÑтвуют треугольники." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Переключить автозагрузку глобальных Ñкриптов" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Создать треугольник Ñоединением точек." @@ -3608,6 +3781,11 @@ msgid "Blend:" msgstr "Смешивание:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»Ð°" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Редактировать фильтры" @@ -3617,12 +3795,56 @@ msgid "Output node can't be added to the blend tree." msgstr "Узел вывода не может быть добавлен в дерево ÑмешиваниÑ." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Добавить узел(узлы) из дерева" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Режим перемещениÑ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" "Ðевозможно подключитьÑÑ, возможно порт уже иÑпользуетÑÑ Ð¸Ð»Ð¸ недейÑтвительный." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Подключен" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Отключен" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "ÐнимациÑ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Удалить узел(узлы)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Переключить Ñтот трек вкл/выкл." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Изменен фильтр Ñзыков" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "ÐÐ½Ð¸Ð¼Ð°Ñ†Ð¸Ñ Ð¸Ð³Ñ€Ð¾ÐºÐ° не задана, Ð½ÐµÐ»ÑŒÐ·Ñ Ð½Ð°Ð¹Ñ‚Ð¸ отÑлеживаемые имена." @@ -3640,6 +3862,12 @@ msgstr "" "удаетÑÑ Ð¿Ð¾Ð»ÑƒÑ‡Ð¸Ñ‚ÑŒ отÑлеживаемые имена." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð°" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Добавить узел..." @@ -3868,6 +4096,21 @@ msgid "Cross-Animation Blend Times" msgstr "Межанимационный инÑтрумент ÑмешиваниÑ" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Режим перемещениÑ" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Добавить перевод" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Добавить узел" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Конец" @@ -3896,6 +4139,20 @@ msgid "No playback resource set at path: %s." msgstr "Ð’ пути нет реÑурÑов воÑпроизведениÑ: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Удалено:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Transition узел" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4716,6 +4973,10 @@ msgstr "Удерживайте Shift, чтобы изменить каÑател msgid "Bake GI Probe" msgstr "Запечь GI пробу" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Ðлемент %d" @@ -5860,6 +6121,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "У Ñтого Ñкелета нет коÑтей, Ñоздайте дочерние Bone2D узлы." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Сделать позу Ð¿Ð¾ÐºÐ¾Ñ (из коÑтей)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Сделать позу Ð¿Ð¾ÐºÐ¾Ñ (из коÑтей)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "2D Ñкелет" @@ -5968,10 +6239,6 @@ msgid "Vertices" msgstr "Вершины" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Вид Ñверху." @@ -6016,7 +6283,8 @@ msgid "Rear" msgstr "Зад" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "СовмеÑтить Ñ Ð²Ð¸Ð´Ð¾Ð¼" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6108,6 +6376,12 @@ msgid "Freelook Speed Modifier" msgstr "Обзор модификатор ÑкороÑти" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "Блокировать вращение камеры" @@ -6116,6 +6390,11 @@ msgid "XForm Dialog" msgstr "XForm диалоговое окно" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "ПривÑзать к полу" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Режим Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ (Q)" @@ -6397,10 +6676,6 @@ msgid "Add Empty" msgstr "Добавить пуÑтоту" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Изменить цикличноÑÑ‚ÑŒ анимации" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Изменить FPS анимации" @@ -6729,6 +7004,11 @@ msgid "Erase bitmask." msgstr "Стереть битовую маÑку." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Создать новый узел." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Создать новый полигон." @@ -6906,6 +7186,29 @@ msgid "TileSet" msgstr "TileSet" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "УÑтановить по умолчанию Ð´Ð»Ñ '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Дублировать узел(узлы)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Вершины" @@ -6921,6 +7224,16 @@ msgstr "Свет" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Редактировать приоритет тайла" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑˆÐµÐ¹Ð´ÐµÑ€Ð¾Ð²" + #: editor/project_export.cpp msgid "Runnable" msgstr "Ðктивный" @@ -6934,8 +7247,17 @@ msgid "Delete preset '%s'?" msgstr "Удалить '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Шаблоны ÑкÑпорта Ð´Ð»Ñ Ñтой платформы отÑутÑтвуют/повреждены:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6946,6 +7268,10 @@ msgid "Exporting All" msgstr "ÐкÑпорт вÑех" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Шаблоны ÑкÑпорта Ð´Ð»Ñ Ñтой платформы отÑутÑтвуют/повреждены:" + +#: editor/project_export.cpp msgid "Presets" msgstr "ПредуÑтановки" @@ -7971,6 +8297,11 @@ msgid "Instantiated scenes can't become root" msgstr "Мгновенные Ñцены не могут быть корневыми" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Создать корневой узел Ñцены" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Удалить узел(узлы)?" @@ -8007,6 +8338,11 @@ msgid "Make Local" msgstr "Сделать локальным" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Создать корневой узел Ñцены" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Создать корневой узел:" @@ -8438,6 +8774,21 @@ msgid "Set From Tree" msgstr "УÑтановить из дерева" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Переход ИЗ" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "ГорÑчие клавиши" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Изменить привÑзку" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "ГорÑчие клавиши" @@ -8643,6 +8994,10 @@ msgid "GridMap Duplicate Selection" msgstr "Дублировать выделенную Ñетку" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "РиÑование Ñетки" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Ð¡ÐµÑ‚Ð¾Ñ‡Ð½Ð°Ñ ÐºÐ°Ñ€Ñ‚Ð°" @@ -8943,10 +9298,6 @@ msgid "Change Expression" msgstr "Изменить выражение" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Добавить узел" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Удалить узлы VisualScript" @@ -9031,6 +9382,11 @@ msgid "Change Input Value" msgstr "Изменить входное значение" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Изменить размер CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Ðе удаётÑÑ Ñкопировать узел функцию." @@ -9897,6 +10253,9 @@ msgstr "Ðазначить форму" msgid "Varyings can only be assigned in vertex function." msgstr "Переменные могут быть назначены только в функции вершин." +#~ msgid "FPS" +#~ msgstr "FPS" + #~ msgid "Warnings:" #~ msgstr "ПредупреждениÑ:" @@ -10068,9 +10427,6 @@ msgstr "Переменные могут быть назначены только #~ msgid "Convert To Lowercase" #~ msgstr "Конвертировать в нижний региÑÑ‚Ñ€" -#~ msgid "Snap To Floor" -#~ msgstr "ПривÑзать к полу" - #~ msgid "Rotate 0 degrees" #~ msgstr "Поворот на 0 градуÑов" @@ -10603,9 +10959,6 @@ msgstr "Переменные могут быть назначены только #~ msgid "Added:" #~ msgstr "Добавлено:" -#~ msgid "Removed:" -#~ msgstr "Удалено:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Ðевозможно Ñохранить текÑтуру атлаÑа:" @@ -10874,9 +11227,6 @@ msgstr "Переменные могут быть назначены только #~ msgid "Error importing:" #~ msgstr "Ошибка импортированиÑ:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Только один файл необходим Ð´Ð»Ñ Ð±Ð¾Ð»ÑŒÑˆÐ¾Ð¹ текÑтуры." - #~ msgid "Max Texture Size:" #~ msgstr "МакÑимальный размер текÑтуры:" @@ -11106,9 +11456,6 @@ msgstr "Переменные могут быть назначены только #~ msgid "Edit Groups" #~ msgstr "Редактировать группы" -#~ msgid "GridMap Paint" -#~ msgstr "РиÑование Ñетки" - #~ msgid "Tiles" #~ msgstr "Тайлы" diff --git a/editor/translations/si.po b/editor/translations/si.po index edceca5c8b..d792087871 100644 --- a/editor/translations/si.po +++ b/editor/translations/si.po @@ -82,6 +82,14 @@ msgstr "à¶à·à¶»à·à¶œà¶à·Š යà¶à·”රු පිටපà¶à·Š කරන්න msgid "Delete Selected Key(s)" msgstr "à¶à·à¶»à·à¶œà¶à·Š යà¶à·”රු මක෠දමන්න" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim යà¶à·”රු පිටපà¶à·Š කරන්න" @@ -111,6 +119,16 @@ msgid "Anim Change Call" msgstr "Anim කà·à¶¯à·€à·“ම් වෙනස් කරන්න" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "සජීවීකරණ පුනරà·à·€à¶»à·Šà¶®à¶±à¶º" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "ලක්ෂණය ලුහුබදින්න" @@ -160,6 +178,10 @@ msgid "Anim Clips:" msgstr "Anim පසුරු:" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "ලුහුබදින්න෠සක්â€à¶»à·’ය/අක්â€à¶»à·’ය." @@ -184,6 +206,10 @@ msgid "Time (s): " msgstr "කà·à¶½à¶º (à¶à¶à·Š): " #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "අඛණ්ඩව" @@ -234,6 +260,20 @@ msgid "Delete Key(s)" msgstr "යà¶à·”රු මක෠දමන්න" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "නිවේà·à¶± මà·à¶¯à·’ලිය" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "සජීවීකරණ පුනරà·à·€à¶»à·Šà¶®à¶±à¶º" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Anim ලුහුබදින්න෠ඉවà¶à·Š කරන්න" @@ -275,6 +315,15 @@ msgid "Anim Insert Key" msgstr "Anim යà¶à·”රක් ඇà¶à·”ලà¶à·Š කරන්න" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "සජීවීකරණ පුනරà·à·€à¶»à·Šà¶®à¶±à¶º" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Spatial පà·à¶¯à¶š පුරුක් සදහ෠පමණක් රූපà·à¶±à·Šà¶à¶» ලුහුබදින්නන් එක් කළ à·„à·à¶š." @@ -303,6 +352,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "ලුහුබදින්නෙක් එක් කරන්න" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -311,10 +365,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3D රූපà·à¶±à·Šà¶à¶»à¶«à¶º ලුහුබදින්න" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "ලුහුබදින්නෙක් එක් කරන්න" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "ඇමà¶à·“ම් ක්â€à¶»à¶¸à¶º ලුහුබදින්න" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -327,6 +396,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -369,10 +442,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -472,6 +541,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "à·à·Šâ€à¶»à·€à·Šâ€à¶º පසුරු:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1264,6 +1346,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1804,6 +1892,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3379,12 +3475,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "සජීවීකරණ පුනරà·à·€à¶»à·Šà¶®à¶±à¶º" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3424,6 +3552,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "ලුහුබදින්නෙක් එක් කරන්න" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3432,6 +3581,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3449,6 +3602,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3458,11 +3615,50 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "සජීවීකරණ පුනරà·à·€à¶»à·Šà¶®à¶±à¶º" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "යà¶à·”රු මක෠දමන්න" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "ලුහුබදින්න෠සක්â€à¶»à·’ය/අක්â€à¶»à·’ය." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3478,6 +3674,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3703,6 +3904,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Anim සංක්රමණය වෙනස් කරන්න" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3731,6 +3946,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4529,6 +4756,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5667,6 +5898,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5775,10 +6014,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5823,7 +6058,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5915,6 +6150,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5923,6 +6164,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6199,10 +6444,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6531,6 +6772,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6695,6 +6940,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "යà¶à·”රු පිටපà¶à·Š කරන්න" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6710,6 +6976,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6723,7 +6997,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6735,6 +7018,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7711,6 +7998,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7745,6 +8036,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8157,6 +8452,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8361,6 +8668,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8655,10 +8966,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8739,6 +9046,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index afe61af6ce..af5966a37d 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -85,6 +85,16 @@ msgstr "DuplikovaÅ¥ kľúÄ(e)" msgid "Delete Selected Key(s)" msgstr "ZmazaÅ¥ kľúÄ(e)" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Signály:" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "VÅ¡etky vybrané" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -115,6 +125,15 @@ msgid "Anim Change Call" msgstr "Animácia ZmeniÅ¥ Hovor" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -164,6 +183,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -189,6 +212,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Priebežný" @@ -241,6 +268,18 @@ msgid "Delete Key(s)" msgstr "VÅ¡etky vybrané" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -282,6 +321,16 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Animácia zmeniÅ¥ prechod" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "VložiÅ¥" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -306,6 +355,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -314,10 +367,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -330,6 +395,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "VložiÅ¥" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -372,11 +442,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "VložiÅ¥" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ZmeniÅ¥ veľkosÅ¥ výberu" @@ -479,6 +544,18 @@ msgstr "" msgid "Copy" msgstr "KopÃrovaÅ¥" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1279,6 +1356,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1840,6 +1923,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3446,12 +3537,47 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "VÅ¡etky vybrané" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Signály:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Popis:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "VÅ¡etky vybrané" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3491,6 +3617,28 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Signály:" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "VÅ¡etky vybrané" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3499,6 +3647,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3516,6 +3668,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3526,11 +3682,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Popis:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "VÅ¡etky vybrané" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3546,6 +3740,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3776,6 +3975,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "VložiÅ¥" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Prechody" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3804,6 +4018,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Prechody" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4617,6 +4844,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5779,6 +6010,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5887,10 +6126,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5935,8 +6170,9 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr "VÅ¡etky vybrané" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." @@ -6028,6 +6264,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6036,6 +6278,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6316,10 +6562,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6657,6 +6899,11 @@ msgstr "VÅ¡etky vybrané" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "VytvoriÅ¥ adresár" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "VytvoriÅ¥ adresár" @@ -6839,6 +7086,27 @@ msgid "TileSet" msgstr "Súbor:" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "DuplikovaÅ¥ výber" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6854,6 +7122,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Súbor:" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6867,7 +7144,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6879,6 +7165,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7869,6 +8159,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7903,6 +8197,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "VytvoriÅ¥ adresár" @@ -8328,6 +8626,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "VÅ¡etky vybrané" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8536,6 +8847,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8836,10 +9151,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8921,6 +9232,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 1974908006..3af3c9d835 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -90,6 +90,16 @@ msgstr "Podvoji Izbran/e KljuÄ/e" msgid "Delete Selected Key(s)" msgstr "IzbriÅ¡i Izbran/e KljuÄ/e" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Dodaj toÄko" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Odstrani toÄko" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Animiraj Podvojene kljuÄe" @@ -119,6 +129,16 @@ msgid "Anim Change Call" msgstr "Animacija Spremeni klic" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Spremeni Ime Animacije:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -174,6 +194,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Spremeni Vrednost Niza" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Preklop naÄin pisanja brez motenj." @@ -201,6 +226,10 @@ msgid "Time (s): " msgstr "ÄŒas X-Bledenja (s):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Neprekinjeno" @@ -254,6 +283,21 @@ msgid "Delete Key(s)" msgstr "Animacija IzbriÅ¡i kljuÄe" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Spremeni Ime Animacije:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animacijski Gradnik" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Spremeni Zanko Animacije" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Odstrani animacijsko sled" @@ -295,6 +339,16 @@ msgid "Anim Insert Key" msgstr "V Animacijo Vstavi KljuÄ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Spremeni Ime Animacije:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Preuredi SamodejnoNalaganje" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -319,6 +373,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Animacija Dodaj sled" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -327,11 +386,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Preoblikovanje" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Animacija Dodaj sled" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "V Animacijo Vstavi Sled & KljuÄ" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "VariableGet ni najden v skripti: " @@ -344,6 +418,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Prilepi Parametre" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Spremeni Obseg KljuÄev" @@ -390,11 +469,6 @@ msgid "Copy Tracks" msgstr "Kopiraj Parametre" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Prilepi Parametre" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "PoveÄaj izbiro" @@ -497,6 +571,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Animacija Dodaj sled" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "PoveÄaj Niz" @@ -1312,6 +1399,12 @@ msgstr "" msgid "Packing" msgstr "Pakiranje" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1902,6 +1995,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Shranim spremembe v '%s' pred zapiranjem?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Napaka pri nalaganju vira." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Shrani Sceno Kot..." @@ -3586,12 +3688,49 @@ msgstr "Naloži" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Odstrani toÄko" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Spremeni MeÅ¡alni ÄŒas" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Spremeni MeÅ¡alni ÄŒas" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Dodaj vozliÅ¡Äe" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Dodaj Animacijo" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Odstrani Poligon in ToÄko" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3633,6 +3772,31 @@ msgid "Triangle already exists" msgstr "NAPAKA: Animacija s tem imenom že obstaja!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Dodaj Spremenljivko" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Spremeni MeÅ¡alni ÄŒas" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Spremeni MeÅ¡alni ÄŒas" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Odstrani Poligon in ToÄko" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Odstrani Spremenljivko" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3641,6 +3805,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Preklopi na Globalno SamodejnoNalaganje" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3658,6 +3827,11 @@ msgid "Blend:" msgstr "ZmeÅ¡aj:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Spremebe v Shader" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Uredi Filtre" @@ -3667,11 +3841,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Dodaj Gradnik(e) iz Drevesa" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "NaÄin Premika" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Povezano" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Nepovezano" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animacija" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Izberi Gradnik" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Preklop naÄin pisanja brez motenj." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Spremeni Dolžino Animacije" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3687,6 +3905,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Ime Gradnika:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3922,6 +4146,21 @@ msgid "Cross-Animation Blend Times" msgstr "Navzkrižna Animacija ÄŒasa MeÅ¡anice" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "NaÄin Premika" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Prehod" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Dodaj vozliÅ¡Äe" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3951,6 +4190,20 @@ msgid "No playback resource set at path: %s." msgstr "Ni na poti virov." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Odstrani" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Gradnik Prehod" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4783,6 +5036,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5963,6 +6220,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Zaženi Prizor po Meri" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Posameznik" @@ -6073,10 +6339,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6121,7 +6383,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6214,6 +6476,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6222,6 +6490,11 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Pripni na mrežo" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Izberite NaÄin (Q)" @@ -6505,10 +6778,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6849,6 +7118,11 @@ msgstr "IzbriÅ¡i toÄke" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Ustvari Nov %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Ustvarite Poligon" @@ -7033,6 +7307,28 @@ msgid "TileSet" msgstr "Izvozi PloÅ¡Äno Zbirko" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Nastavi kot Privzeto za '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Animacija Podvoji kljuÄe" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7048,6 +7344,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Uredi Filtre" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Spremebe v Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7061,7 +7367,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7074,6 +7389,10 @@ msgid "Exporting All" msgstr "Izvozi" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8070,6 +8389,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Shrani Prizor" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8105,6 +8429,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Shrani Prizor" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Ustvarite Mapo" @@ -8527,6 +8856,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Spremeni SidriÅ¡Äa" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8737,6 +9079,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9040,10 +9386,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Dodaj vozliÅ¡Äe" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Odstrani Gradnike VizualnaSkripta" @@ -9126,6 +9468,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Uredi Platno Stvari" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10013,10 +10360,6 @@ msgstr "" #~ msgid "Search in files" #~ msgstr "IÅ¡Äi Razrede" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Pripni na mrežo" - #~ msgid "Disabled" #~ msgstr "OnemogoÄen" @@ -10053,12 +10396,6 @@ msgstr "" #~ msgid "Out" #~ msgstr "Ven" -#~ msgid "Change Anim Len" -#~ msgstr "Spremeni Dolžino Animacije" - -#~ msgid "Change Anim Loop" -#~ msgstr "Spremeni Zanko Animacije" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "V Animaciji Ustvari Vneseno Vrednost KljuÄa" diff --git a/editor/translations/sq.po b/editor/translations/sq.po index de9644d780..23c2f02d7a 100644 --- a/editor/translations/sq.po +++ b/editor/translations/sq.po @@ -81,6 +81,14 @@ msgstr "Dyfisho Key(s) të Selektuar" msgid "Delete Selected Key(s)" msgstr "Fshi Key(s) të Selektuar" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -110,6 +118,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Përsëritje Animacioni" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -159,6 +177,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -183,6 +205,10 @@ msgid "Time (s): " msgstr "Koha (s): " #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "I vazhdueshëm:" @@ -233,6 +259,19 @@ msgid "Delete Key(s)" msgstr "Fshi Key(s)" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Përsëritje Animacioni" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -274,6 +313,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Pastro Animacionin" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -298,6 +346,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -306,10 +358,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Metoda nuk u gjet në objekt: " @@ -322,6 +386,10 @@ msgid "Clipboard is empty" msgstr "Clipboard-i është bosh" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -364,10 +432,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -467,6 +531,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Klipe Audio:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1259,6 +1336,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1799,6 +1882,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3374,12 +3465,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Përsëritje Animacioni" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3419,6 +3542,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3427,6 +3570,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3444,6 +3591,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3453,11 +3604,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Përmirëso Animacionin" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Fshi Key(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3473,6 +3662,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3698,6 +3892,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3726,6 +3933,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4524,6 +4743,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5661,6 +5884,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5769,10 +6000,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5817,7 +6044,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5909,6 +6136,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5917,6 +6150,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6193,10 +6430,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6525,6 +6758,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6689,6 +6926,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Dyfisho Key(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6704,6 +6962,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6717,7 +6983,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6729,6 +7004,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7705,6 +7984,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7739,6 +8022,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8151,6 +8438,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8355,6 +8654,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8649,10 +8952,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8733,6 +9032,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index a4271de16b..fd45d7d072 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -87,6 +87,16 @@ msgstr "Дуплирај одабрано" msgid "Delete Selected Key(s)" msgstr "Обриши одабране датотеке?" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Додај тачку" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Помери тачку" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Дуплирај кључеве" @@ -118,6 +128,16 @@ msgid "Anim Change Call" msgstr "Промени позив анимације" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Промени Ñ†Ð¸ÐºÐ»ÑƒÑ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Промени Ñ†Ð¸ÐºÐ»ÑƒÑ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -174,6 +194,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Промени вредноÑÑ‚ низа" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Укљ./ИÑкљ. режим без Ñметње." @@ -201,6 +226,11 @@ msgid "Time (s): " msgstr "X-Fade време (Ñек.):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "„Doppler“ режим" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Трајан" @@ -254,6 +284,21 @@ msgid "Delete Key(s)" msgstr "Уколни кључеве" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Измени име анимације:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Ðнимациони чвор" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Промени Ñ†Ð¸ÐºÐ»ÑƒÑ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Обриши траку анимације" @@ -295,6 +340,16 @@ msgid "Anim Insert Key" msgstr "Уметни кључ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Промени број Ñлика у Ñекунди (FPS)" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Преуреди аутоматÑка учитавања" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -319,6 +374,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Додај нову траку" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -327,10 +387,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Тип транÑформације" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Додај нову траку" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Уметни траку и кључ" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -344,6 +419,11 @@ msgid "Clipboard is empty" msgstr "Ðема реÑурÑа за копирање!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Ðалепи параметре" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Увећај кључеве" @@ -390,11 +470,6 @@ msgid "Copy Tracks" msgstr "Копирај параметре" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Ðалепи параметре" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Увећај одабрано" @@ -497,6 +572,19 @@ msgstr "" msgid "Copy" msgstr "Копирај" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Звучни Ñлушалац" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Промени величину низа" @@ -1317,6 +1405,12 @@ msgstr "" msgid "Packing" msgstr "Паковање" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1913,6 +2007,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Сачувај промене '%s' пре излаÑка?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Грешка при учитавању реÑурÑа." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Сачувај Ñцену као..." @@ -3613,12 +3716,49 @@ msgstr "Учитај" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Помери тачку" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Промени време мешања" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Промени време мешања" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Додај тачку" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Додај анимацију" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Обриши тачку путање" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3661,6 +3801,30 @@ msgid "Triangle already exists" msgstr "Грешка: име анимације већ поÑтоји!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Додај нову траку" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Промени време мешања" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Промени време мешања" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Обриши тачку путање" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3669,6 +3833,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Укљ./ИÑкљ. глобале аутоматÑког учитавања" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3686,6 +3855,11 @@ msgid "Blend:" msgstr "Мешавина:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Промене материјала" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Уреди филтере" @@ -3695,11 +3869,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Режим померања" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Повезан" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Веза прекинута" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Ðнимација" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Ðаправи чвор" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Укљ./ИÑкљ. режим без Ñметње." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Измени дужину анимације" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3715,6 +3932,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Име чвора:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3949,6 +4172,21 @@ msgid "Cross-Animation Blend Times" msgstr "Вишеанимационо време мешања" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Режим померања" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Померај" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3978,6 +4216,20 @@ msgid "No playback resource set at path: %s." msgstr "Ðије на пут реÑурÑа." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Обриши" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Transition чвор" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4808,6 +5060,10 @@ msgstr "Држи Shift за уређивање појединачних танг msgid "Bake GI Probe" msgstr "ИÑпечи Ñонде глобалног оÑветљења (GI)" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Ствар %d" @@ -6008,6 +6264,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Ðаправи тачке емиÑије од мреже" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Синглетон" @@ -6120,10 +6385,6 @@ msgid "Vertices" msgstr "Тачке" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Поглед одозго." @@ -6168,7 +6429,8 @@ msgid "Rear" msgstr "Бок" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Поравнавање Ñа погледом" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6262,6 +6524,12 @@ msgid "Freelook Speed Modifier" msgstr "Брзина Ñлободног погледа" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Прикажи информације" @@ -6272,6 +6540,11 @@ msgstr "XForm дијалог" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Залепи за мрежу" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "Select Mode (Q)" msgstr "Режим Ñелекције (Q)\n" @@ -6560,10 +6833,6 @@ msgid "Add Empty" msgstr "Додај празан" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Промени Ñ†Ð¸ÐºÐ»ÑƒÑ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ˜Ðµ" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Промени број Ñлика у Ñекунди (FPS)" @@ -6917,6 +7186,11 @@ msgstr "ДеÑни таÑтер миша: обриши тачку." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Ðаправи нов" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Ðаправи нови полигон од почетка." @@ -7103,6 +7377,29 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "ПоÑтави као уобичајено за „%s“" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Шејдер" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Дуплирај чвор/ове графа" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "Тачке" @@ -7121,6 +7418,16 @@ msgstr "деÑно" msgid "VisualShader" msgstr "Шејдер" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Уреди филтере" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Промене шејдера" + #: editor/project_export.cpp msgid "Runnable" msgstr "Покретљива" @@ -7135,8 +7442,17 @@ msgid "Delete preset '%s'?" msgstr "Обриши поÑтавку „%s“?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Извозни шаблони за ову платформу или ниÑу пронађени или Ñу иÑкварене:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -7148,6 +7464,10 @@ msgid "Exporting All" msgstr "Извоз" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Извозни шаблони за ову платформу или ниÑу пронађени или Ñу иÑкварене:" + +#: editor/project_export.cpp #, fuzzy msgid "Presets" msgstr "ПоÑтавке" @@ -8154,6 +8474,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Сачувај Ñцену" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8190,6 +8515,11 @@ msgstr "Ðаправи коÑти" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Сачувај Ñцену" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Ðаправи чвор" @@ -8614,6 +8944,20 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Излазна транзиција" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Промени Ñидра" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8825,6 +9169,11 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Мапа мреже" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Мапа мреже" @@ -9128,10 +9477,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9214,6 +9559,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Уреди CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9991,6 +10341,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #, fuzzy #~ msgid "Font Size:" #~ msgstr "Поглед иÑпред" @@ -10132,10 +10485,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Претвори у мала Ñлова" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Залепи за мрежу" - #~ msgid "Rotate 0 degrees" #~ msgstr "Ротирај 0 Ñтепени" @@ -10236,9 +10585,6 @@ msgstr "" #~ msgid "Move Shader Graph Node" #~ msgstr "Помери чвор графа шејдера" -#~ msgid "Duplicate Graph Node(s)" -#~ msgstr "Дуплирај чвор/ове графа" - #~ msgid "Delete Shader Graph Node(s)" #~ msgstr "Обриши чвор/ове графа шејдера" @@ -10296,9 +10642,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Из-У" -#~ msgid "Change Anim Len" -#~ msgstr "Измени дужину анимације" - #~ msgid "Change Anim Loop" #~ msgstr "Измени лупинг анимације" diff --git a/editor/translations/sr_Latn.po b/editor/translations/sr_Latn.po index 46073472f7..1a75fd637d 100644 --- a/editor/translations/sr_Latn.po +++ b/editor/translations/sr_Latn.po @@ -87,6 +87,14 @@ msgstr "Uduplaj Selekciju" msgid "Delete Selected Key(s)" msgstr "IzbriÅ¡i oznaÄeni kljuÄ(eve)" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Animacija Uduplaj KljuÄeve" @@ -116,6 +124,16 @@ msgid "Anim Change Call" msgstr "Animacija Promjeni Poziv" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Promijeni Dužinu Animacije" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -166,6 +184,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -191,6 +213,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Neprekidna" @@ -243,6 +269,21 @@ msgid "Delete Key(s)" msgstr "Animacija ObriÅ¡i KljuÄeve" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Promijeni Dužinu Animacije" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Promijeni Dužinu Animacije" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Optimizuj Animaciju" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Odstrani Kanal Animacije" @@ -284,6 +325,15 @@ msgid "Anim Insert Key" msgstr "Animacija dodaj kljuÄ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "PoÄisti Animaciju" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -308,6 +358,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Animacija Dodaj Kanal" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -316,10 +371,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Animacija Dodaj kanal i kljuÄ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Animacija Dodaj Kanal" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Animacija Dodaj kanal i kljuÄ" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -332,6 +402,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Animacija Skaliraj KljuÄeve" @@ -374,10 +448,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skaliraj Selekciju" @@ -480,6 +550,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Animacija Dodaj Kanal" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1273,6 +1356,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1814,6 +1903,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3392,12 +3489,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Optimizuj Animaciju" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3438,6 +3567,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Animacija Dodaj Kanal" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3446,6 +3596,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3463,6 +3617,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3472,11 +3630,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Optimizuj Animaciju" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Animacija ObriÅ¡i KljuÄeve" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3492,6 +3688,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3718,6 +3919,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Tranzicije" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3746,6 +3961,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Tranzicije" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4548,6 +4776,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5693,6 +5925,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5801,10 +6041,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5849,7 +6085,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5941,6 +6177,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5949,6 +6191,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6226,10 +6472,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6563,6 +6805,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Napravi" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Napravi" @@ -6736,6 +6983,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Animacija Uduplaj KljuÄeve" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6751,6 +7019,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6764,7 +7040,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6776,6 +7061,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7755,6 +8044,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7789,6 +8082,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8201,6 +8498,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8406,6 +8715,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8701,10 +9014,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8785,6 +9094,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 98c2593d34..4de14cba75 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -92,6 +92,15 @@ msgstr "Duplicera urval" msgid "Delete Selected Key(s)" msgstr "Ta bort valda filer?" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Flytta Ner" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Anim Duplicera Nycklar" @@ -121,6 +130,16 @@ msgid "Anim Change Call" msgstr "Anim Ändra Anrop" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Ändra Animationsnamn:" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -176,6 +195,11 @@ msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Ändra Arrays Värde" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Växla distraktionsfritt läge." @@ -203,6 +227,10 @@ msgid "Time (s): " msgstr "Tid:" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Kontinuerlig" @@ -256,6 +284,21 @@ msgid "Delete Key(s)" msgstr "Ta bort Nod(er)" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Ändra Animationsnamn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animations-Node" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Ändra Anim Loop" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Ta bort Anim spÃ¥r" @@ -297,6 +340,16 @@ msgid "Anim Insert Key" msgstr "Anim Infoga Nyckel" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Ändra Animationsnamn:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Ändra ordning pÃ¥ Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -321,6 +374,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Anim Lägg till spÃ¥r" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -329,11 +387,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Transformera" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Anim Lägg till spÃ¥r" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "Anim Infoga SpÃ¥r & Nyckel" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "VariableGet hittades inte i Skript: " @@ -347,6 +420,11 @@ msgid "Clipboard is empty" msgstr "Sökvägen är tom" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Klistra in Params" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Anim Skala Nycklar" @@ -393,11 +471,6 @@ msgid "Copy Tracks" msgstr "Kopiera Params" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Klistra in Params" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Skala urval" @@ -510,6 +583,19 @@ msgstr "" msgid "Copy" msgstr "Kopiera" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Ljud-Lyssnare" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp #, fuzzy msgid "Resize Array" @@ -1443,6 +1529,12 @@ msgstr "" msgid "Packing" msgstr "Packar" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -2094,6 +2186,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Spara ändringar i '%s' innan stängning?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Misslyckades att ladda resurs." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Spara Scen Som..." @@ -3847,12 +3948,47 @@ msgstr "Ladda" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Flytta Ner" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Lägg Till Node" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Lägg till Animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Ta bort Polygon och Punkt" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3894,6 +4030,29 @@ msgid "Triangle already exists" msgstr "ERROR: Animationsnamn finns redan!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Lägg till Variabel" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Ta bort Polygon och Punkt" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Ta bort Variabeln" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3902,6 +4061,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Växla AutoLoad Globals" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3919,6 +4083,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Uppdatera Ändringar" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3929,11 +4098,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Node Namn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Ansluten" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "FrÃ¥nkopplad" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animation" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Ta bort Nod(er)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Växla distraktionsfritt läge." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Ändra Typ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3949,6 +4161,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Node Namn:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -4192,6 +4410,22 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Flytta Nod(er)" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Lägg Till Översättning" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Add Node" +msgstr "Lägg Till Node" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -4221,6 +4455,20 @@ msgid "No playback resource set at path: %s." msgstr "Inte i resursens sökväg." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Ta bort" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "ÖvergÃ¥ng" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -5055,6 +5303,10 @@ msgstr "HÃ¥ll Skift för att redigera tangenter individuellt" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -6270,6 +6522,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Skapa frÃ¥n Scen" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Singleton" @@ -6388,10 +6649,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Top View." msgstr "Vy OvanifrÃ¥n." @@ -6447,8 +6704,9 @@ msgid "Rear" msgstr "Baksida" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr "Vy frÃ¥n höger" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp #, fuzzy @@ -6544,6 +6802,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Visa Information" @@ -6553,6 +6817,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "Välj Node" @@ -6842,10 +7110,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -7198,6 +7462,11 @@ msgstr "Radera punkter" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Skapa Ny" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Skapa Prenumeration" @@ -7381,6 +7650,27 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Duplicera Nod(er)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7397,6 +7687,15 @@ msgstr "Höger" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Redigera Filter" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7410,7 +7709,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7423,6 +7731,10 @@ msgid "Exporting All" msgstr "Exportera" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8472,6 +8784,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "Make node as Root" +msgstr "Vettigt!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Delete Node(s)?" msgstr "Ta bort Nod(er)?" @@ -8510,6 +8827,11 @@ msgstr "Gör Patch" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Vettigt!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Skapa Node" @@ -8967,6 +9289,21 @@ msgstr "" #: editor/settings_config_dialog.cpp #, fuzzy +msgid "Erase Shortcut" +msgstr "Genvägar" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Genvägar" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Genvägar" + +#: editor/settings_config_dialog.cpp +#, fuzzy msgid "Shortcuts" msgstr "Genvägar" @@ -9182,6 +9519,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9497,11 +9838,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy -msgid "Add Node" -msgstr "Lägg Till Node" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9587,6 +9923,11 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Ändra Kommentar" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10409,6 +10750,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #, fuzzy #~ msgid "Warnings:" #~ msgstr "Varning" @@ -10570,10 +10914,6 @@ msgstr "" #~ msgid "Errors:" #~ msgstr "Fel:" -#, fuzzy -#~ msgid "Change Comment" -#~ msgstr "Ändra Kommentar" - #~ msgid "Disabled" #~ msgstr "Avaktiverad" @@ -10620,9 +10960,6 @@ msgstr "" #~ msgid "Change Anim Len" #~ msgstr "Ändra Anim Längd" -#~ msgid "Change Anim Loop" -#~ msgstr "Ändra Anim Loop" - #~ msgid "Length (s):" #~ msgstr "Längd (s):" diff --git a/editor/translations/ta.po b/editor/translations/ta.po index f1011a2a42..ef56649851 100644 --- a/editor/translations/ta.po +++ b/editor/translations/ta.po @@ -85,6 +85,14 @@ msgstr "அசைவூடà¯à®Ÿà¯ போலிபசà¯à®šà®¾à®µà®¿à®•à®³à¯" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "அசைவூடà¯à®Ÿà¯ போலிபசà¯à®šà®¾à®µà®¿à®•à®³à¯" @@ -116,6 +124,15 @@ msgid "Anim Change Call" msgstr "மாறà¯à®± அழைபà¯à®ªà¯ அசைவூடà¯à®Ÿà¯" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -166,6 +183,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -191,6 +212,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -242,6 +267,19 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை [interpolation]யை மாறà¯à®±à¯" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "அசைவூடà¯à®Ÿà¯ பாதையை நீகà¯à®•à¯" @@ -283,6 +321,15 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "மாறà¯à®±à®®à¯ அசைவூடà¯à®Ÿà¯" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -307,6 +354,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை சேரà¯" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -315,10 +367,24 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை சேரà¯" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை சேரà¯" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -331,6 +397,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -373,10 +443,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -477,6 +543,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை சேரà¯" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1270,6 +1349,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1810,6 +1895,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3386,12 +3479,44 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "மாறà¯à®±à®™à¯à®•à®³à¯ˆ இதறà¯à®•à¯ அமை:" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3431,6 +3556,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "அசைவூடà¯à®Ÿà¯ பாதை சேரà¯" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3439,6 +3585,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3456,6 +3606,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3465,11 +3619,49 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "மாறà¯à®±à®™à¯à®•à®³à¯ˆ இதறà¯à®•à¯ அமை:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "அனைதà¯à®¤à¯ தேரà¯à®µà¯à®•à®³à¯" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3485,6 +3677,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3711,6 +3908,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "சேர௠மà¯à®•à¯à®•à®¿à®¯à®ªà¯à®ªà¯à®³à¯à®³à®¿à®¯à¯ˆ நகரà¯à®¤à¯à®¤à¯" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "மாறà¯à®±à®™à¯à®•à®³à¯ˆ இதறà¯à®•à¯ அமை:" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3739,6 +3951,19 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "மாறà¯à®±à®™à¯à®•à®³à¯ˆ இதறà¯à®•à¯ அமை:" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4538,6 +4763,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5676,6 +5905,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5784,10 +6021,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5832,7 +6065,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5924,6 +6157,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5932,6 +6171,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6208,10 +6451,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6541,6 +6780,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6705,6 +6948,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "அசைவூடà¯à®Ÿà¯ போலிபசà¯à®šà®¾à®µà®¿à®•à®³à¯" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6720,6 +6984,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6733,7 +7005,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6745,6 +7026,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7723,6 +8008,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7757,6 +8046,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8169,6 +8462,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8374,6 +8679,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8669,10 +8978,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8753,6 +9058,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9518,14 +9827,8 @@ msgstr "" #~ msgid "Move Anim Track Down" #~ msgstr "அசைவூடà¯à®Ÿà¯ பாதையை கீழே நகரà¯à®¤à¯à®¤à¯" -#~ msgid "Anim Track Change Interpolation" -#~ msgstr "அசைவூடà¯à®Ÿà¯ பாதை [interpolation]யை மாறà¯à®±à¯" - #~ msgid "Anim Track Change Value Mode" #~ msgstr "அசைவூடà¯à®Ÿà¯ பாதை மதிபà¯à®ªà¯[value] விதம௠மாறà¯à®±à¯" #~ msgid "Anim Track Change Wrap Mode" #~ msgstr "அசைவூடà¯à®Ÿà¯ பாதை மறை[wrap] விதம௠மாறà¯à®±à¯" - -#~ msgid "Move Add Key" -#~ msgstr "சேர௠மà¯à®•à¯à®•à®¿à®¯à®ªà¯à®ªà¯à®³à¯à®³à®¿à®¯à¯ˆ நகரà¯à®¤à¯à®¤à¯" diff --git a/editor/translations/te.po b/editor/translations/te.po index ac7d358ee0..c0b3ef05a8 100644 --- a/editor/translations/te.po +++ b/editor/translations/te.po @@ -82,6 +82,14 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +msgid "Move Bezier Points" +msgstr "" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -111,6 +119,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -160,6 +177,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -184,6 +205,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -234,6 +259,18 @@ msgid "Delete Key(s)" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -275,6 +312,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -299,6 +344,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -307,10 +356,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -323,6 +384,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -365,10 +430,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -468,6 +529,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1260,6 +1333,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1800,6 +1879,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3375,12 +3462,43 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Move Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3420,6 +3538,26 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3428,6 +3566,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3445,6 +3587,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3454,11 +3600,47 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Node Moved" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Delete Node" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Change Filter" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3474,6 +3656,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3699,6 +3886,19 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Move Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3727,6 +3927,18 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4525,6 +4737,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5662,6 +5878,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5770,10 +5994,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5818,7 +6038,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -5910,6 +6130,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5918,6 +6144,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6194,10 +6424,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6523,6 +6749,10 @@ msgid "Erase bitmask." msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create a new rectangle." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "" @@ -6685,6 +6915,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6700,6 +6950,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6713,7 +6971,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6725,6 +6992,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7701,6 +7972,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7735,6 +8010,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "" @@ -8147,6 +8426,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8351,6 +8642,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8645,10 +8940,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8729,6 +9020,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/th.po b/editor/translations/th.po index 62bf2f8594..9637545869 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -92,6 +92,16 @@ msgstr "ทำซ้ำที่เลืà¸à¸" msgid "Delete Selected Key(s)" msgstr "ลบสิ่งที่เลืà¸à¸" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "เพิ่มจุด" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "ย้ายจุด" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "ทำซ้ำคีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" @@ -122,6 +132,16 @@ msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¹€à¸£à¸µà¸¢à¸à¸Ÿà¸±à¸‡à¸à¹Œà¸Šà¸±à¸™à¹à¸à¸™ #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸§à¸™à¸‹à¹‰à¸³à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸§à¸™à¸‹à¹‰à¸³à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "คุณสมบัติ:" @@ -179,6 +199,11 @@ msgstr "คลิป" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "เปลี่ยนค่าในà¸à¸²à¸£à¹Œà¹€à¸£à¸¢à¹Œ" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "โหมดไร้สิ่งรบà¸à¸§à¸™" @@ -206,6 +231,11 @@ msgid "Time (s): " msgstr "ระยะเวลาเฟด (วิ):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "เปิดดà¸à¸›à¹€à¸žà¸¥à¸à¸£à¹Œ" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "ต่à¸à¹€à¸™à¸·à¹ˆà¸à¸‡" @@ -259,6 +289,21 @@ msgid "Delete Key(s)" msgstr "ลบโหนด" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "เปลี่ยนชื่à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "โหนดà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸§à¸™à¸‹à¹‰à¸³à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "ลบà¹à¸—ร็à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" @@ -300,6 +345,16 @@ msgid "Anim Insert Key" msgstr "à¹à¸—รà¸à¸„ีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "à¹à¸à¹‰à¹„ขความเร็วà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "จัดลำดับà¸à¸à¹‚ต้โหลด" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -324,6 +379,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "เพิ่มà¹à¸—ร็à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -332,11 +392,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "ประเภทà¸à¸²à¸£à¹€à¸„ลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "เพิ่มà¹à¸—ร็à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "เพิ่มà¹à¸—ร็à¸à¹à¸¥à¸°à¸„ีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "ไม่พบ VariableGet ในสคริปต์: " @@ -350,6 +425,11 @@ msgid "Clipboard is empty" msgstr "คลิปบà¸à¸£à¹Œà¸”ว่างเปล่า!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "วางตัวà¹à¸›à¸£" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "ปรับคีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" @@ -396,11 +476,6 @@ msgid "Copy Tracks" msgstr "คัดลà¸à¸à¸•à¸±à¸§à¹à¸›à¸£" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "วางตัวà¹à¸›à¸£" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "ปรับà¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¹€à¸§à¸¥à¸²à¸„ีย์ที่เลืà¸à¸" @@ -503,6 +578,19 @@ msgstr "" msgid "Copy" msgstr "คัดลà¸à¸" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "ตัวรับเสียง" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "ปรับขนาดà¸à¸²à¸£à¹Œà¹€à¸£à¸¢à¹Œ" @@ -1317,6 +1405,12 @@ msgstr "" msgid "Packing" msgstr "à¸à¸³à¸¥à¸±à¸‡à¸£à¸§à¸šà¸£à¸§à¸¡" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1897,6 +1991,16 @@ msgid "Save changes to '%s' before closing?" msgstr "บันทึภ'%s' à¸à¹ˆà¸à¸™à¸›à¸´à¸”โปรà¹à¸à¸£à¸¡à¸«à¸£à¸·à¸à¹„ม่?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "โหลดรีซà¸à¸£à¹Œà¸ªà¹„ม่ได้" + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Texture ขนาดใหà¸à¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹à¸„่ไฟล์เดียว" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "บันทึà¸à¸‰à¸²à¸à¹€à¸›à¹‡à¸™..." @@ -3558,12 +3662,49 @@ msgstr "โหลด" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "ย้ายจุด" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "à¹à¸à¹‰à¹„ขระยะเวลาà¸à¸²à¸£à¸œà¸ªà¸²à¸™" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "à¹à¸à¹‰à¹„ขระยะเวลาà¸à¸²à¸£à¸œà¸ªà¸²à¸™" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "เพิ่มโหนด" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "เพิ่มà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "ลบจุด" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3606,6 +3747,31 @@ msgid "Triangle already exists" msgstr "มีà¸à¸²à¸£à¸à¸£à¸°à¸—ำ '%s' à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "เพิ่มตัวà¹à¸›à¸£" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "à¹à¸à¹‰à¹„ขระยะเวลาà¸à¸²à¸£à¸œà¸ªà¸²à¸™" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "à¹à¸à¹‰à¹„ขระยะเวลาà¸à¸²à¸£à¸œà¸ªà¸²à¸™" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "ลบจุด" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "ลบตัวà¹à¸›à¸£" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3614,6 +3780,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "เปิด/ปิดซิงเà¸à¸´à¸¥à¸•à¸±à¸™" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3632,6 +3803,11 @@ msgid "Blend:" msgstr "ผสม:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "จำนวนครั้งที่เปลี่ยนวัสดุ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "à¹à¸à¹‰à¹„ขตัวà¸à¸£à¸à¸‡" @@ -3641,11 +3817,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "เพิ่มโหนดจาà¸à¸œà¸±à¸‡" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "โหมดเคลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹à¸¥à¹‰à¸§" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "à¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸ªà¸´à¹‰à¸™à¸ªà¸¸à¸”" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "ลบโหนด" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "โหมดไร้สิ่งรบà¸à¸§à¸™" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "à¹à¸à¹‰à¹„ขตัวà¸à¸£à¸à¸‡à¸ ูมิภาค" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3661,6 +3881,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "ชื่à¸à¹‚หนด:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3898,6 +4124,21 @@ msgstr "ระยะเวลาà¸à¸²à¸£à¸œà¸ªà¸²à¸™ Cross-Animation" #: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Move Node" +msgstr "โหมดเคลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "เพิ่มà¸à¸²à¸£à¹à¸›à¸¥" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "เพิ่มโหนด" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy msgid "End" msgstr "จบ" @@ -3927,6 +4168,20 @@ msgid "No playback resource set at path: %s." msgstr "ไม่à¸à¸¢à¸¹à¹ˆà¹ƒà¸™à¹‚ฟลเดà¸à¸£à¹Œà¸£à¸µà¸‹à¸à¸£à¹Œà¸ª" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "ลบ:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "โหนดทรานสิชัน" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4758,6 +5013,10 @@ msgstr "à¸à¸” Shift ค้างเพื่à¸à¸›à¸£à¸±à¸šà¹€à¸ªà¹‰à¸™à¸ªà¸±à¸ msgid "Bake GI Probe" msgstr "สร้าง GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "ไà¸à¹€à¸—ม %d" @@ -5949,6 +6208,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "สร้างจุดปะทุจาภMesh" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "โครงà¸à¸£à¸°à¸”ูà¸..." @@ -6061,10 +6329,6 @@ msgid "Vertices" msgstr "มุมรูปทรง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "เฟรมต่à¸à¸§à¸´à¸™à¸²à¸—ี" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "มุมบน" @@ -6109,7 +6373,8 @@ msgid "Rear" msgstr "หลัง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "ย้ายมาที่à¸à¸¥à¹‰à¸à¸‡" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6203,6 +6468,12 @@ msgid "Freelook Speed Modifier" msgstr "ปรับความเร็วมุมมà¸à¸‡à¸à¸´à¸ªà¸£à¸°" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "à¹à¸ªà¸”งข้à¸à¸¡à¸¹à¸¥" @@ -6212,6 +6483,11 @@ msgid "XForm Dialog" msgstr "เครื่à¸à¸‡à¸¡à¸·à¸à¹€à¸„ลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "โหมดเลืà¸à¸ (Q)" @@ -6499,10 +6775,6 @@ msgid "Add Empty" msgstr "เพิ่มà¹à¸šà¸šà¸§à¹ˆà¸²à¸‡à¹€à¸›à¸¥à¹ˆà¸²" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸§à¸™à¸‹à¹‰à¸³à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "à¹à¸à¹‰à¹„ขความเร็วà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" @@ -6849,6 +7121,11 @@ msgstr "คลิà¸à¸‚วา: ลบจุด" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "สร้าง %s ใหม่" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "สร้างรูปหลายเหลี่ยมจาà¸à¸„วามว่างเปล่า" @@ -7038,6 +7315,29 @@ msgid "TileSet" msgstr "Tile Set" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "à¸à¸³à¸«à¸™à¸”เป็นค่าเริ่มต้นขà¸à¸‡ '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Shader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "ทำซ้ำโหนด" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "มุมรูปทรง" @@ -7057,6 +7357,16 @@ msgstr "ขวา" msgid "VisualShader" msgstr "Shader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "à¹à¸à¹‰à¹„ขตัวà¸à¸£à¸à¸‡" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "จำนวนครั้งที่เปลี่ยน Shader" + #: editor/project_export.cpp msgid "Runnable" msgstr "รันได้" @@ -7070,8 +7380,17 @@ msgid "Delete preset '%s'?" msgstr "ลบ '%s'?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "à¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡à¸™à¸µà¹‰à¸ªà¸¹à¸à¸«à¸²à¸¢/เสียหาย:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp #, fuzzy @@ -7084,6 +7403,10 @@ msgid "Exporting All" msgstr "ส่งà¸à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸š %s" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "à¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡à¸™à¸µà¹‰à¸ªà¸¹à¸à¸«à¸²à¸¢/เสียหาย:" + +#: editor/project_export.cpp msgid "Presets" msgstr "à¸à¸²à¸£à¸ªà¹ˆà¸‡à¸à¸à¸" @@ -8097,6 +8420,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "เข้าใจ!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "ลบโหนด?" @@ -8133,6 +8461,11 @@ msgstr "ระยะใà¸à¸¥à¹‰" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "เข้าใจ!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "สร้างโหนด" @@ -8570,6 +8903,21 @@ msgid "Set From Tree" msgstr "à¸à¸³à¸«à¸™à¸”จาà¸à¸œà¸±à¸‡" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "à¸à¸à¸à¸™à¸¸à¹ˆà¸¡à¸™à¸§à¸¥" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "ทางลัด" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸•à¸£à¸¶à¸‡" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "ทางลัด" @@ -8783,6 +9131,10 @@ msgid "GridMap Duplicate Selection" msgstr "ทำซ้ำใน GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "วาด GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" @@ -9080,10 +9432,6 @@ msgid "Change Expression" msgstr "à¹à¸à¹‰à¹„ขสมà¸à¸²à¸£" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "เพิ่มโหนด" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "ลบโหนด" @@ -9166,6 +9514,11 @@ msgid "Change Input Value" msgstr "à¹à¸à¹‰à¹„ขค่าà¸à¸´à¸™à¸žà¸¸à¸•" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "à¹à¸à¹‰à¹„ข CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "คัดลà¸à¸à¹‚หนดฟังà¸à¹Œà¸Šà¸±à¸™à¹„ม่ได้" @@ -9978,6 +10331,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "เฟรมต่à¸à¸§à¸´à¸™à¸²à¸—ี" + #, fuzzy #~ msgid "Warnings:" #~ msgstr "คำเตืà¸à¸™" @@ -10152,10 +10508,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™à¸•à¸±à¸§à¸žà¸´à¸¡à¸žà¹Œà¹€à¸¥à¹‡à¸" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" - #~ msgid "Rotate 0 degrees" #~ msgstr "หมุน 0 à¸à¸‡à¸¨à¸²" @@ -10675,9 +11027,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "เพิ่ม:" -#~ msgid "Removed:" -#~ msgstr "ลบ:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "บันทึภtexture ย่à¸à¸¢à¸‚à¸à¸‡ atlas ไม่ได้:" @@ -10938,9 +11287,6 @@ msgstr "" #~ msgid "Error importing:" #~ msgstr "ผิดพลาดขณะนำเข้า:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Texture ขนาดใหà¸à¹ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¹à¸„่ไฟล์เดียว" - #~ msgid "Max Texture Size:" #~ msgstr "ขนาด Texture ที่ใหà¸à¹ˆà¸—ี่สุด:" @@ -11159,9 +11505,6 @@ msgstr "" #~ msgid "Resource Tools" #~ msgstr "เครื่à¸à¸‡à¸¡à¸·à¸à¸£à¸µà¸‹à¸à¸£à¹Œà¸ª" -#~ msgid "GridMap Paint" -#~ msgstr "วาด GridMap" - #~ msgid "Areas" #~ msgstr "พื้นที่" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index ccb0acce73..8111bff345 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -108,6 +108,16 @@ msgstr "Seçimi ÇoÄŸalt" msgid "Delete Selected Key(s)" msgstr "Seçilenleri Sil" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Nokta Ekle" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Noktayı Taşı" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Animasyon Anahtarlarını ÇoÄŸalt" @@ -138,6 +148,16 @@ msgstr "Animasyon DeÄŸiÅŸikliÄŸi ÇaÄŸrısı" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Animation Length" +msgstr "Animasyon Döngüsünü DeÄŸiÅŸtir" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Animasyon Döngüsünü DeÄŸiÅŸtir" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Property Track" msgstr "Özellik:" @@ -195,6 +215,11 @@ msgstr "Parçalar" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Change Track Path" +msgstr "Dizi DeÄŸerini DeÄŸiÅŸtir" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Toggle this track on/off." msgstr "Dikkat-Dağıtmayan Kipine geç." @@ -222,6 +247,11 @@ msgid "Time (s): " msgstr "X-Sönülme Süresi (sn):" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "ÇoÄŸaltıcı Aktif" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Kesintisiz" @@ -275,6 +305,21 @@ msgid "Delete Key(s)" msgstr "Düğümleri Sil" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Animasyonun Adını DeÄŸiÅŸtir:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Animasyon Düğümü" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Animasyon Döngüsünü DeÄŸiÅŸtir" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Animasyon Ä°zini Kaldır" @@ -316,6 +361,16 @@ msgid "Anim Insert Key" msgstr "Animasyon Anahtar Gir" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Animasyon FPS'sini DeÄŸiÅŸtir" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "KendindenYüklenme'leri Yeniden Sırala" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -340,6 +395,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Animasyon Ä°z Ekle" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -348,11 +408,26 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Dönüştürme Türü" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Animasyon Ä°z Ekle" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp #, fuzzy +msgid "Add Method Track Key" +msgstr "Animasyon Ä°z & Anahtar Gir" + +#: editor/animation_track_editor.cpp +#, fuzzy msgid "Method not found in object: " msgstr "VariableGet betikte bulunamadı: " @@ -366,6 +441,11 @@ msgid "Clipboard is empty" msgstr "Pano boÅŸ!" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "Parametreleri Yapıştır" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "Animasyon Anahtarı Ölçekle" @@ -412,11 +492,6 @@ msgid "Copy Tracks" msgstr "DeÄŸiÅŸkenleri Tıpkıla" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "Parametreleri Yapıştır" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Seçimi Ölçekle" @@ -519,6 +594,19 @@ msgstr "" msgid "Copy" msgstr "Tıpkıla" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Ses Dinleyici" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Diziyi Yeniden Boyutlandır" @@ -1336,6 +1424,12 @@ msgstr "" msgid "Packing" msgstr "Çıkınla" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1933,6 +2027,16 @@ msgid "Save changes to '%s' before closing?" msgstr "Kapatmadan önce deÄŸiÅŸklikler buraya '%s' kaydedilsin mi?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Kaynak yükleme baÅŸarısız oldu." + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "Büyük doku için yalnızca bir dizeç gereklidir." + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Sahneyi Farklı Kaydet..." @@ -3620,12 +3724,49 @@ msgstr "Yükle" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Noktayı Taşı" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Karışım Süresini DeÄŸiÅŸtir" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Karışım Süresini DeÄŸiÅŸtir" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Düğüm Ekle" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Animasyon Ekle" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Yol Noktasını Kaldır" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3668,6 +3809,31 @@ msgid "Triangle already exists" msgstr "Ä°ÅŸlem '%s' zaten var!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "DeÄŸiÅŸken Ekle" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Karışım Süresini DeÄŸiÅŸtir" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Karışım Süresini DeÄŸiÅŸtir" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Yol Noktasını Kaldır" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "DeÄŸiÅŸkeni Kaldır" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3676,6 +3842,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "KendindenYüklenme Bütünsellerini Aç / Kapat" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3694,6 +3865,11 @@ msgid "Blend:" msgstr "Karışma:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Materyal DeÄŸiÅŸiklikleri" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Süzgeçleri Düzenle" @@ -3703,11 +3879,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "AÄŸaçtan Düğüm(ler) Ekle" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Biçimi Taşı" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "BaÄŸlı" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "BaÄŸlantı kesildi" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Animasyon" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Düğümleri Sil" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Dikkat-Dağıtmayan Kipine geç." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "DeÄŸiÅŸtirilen Yerel Süzgeç" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3723,6 +3943,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Düğüm adı:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3960,6 +4186,21 @@ msgstr "Çapraz-Animasyon Karışma Süreleri" #: editor/plugins/animation_state_machine_editor.cpp #, fuzzy +msgid "Move Node" +msgstr "Biçimi Taşı" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Çeviri Ekle" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Düğüm Ekle" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy msgid "End" msgstr "Son(lar)" @@ -3989,6 +4230,20 @@ msgid "No playback resource set at path: %s." msgstr "Kaynak yolunda deÄŸil." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Silinen:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "GeçiÅŸ Düğümü" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4824,6 +5079,10 @@ msgstr "Tanjantları tek tek düzenlemek için Shift'e basılı tut" msgid "Bake GI Probe" msgstr "GI Prob PiÅŸir" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Öğe%d" @@ -6015,6 +6274,15 @@ msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Örüntüden Emisyon Noktaları OluÅŸtur" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy msgid "Skeleton2D" msgstr "Ä°skelet..." @@ -6127,10 +6395,6 @@ msgid "Vertices" msgstr "Köşenoktalar" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "Ãœstten Görünüm." @@ -6175,7 +6439,8 @@ msgid "Rear" msgstr "Arka" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "Görünüme Ayarla" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6269,6 +6534,12 @@ msgid "Freelook Speed Modifier" msgstr "Serbestbakış Hız DeÄŸiÅŸtirici" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "Bilgi Göster" @@ -6278,6 +6549,11 @@ msgid "XForm Dialog" msgstr "XForm Ä°letiÅŸim Kutusu" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Izgaraya yapış" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Seçim Kipi (Q)" @@ -6565,10 +6841,6 @@ msgid "Add Empty" msgstr "BoÅŸ Ekle" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Animasyon Döngüsünü DeÄŸiÅŸtir" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Animasyon FPS'sini DeÄŸiÅŸtir" @@ -6912,6 +7184,11 @@ msgstr "RMB: Noktayı Sil." #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Yeni %s oluÅŸtur" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Sıfırdan yeni bir çokgen oluÅŸturun." @@ -7103,6 +7380,29 @@ msgid "TileSet" msgstr "Karo Takımı" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "'%s' için Varsayılanı Ayarla" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "Gölgelendirici" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Düğüm(leri) ÇoÄŸalt" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Vertex" msgstr "Köşenoktalar" @@ -7121,6 +7421,16 @@ msgstr "SaÄŸ" msgid "VisualShader" msgstr "Gölgelendirici" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Süzgeçleri Düzenle" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Shader DeÄŸiÅŸiklikleri" + #: editor/project_export.cpp msgid "Runnable" msgstr "KoÅŸturulabilir" @@ -7134,8 +7444,17 @@ msgid "Delete preset '%s'?" msgstr "'%s' önayarı silinsin mi?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "Bu platform için dışa aktarma ÅŸablonu eksik/bozuk:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp #, fuzzy @@ -7148,6 +7467,10 @@ msgid "Exporting All" msgstr "%s için Dışa Aktarım" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "Bu platform için dışa aktarma ÅŸablonu eksik/bozuk:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Önayarlar" @@ -8172,6 +8495,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Anlamlı!" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Düğüm(ler) Silinsin mi?" @@ -8207,6 +8535,11 @@ msgstr "YerelleÅŸtir" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "Anlamlı!" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "Düğüm OluÅŸtur" @@ -8647,6 +8980,21 @@ msgid "Set From Tree" msgstr "AÄŸaçtan Ayarla" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Kararma" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Kısayollar" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Çapaları DeÄŸiÅŸtir" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Kısayollar" @@ -8860,6 +9208,11 @@ msgid "GridMap Duplicate Selection" msgstr "IzgaraHaritası Seçimi ÇoÄŸalt" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "IzgaraHaritası Ayarları" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Izgara Haritası" @@ -9162,10 +9515,6 @@ msgid "Change Expression" msgstr "Ä°fadeyi DeÄŸiÅŸtir" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Düğüm Ekle" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "GörselBetik Düğümlerini Kaldır" @@ -9252,6 +9601,11 @@ msgid "Change Input Value" msgstr "Girdi DeÄŸerini DeÄŸiÅŸtir" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "CanvasItem Düzenle" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Fonksiyon düğümü kopyalanamıyor." @@ -10116,6 +10470,9 @@ msgstr "" msgid "Varyings can only be assigned in vertex function." msgstr "" +#~ msgid "FPS" +#~ msgstr "FPS" + #, fuzzy #~ msgid "Warnings:" #~ msgstr "Uyarılar" @@ -10295,10 +10652,6 @@ msgstr "" #~ msgid "Convert To Lowercase" #~ msgstr "Küçük Harfe Dönüştür" -#, fuzzy -#~ msgid "Snap To Floor" -#~ msgstr "Izgaraya yapış" - #~ msgid "Rotate 0 degrees" #~ msgstr "0 Düzeyde Döndür" @@ -10820,9 +11173,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "Eklenen:" -#~ msgid "Removed:" -#~ msgstr "Silinen:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Atlas alt dokusu kaydedilemedi:" @@ -11082,9 +11432,6 @@ msgstr "" #~ msgid "Error importing:" #~ msgstr "İçe aktarırken sorun:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "Büyük doku için yalnızca bir dizeç gereklidir." - #~ msgid "Max Texture Size:" #~ msgstr "En üst Doku Boyutu:" diff --git a/editor/translations/uk.po b/editor/translations/uk.po index f617cf3fc4..944fa20e28 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: Ukrainian (Godot Engine)\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2019-02-13 07:10+0000\n" +"PO-Revision-Date: 2019-02-21 21:18+0000\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/" "godot/uk/>\n" @@ -93,6 +93,16 @@ msgstr "Дублювати позначені ключі" msgid "Delete Selected Key(s)" msgstr "Вилучити позначені ключі" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "Додати точку" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "ПереміÑтити точки" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Дублювати ключі" @@ -122,6 +132,16 @@ msgid "Anim Change Call" msgstr "Змінити виклик анімації" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Змінити цикл анімації" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "Змінити цикл анімації" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "Доріжка влаÑтивоÑтей" @@ -171,6 +191,11 @@ msgid "Anim Clips:" msgstr "Кліпи анімації:" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Змінити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¼Ð°Ñиву" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "Увімкнути або вимкнути цю доріжку." @@ -195,6 +220,11 @@ msgid "Time (s): " msgstr "Ð§Ð°Ñ (Ñ): " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "Ефект Доплера" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Ðеперервна" @@ -245,6 +275,21 @@ msgid "Delete Key(s)" msgstr "Вилучити ключі" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Змінити ім'Ñ Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ñ—:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Режим інтерполÑції" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Змінити цикл анімації" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Видалити доріжку" @@ -286,6 +331,16 @@ msgid "Anim Insert Key" msgstr "Ð’Ñтавити ключ анімації" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Змінити чаÑтоту кадрів анімації" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Змінити порÑдок автозавантажень" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "Доріжки Ð¿ÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð·Ð°ÑтоÑовуютьÑÑ Ð»Ð¸ÑˆÐµ до вузлів на оÑнові Spatial." @@ -316,6 +371,11 @@ msgid "Not possible to add a new track without a root" msgstr "Ðе можна додавати нові доріжки без кореневого запиÑу" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Додати доріжку" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "ШлÑÑ… доріжки Ñ” некоректним, отже не можна додавати ключ." @@ -324,10 +384,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Доріжка не належить до типу Spatial, не можна вÑтавлÑти ключ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Доріжка проÑторового перетвореннÑ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Додати доріжку" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "ШлÑÑ… доріжки Ñ” некоректним, отже не можна додавати ключ методу." #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Доріжка виклику методів" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "Ðе знайдено метод у об'єкті: " @@ -340,6 +415,10 @@ msgid "Clipboard is empty" msgstr "Буфер обміну порожній" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "Ð’Ñтавити доріжки" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "МаÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ ÐºÐ»ÑŽÑ‡Ñ–Ð² анімації" @@ -385,10 +464,6 @@ msgid "Copy Tracks" msgstr "Копіювати доріжки" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "Ð’Ñтавити доріжки" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Вибір маÑштабу" @@ -488,6 +563,19 @@ msgstr "Виберіть доріжки Ð´Ð»Ñ ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ:" msgid "Copy" msgstr "Копіювати" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Звукові кліпи:" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Змінити розмір маÑиву" @@ -557,9 +645,8 @@ msgid "Warnings" msgstr "ПопередженнÑ" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "Ðомери Ñ€Ñдків Ñ– позицій" +msgstr "Ðомери Ñ€Ñдків Ñ– позицій." #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1118,9 +1205,8 @@ msgid "Add Bus" msgstr "Додати шину" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "Зберегти ÐºÐ¾Ð¼Ð¿Ð¾Ð½ÑƒÐ²Ð°Ð½Ð½Ñ Ð°ÑƒÐ´Ñ–Ð¾ шини Ñк..." +msgstr "Додати нову аудіошину до цього компонуваннÑ." #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1299,6 +1385,12 @@ msgstr "У очікуваному каталозі не знайдено шабРmsgid "Packing" msgstr "ПакуваннÑ" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1875,6 +1967,15 @@ msgid "Save changes to '%s' before closing?" msgstr "Зберегти зміни, внеÑені до '%s' перед закриттÑм?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ реÑурÑ." + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "Зберегти Ñцену Ñк..." @@ -2398,9 +2499,8 @@ msgid "Save & Restart" msgstr "Зберегти Ñ– перезапуÑтити" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "ОбертаєтьÑÑ, коли перемальовуєтьÑÑ Ð²Ñ–ÐºÐ½Ð¾ редактора!" +msgstr "ОбертаєтьÑÑ, коли перемальовуєтьÑÑ Ð²Ñ–ÐºÐ½Ð¾ редактора." #: editor/editor_node.cpp msgid "Update Always" @@ -3514,6 +3614,22 @@ msgstr "Завантажити…" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "ПереміÑтити точки" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Змінити Ñ‡Ð°Ñ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ð½Ð½Ñ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Змінити Ñ‡Ð°Ñ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ð½Ð½Ñ" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" @@ -3522,6 +3638,27 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Додати вузол" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Ð”Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ñ—" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "Видалити точку шлÑху" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3566,6 +3703,31 @@ msgid "Triangle already exists" msgstr "Трикутник вже Ñ–Ñнує" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Додати змінну" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Змінити Ñ‡Ð°Ñ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ð½Ð½Ñ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Змінити Ñ‡Ð°Ñ Ð·Ð¼Ñ–ÑˆÑƒÐ²Ð°Ð½Ð½Ñ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "Видалити точку шлÑху" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Вилучити змінну" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D не належить до вузла AnimationTree." @@ -3574,6 +3736,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "Трикутників не Ñ–Ñнує, отже Ð·Ð»Ð¸Ñ‚Ñ‚Ñ Ð½Ðµ Ñ” можливим." #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Увімкнути Ð°Ð²Ñ‚Ð¾Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¸Ñ… Ñкриптів" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "Створити трикутники з'єднаннÑм точок." @@ -3591,6 +3758,11 @@ msgid "Blend:" msgstr "Змішувати:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "Зміни матеріалу" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "Редагувати фільтри" @@ -3600,6 +3772,17 @@ msgid "Output node can't be added to the blend tree." msgstr "Вузол Ð²Ð¸Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ð½Ðµ можна додавати до дерева злиттÑ." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "Додати вузли з дерева" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Режим переміщеннÑ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" @@ -3607,6 +3790,39 @@ msgstr "" "некоректним." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "З’єднано" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Роз'єднано" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Ðова анімаціÑ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Вилучити вузли" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Увімкнути або вимкнути цю доріжку." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Змінено фільтр локалі" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" "Ðе вÑтановлено відтворювача анімації, отже неможливо отримати назви доріжок." @@ -3627,6 +3843,12 @@ msgstr "" "неможливо отримати назви доріжок." #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Ðазва вузла" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "Додати вузол…" @@ -3853,6 +4075,21 @@ msgid "Cross-Animation Blend Times" msgstr "Ð§Ð°Ñ Ð¼Ñ–Ð¶ анімаціÑми" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Режим переміщеннÑ" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Додати переклад" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "Додати вузол" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "Кінець" @@ -3881,6 +4118,20 @@ msgid "No playback resource set at path: %s." msgstr "Ðе вÑтановлено реÑурÑу Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñƒ шлÑху: %s." #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Вилучити" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Вузол переходу" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4702,6 +4953,10 @@ msgstr "Утримуйте Shift, щоб змінити дотичні окреРmsgid "Bake GI Probe" msgstr "Запекти пробу GI" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "Елемент %d" @@ -5227,6 +5482,8 @@ msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." msgstr "" +"ПлоÑкий багатокутник має внутрішні вершини, отже його Ñ€ÐµÐ´Ð°Ð³ÑƒÐ²Ð°Ð½Ð½Ñ Ñƒ полі " +"переглÑду надалі не Ñ” можливим." #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5847,6 +6104,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "У цього каркаÑа немає кіÑток, Ñтворіть хоч ÑкіÑÑŒ дочірні вузли Bone2D." #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Створити вільну позу (з кіÑток)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "Створити вільну позу (з кіÑток)" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "ПлоÑкий каркаÑ" @@ -5955,10 +6222,6 @@ msgid "Vertices" msgstr "Вершини" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "Кадри за Ñекунду" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "ВиглÑд згори." @@ -6003,7 +6266,8 @@ msgid "Rear" msgstr "Ззаду" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "ВирівнÑти з переглÑдом" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6095,6 +6359,12 @@ msgid "Freelook Speed Modifier" msgstr "Коефіцієнт швидкоÑÑ‚Ñ– оглÑду" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "ÐžÐ±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð¿ÐµÑ€ÐµÐ³Ð»Ñду заблоковано" @@ -6103,6 +6373,11 @@ msgid "XForm Dialog" msgstr "Вікно XForm" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "Приліпити до підлоги" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "Режим Ð²Ð¸Ð´Ñ–Ð»ÐµÐ½Ð½Ñ (Q)" @@ -6384,10 +6659,6 @@ msgid "Add Empty" msgstr "Додати порожній" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "Змінити цикл анімації" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "Змінити чаÑтоту кадрів анімації" @@ -6713,6 +6984,11 @@ msgid "Erase bitmask." msgstr "Витерти бітову маÑку." #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "Створити вузли." + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "Створити новий полігон." @@ -6894,6 +7170,29 @@ msgid "TileSet" msgstr "Ðабір плиток" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "Ð’Ñтановити Ñк типове Ð´Ð»Ñ '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "VisualShader" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Дублювати вузли" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "Вершина" @@ -6909,6 +7208,16 @@ msgstr "Світло" msgid "VisualShader" msgstr "VisualShader" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "Редагувати пріоритетніÑÑ‚ÑŒ плитки" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "Зміни шейдерів" + #: editor/project_export.cpp msgid "Runnable" msgstr "Ðктивний" @@ -6922,9 +7231,17 @@ msgid "Delete preset '%s'?" msgstr "Вилучити набір «%s»?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" -"Ðе виÑтачає шаблонів екÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¸ або шаблони пошкоджено:" #: editor/project_export.cpp msgid "Release" @@ -6935,6 +7252,11 @@ msgid "Exporting All" msgstr "ЕкÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ ÑƒÑього" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" +"Ðе виÑтачає шаблонів екÑÐ¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð¸ або шаблони пошкоджено:" + +#: editor/project_export.cpp msgid "Presets" msgstr "Ðабори" @@ -7973,6 +8295,11 @@ msgid "Instantiated scenes can't become root" msgstr "Сцени зі Ñтвореними екземплÑрами не можуть Ñтавати кореневими" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "Зробити кореневим Ð´Ð»Ñ Ñцени" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Вилучити вузли?" @@ -8009,6 +8336,11 @@ msgid "Make Local" msgstr "Зробити локальним" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Зробити кореневим Ð´Ð»Ñ Ñцени" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Створити кореневий вузол:" @@ -8437,6 +8769,21 @@ msgid "Set From Tree" msgstr "Ð’Ñтановити з дерева" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "Перейти з" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "Клавіатурні ÑкороченнÑ" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "Змінити прив'Ñзки" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "Клавіатурні ÑкороченнÑ" @@ -8643,6 +8990,11 @@ msgid "GridMap Duplicate Selection" msgstr "Ð”ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¾Ð³Ð¾ GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "Параметри GridMap" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "Карта Ñітки" @@ -8943,10 +9295,6 @@ msgid "Change Expression" msgstr "Змінити вираз" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "Додати вузол" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "Вилучити вузли VisualScript" @@ -9031,6 +9379,11 @@ msgid "Change Input Value" msgstr "Зміна вхідного значеннÑ" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "Змінити розмір CanvasItem" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "Ðеможливо Ñкопіювати вузол функції." @@ -9819,9 +10172,8 @@ msgid "Switch between hexadecimal and code values." msgstr "ÐŸÐµÑ€ÐµÐ¼Ð¸ÐºÐ°Ð½Ð½Ñ Ð¼Ñ–Ð¶ шіÑтнадцÑтковими значеннÑми Ñ– кодами." #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "Додати поточний колір в ÑкоÑÑ‚Ñ– преÑету" +msgstr "Додати поточний колір Ñк шаблон." #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9916,6 +10268,9 @@ msgstr "ÐŸÑ€Ð¸Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð¾Ð´Ð½Ð¾Ñ€Ñ–Ð´Ð½Ð¾Ð³Ð¾." msgid "Varyings can only be assigned in vertex function." msgstr "Змінні величини можна пов'Ñзувати лише із функцією вузлів." +#~ msgid "FPS" +#~ msgstr "Кадри за Ñекунду" + #~ msgid "Warnings:" #~ msgstr "ПопередженнÑ:" @@ -10081,9 +10436,6 @@ msgstr "Змінні величини можна пов'Ñзувати лише #~ msgid "Convert To Lowercase" #~ msgstr "Конвертувати в нижній регіÑÑ‚Ñ€" -#~ msgid "Snap To Floor" -#~ msgstr "Приліпити до підлоги" - #~ msgid "Rotate 0 degrees" #~ msgstr "ÐžÐ±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° 0 градуÑів" diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index d77307b020..f3367675ef 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -87,6 +87,15 @@ msgstr "" msgid "Delete Selected Key(s)" msgstr "" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr ".تمام کا انتخاب" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "" @@ -116,6 +125,15 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Length" +msgstr "" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -165,6 +183,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -190,6 +212,10 @@ msgid "Time (s): " msgstr "" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "" @@ -241,6 +267,18 @@ msgid "Delete Key(s)" msgstr ".اینیمیشن Ú©ÛŒ کیز Ú©Ùˆ ڈیلیٹ کرو" #: editor/animation_track_editor.cpp +msgid "Change Animation Update Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Interpolation Mode" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Change Animation Loop Mode" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "" @@ -282,6 +320,14 @@ msgid "Anim Insert Key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Animation Step" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Rearrange Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -306,6 +352,10 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Bezier Track" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -314,10 +364,22 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Transform Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp +msgid "Add Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +msgid "Add Method Track Key" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -330,6 +392,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -372,10 +438,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "" @@ -476,6 +538,18 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +msgid "Add Audio Track Clip" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1275,6 +1349,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1826,6 +1906,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "" @@ -3417,12 +3505,46 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr ".تمام کا انتخاب" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr ".تمام کا انتخاب" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Animation Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr ".تمام کا انتخاب" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3462,6 +3584,27 @@ msgid "Triangle already exists" msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Add Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr ".تمام کا انتخاب" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3470,6 +3613,10 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Toggle Auto Triangles" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3487,6 +3634,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3496,11 +3647,50 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "ایکشن منتقل کریں" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Connected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Nodes Disconnected" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Set Animation" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr ".اینیمیشن Ú©ÛŒ کیز Ú©Ùˆ ڈیلیٹ کرو" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Toggle Filter On/Off" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr ".نوٹÙئر Ú©Û’ اکسٹنٹ Ú©Ùˆ تبدیل کیجیۓ" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3516,6 +3706,11 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Renamed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3743,6 +3938,20 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "ایکشن منتقل کریں" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Add Transition" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3772,6 +3981,18 @@ msgid "No playback resource set at path: %s." msgstr ".ÛŒÛ Ø±ÛŒØ³ÙˆØ±Ø³ Ùائل پر مبنی Ù†ÛÛŒ ÛÛ’" #: editor/plugins/animation_state_machine_editor.cpp +msgid "Node Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Transition Removed" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4584,6 +4805,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5738,6 +5963,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5847,10 +6080,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5895,8 +6124,9 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" -msgstr "" +#, fuzzy +msgid "Align with View" +msgstr ".تمام کا انتخاب" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." @@ -5987,6 +6217,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -5995,6 +6231,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6275,10 +6515,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6614,6 +6850,11 @@ msgstr ".تمام کا انتخاب" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "سب سکریپشن بنائیں" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "سب سکریپشن بنائیں" @@ -6790,6 +7031,26 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Duplicate Nodes" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6805,6 +7066,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6818,7 +7087,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6830,6 +7108,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7814,6 +8096,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -7848,6 +8134,10 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +msgid "New Scene Root" +msgstr "" + +#: editor/scene_tree_dock.cpp #, fuzzy msgid "Create Root Node:" msgstr "سب سکریپشن بنائیں" @@ -8270,6 +8560,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr ".تمام کا انتخاب" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8480,6 +8783,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8778,10 +9085,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8863,6 +9166,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index e7ae7be36f..f51007b85c 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -8,12 +8,13 @@ # Nguyá»…n Tuấn Anh <anhnt.fami@gmail.com>, 2017. # Tung Le <tungkradle@gmail.com>, 2017. # 38569459 <xxx38569459@gmail.com>, 2018. +# TyTYct Hihi <tytyct@gmail.com>, 2019. msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2018-12-13 14:44+0100\n" -"Last-Translator: 01lifeleft <01lifeleft@gmail.com>\n" +"PO-Revision-Date: 2019-03-01 11:59+0000\n" +"Last-Translator: TyTYct Hihi <tytyct@gmail.com>\n" "Language-Team: Vietnamese <https://hosted.weblate.org/projects/godot-engine/" "godot/vi/>\n" "Language: vi\n" @@ -21,7 +22,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 2.2\n" +"X-Generator: Weblate 3.5-dev\n" #: core/math/expression.cpp modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp @@ -89,6 +90,15 @@ msgstr "Nhân đôi lá»±a chá»n" msgid "Delete Selected Key(s)" msgstr "Xoá Key(s) được chá»n" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "Di chuyển đến..." + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "Nhân đôi Các Key của Animation" @@ -118,6 +128,16 @@ msgid "Anim Change Call" msgstr "Äổi Function Gá»i Animation" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "Äổi vòng lặp Anim" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -171,6 +191,11 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "Äổi giá trị Array" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -197,6 +222,10 @@ msgid "Time (s): " msgstr "BÆ°á»›c (s):" #: editor/animation_track_editor.cpp +msgid "Toggle Track Enabled" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "Liên tục" @@ -250,6 +279,21 @@ msgid "Delete Key(s)" msgstr "Xóa phÃm Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "Äổi Ä‘á»™ dà i Anim" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "Äổi Ä‘á»™ dà i Anim" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "Äổi vòng lặp Anim" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "Xóa Anim Track" @@ -291,6 +335,16 @@ msgid "Anim Insert Key" msgstr "Chèn Key Anim" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "Äổi vòng lặp Anim" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "Sắp xếp lại Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -315,6 +369,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "Thêm Track Animation" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -323,10 +382,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "Chèn Track & Key Anim" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "Thêm Track Animation" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "Chèn Track & Key Anim" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -339,6 +413,10 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "" + +#: editor/animation_track_editor.cpp #, fuzzy msgid "Anim Scale Keys" msgstr "Anim Scale Keys" @@ -385,10 +463,6 @@ msgid "Copy Tracks" msgstr "" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "Chá»n Scale" @@ -492,6 +566,19 @@ msgstr "" msgid "Copy" msgstr "Copy" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "Thêm Track Animation" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "Äổi lại size Array" @@ -1296,6 +1383,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1856,6 +1949,15 @@ msgid "Save changes to '%s' before closing?" msgstr "LÆ°u thay đổi và o '%s' trÆ°á»›c khi đóng?" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "LÆ°u animation nà y" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "LÆ°u Scene vá»›i tên..." @@ -2296,12 +2398,10 @@ msgid "Issue Tracker" msgstr "" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Community" msgstr "Cá»™ng đồng" #: editor/editor_node.cpp -#, fuzzy msgid "About" msgstr "Thông tin" @@ -3475,12 +3575,48 @@ msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "Di chuyển đến..." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "Äổi Thá»i gian Chuyển Animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "Äổi Thá»i gian Chuyển Animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "Di chuyển đến..." + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "Thêm Animation" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Remove BlendSpace1D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3522,6 +3658,30 @@ msgid "Triangle already exists" msgstr "Lá»–I: Tên animation trùng lặp!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "Thêm Biến" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "Äổi Thá»i gian Chuyển Animation" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "Äổi Thá»i gian Chuyển Animation" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Point" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "Xoá Variable" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3530,6 +3690,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "Báºt tắt Ưa thÃch" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3547,6 +3712,10 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Parameter Changed" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "" @@ -3556,11 +3725,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "Äổi tên" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "Äứt kết nối" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "Äứt kết nối" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "Tạo Animation má»›i" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "Xóa Node(s)" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "Báºt tắt Ưa thÃch" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "Äổi" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3576,6 +3788,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "Äổi tên" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3809,6 +4027,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "Di chuyển Node(s)" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "Chuyển tiếp: " + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3837,6 +4070,20 @@ msgid "No playback resource set at path: %s." msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "Xóa" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "Chuyển tiếp: " + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4650,6 +4897,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5812,6 +6063,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "Tạo từ Scene" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -5921,10 +6181,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -5969,7 +6225,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6061,6 +6317,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6069,6 +6331,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "" @@ -6346,10 +6612,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6686,6 +6948,11 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "Tạo nodes má»›i." + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "Tạo" @@ -6863,6 +7130,27 @@ msgid "TileSet" msgstr "Xuất Tile Set" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "Nhân đôi Node(s)" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6878,6 +7166,14 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Edit Visual Property" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -6891,7 +7187,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -6903,6 +7208,10 @@ msgid "Exporting All" msgstr "" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -7527,7 +7836,6 @@ msgid "Project Settings (project.godot)" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -#, fuzzy msgid "General" msgstr "Tổng quan" @@ -7896,6 +8204,10 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +msgid "Make node as Root" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "Xóa Node(s)?" @@ -7930,6 +8242,11 @@ msgid "Make Local" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "Tạo Scene Má»›i" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "Tạo Root Node:" @@ -8344,6 +8661,18 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +msgid "Erase Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8552,6 +8881,10 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -8847,10 +9180,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -8933,6 +9262,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -9799,9 +10132,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "Ngoà i-Trong" -#~ msgid "Change Anim Loop" -#~ msgstr "Äổi vòng lặp Anim" - #~ msgid "Anim Create Typed Value Key" #~ msgstr "Tạo Key để nháºp giá trị Anim" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index 770b249d11..f4fa330de9 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -45,7 +45,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-02-18 08:54+0000\n" +"PO-Revision-Date: 2019-02-21 21:17+0000\n" "Last-Translator: yzt <834950797@qq.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" @@ -120,6 +120,16 @@ msgstr "å¤åˆ¶å·²é€‰å¸§" msgid "Delete Selected Key(s)" msgstr "åˆ é™¤å·²é€‰å¸§" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "æ·»åŠ é¡¶ç‚¹" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "移动点" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "å¤åˆ¶å…³é”®å¸§" @@ -149,6 +159,16 @@ msgid "Anim Change Call" msgstr "修改回调" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "修改循环" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "修改循环" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "属性轨é“" @@ -198,6 +218,11 @@ msgid "Anim Clips:" msgstr "动画剪辑：" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "修改数组值" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "切æ¢å½“å‰è½¨é“开关。" @@ -222,6 +247,11 @@ msgid "Time (s): " msgstr "时间（秒）： " #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "å¯ç”¨å¤šæ™®å‹’效应" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "è¿žç»" @@ -272,6 +302,21 @@ msgid "Delete Key(s)" msgstr "åˆ é™¤å¸§" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "é‡å‘½å动画:" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "æ’值模å¼" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "修改循环" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "移除轨é“" @@ -313,6 +358,16 @@ msgid "Anim Insert Key" msgstr "æ’入关键帧" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "修改FPS" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "é‡æŽ’åºAutoload" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "å˜æ¢è½¨è¿¹ä»…适用于基于空间的节点。" @@ -341,6 +396,11 @@ msgid "Not possible to add a new track without a root" msgstr "æ— æ³•åœ¨æ²¡æœ‰rootçš„æƒ…å†µä¸‹æ·»åŠ æ–°è½¨é“" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "æ·»åŠ è½¨é“" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "轨é“è·¯å¾„æ— æ•ˆï¼Œå› æ¤æ— æ³•æ·»åŠ é”®ã€‚" @@ -349,10 +409,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "Trackä¸æ˜¯Spatial类型，ä¸èƒ½ä½œä¸ºé”®å€¼æ’å…¥" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "3Då˜æ¢è½¨é“" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "æ·»åŠ è½¨é“" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "è·Ÿè¸ªè·¯å¾„æ— æ•ˆï¼Œæ‰€ä»¥ä¸èƒ½æ·»åŠ 方法帧。" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "调用方法轨é“" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "方法未找到： " @@ -365,6 +440,10 @@ msgid "Clipboard is empty" msgstr "剪贴æ¿æ˜¯ç©ºçš„" #: editor/animation_track_editor.cpp +msgid "Paste Tracks" +msgstr "粘贴轨é“" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "缩放关键帧" @@ -407,10 +486,6 @@ msgid "Copy Tracks" msgstr "å¤åˆ¶è½¨é“" #: editor/animation_track_editor.cpp -msgid "Paste Tracks" -msgstr "粘贴轨é“" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "缩放选ä¸é¡¹" @@ -510,6 +585,19 @@ msgstr "选择è¦å¤åˆ¶çš„轨é“：" msgid "Copy" msgstr "å¤åˆ¶" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "音频剪辑：" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "修改数组大å°" @@ -579,9 +667,8 @@ msgid "Warnings" msgstr "è¦å‘Š" #: editor/code_editor.cpp -#, fuzzy msgid "Line and column numbers." -msgstr "è¡Œå·å’Œåˆ—å·" +msgstr "è¡Œå·å’Œåˆ—å·ã€‚" #: editor/connections_dialog.cpp msgid "Method in target Node must be specified!" @@ -1129,9 +1216,8 @@ msgid "Add Bus" msgstr "æ·»åŠ Bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add a new Audio Bus to this layout." -msgstr "将音频Bus布局ä¿å˜ä¸º..." +msgstr "å°†æ–°çš„éŸ³é¢‘æ€»çº¿æ·»åŠ åˆ°æ¤å¸ƒå±€ã€‚" #: editor/editor_audio_buses.cpp editor/editor_properties.cpp #: editor/plugins/animation_player_editor_plugin.cpp editor/property_editor.cpp @@ -1306,6 +1392,12 @@ msgstr "ç›®æ ‡è·¯å¾„æ‰¾ä¸åˆ°å¯¼å‡ºæ¨¡ç‰ˆï¼š" msgid "Packing" msgstr "打包ä¸" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1870,6 +1962,16 @@ msgid "Save changes to '%s' before closing?" msgstr "在关é—å‰ä¿å˜æ›´æ”¹åˆ° %s å—？" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "åŠ è½½èµ„æºå¤±è´¥ã€‚" + +#: editor/editor_node.cpp +#, fuzzy +msgid "A root node is required to save the scene." +msgstr "大图导入仅支æŒä¸€ä¸ªè¾“入文件。" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "场景å¦å˜ä¸º..." @@ -2369,9 +2471,8 @@ msgid "Save & Restart" msgstr "ä¿å˜å¹¶é‡å¯" #: editor/editor_node.cpp -#, fuzzy msgid "Spins when the editor window redraws." -msgstr "旋转时，é‡æ–°ç»˜åˆ¶ç¼–辑器窗å£ï¼" +msgstr "编辑器窗å£é‡ç»˜æ—¶æ—‹è½¬ã€‚" #: editor/editor_node.cpp msgid "Update Always" @@ -3469,12 +3570,49 @@ msgstr "åŠ è½½..." #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "移动点" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Limits" +msgstr "更改混åˆæ—¶é—´" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Change BlendSpace1D Labels" +msgstr "更改混åˆæ—¶é—´" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "æ¤ç±»åž‹çš„节点ä¸èƒ½è¢«ä½¿ç”¨ã€‚ä»…å…è®¸ä½¿ç”¨æ ¹èŠ‚ç‚¹ã€‚" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "æ·»åŠ èŠ‚ç‚¹" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "æ·»åŠ åŠ¨ç”»" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "移除路径顶点" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3516,6 +3654,31 @@ msgid "Triangle already exists" msgstr "三角形已ç»å˜åœ¨" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "æ·»åŠ å˜é‡" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Limits" +msgstr "更改混åˆæ—¶é—´" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Change BlendSpace2D Labels" +msgstr "更改混åˆæ—¶é—´" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "移除路径顶点" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Triangle" +msgstr "åˆ é™¤å˜é‡" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "BlendSpace2D ä¸å±žäºŽä»»ä½• AnimationTree 节点。" @@ -3524,6 +3687,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "ä¸å˜åœ¨ä»»ä½•ä¸‰è§’å½¢ï¼Œå› æ¤ä¸ä¼šæœ‰ä»»ä½•æ··æ•ˆæžœåˆäº§ç”Ÿã€‚" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "切æ¢å…¨å±€AutoLoad" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "通过连接点创建三角形。" @@ -3541,6 +3709,11 @@ msgid "Blend:" msgstr "æ··åˆ:" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "æè´¨å˜æ›´" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp msgid "Edit Filters" msgstr "编辑ç›é€‰å™¨" @@ -3550,11 +3723,55 @@ msgid "Output node can't be added to the blend tree." msgstr "输出节点ä¸èƒ½è¢«æ·»åŠ 到混åˆæ ‘。" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "ä»Žæ ‘ä¸æ·»åŠ 节点" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "移动模å¼" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "æ— æ³•è¿žæŽ¥ï¼Œç«¯å£å¯èƒ½è¢«å ç”¨æˆ–è€…è¿žæŽ¥æ— æ•ˆã€‚" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "已连接" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "å·²æ–å¼€" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "新建动画" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "åˆ é™¤èŠ‚ç‚¹" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "切æ¢å½“å‰è½¨é“开关。" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "修改区域设置ç›é€‰æ¨¡å¼" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "没有设置动画æ’æ”¾å™¨ï¼Œå› æ¤æ— 法获å–轨é“å称。" @@ -3570,6 +3787,12 @@ msgid "" msgstr "动画æ’放器没有åˆæ³•çš„æ ¹èŠ‚ç‚¹è·¯å¾„ï¼Œå› æ¤æ— 法获å–轨é“å称。" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "节点å称" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "æ·»åŠ èŠ‚ç‚¹.." @@ -3795,6 +4018,21 @@ msgid "Cross-Animation Blend Times" msgstr "跨动画时间混åˆ" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "移动模å¼" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "æ·»åŠ è¯è¨€" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "æ·»åŠ èŠ‚ç‚¹" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "终点" @@ -3823,6 +4061,20 @@ msgid "No playback resource set at path: %s." msgstr "在路径： %s 下没有任何æ’放资æºã€‚" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "已移除:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "过渡节点" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4629,6 +4881,10 @@ msgstr "æŒ‰ä½ Shift å¯å•ç‹¬ç¼–辑切线" msgid "Bake GI Probe" msgstr "渲染GI Probe" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "第%d项" @@ -5150,7 +5406,7 @@ msgstr "创建UV贴图" msgid "" "Polygon 2D has internal vertices, so it can no longer be edited in the " "viewport." -msgstr "" +msgstr "多边形2d 具有内部顶点, å› æ¤ä¸èƒ½å†åœ¨è§†å£ä¸å¯¹å…¶è¿›è¡Œç¼–辑。" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create Polygon & UV" @@ -5768,6 +6024,16 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "该骨架没有骨骼绑定，请创建一些 Bone2D 骨骼å节点。" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "制作放æ¾å§¿åŠ¿ï¼ˆä»Žéª¨éª¼ï¼‰" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Set Rest Pose to Bones" +msgstr "制作放æ¾å§¿åŠ¿ï¼ˆä»Žéª¨éª¼ï¼‰" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "2D 骨骼节点" @@ -5876,10 +6142,6 @@ msgid "Vertices" msgstr "顶点" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "帧数" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "俯视图(Top View)。" @@ -5924,7 +6186,8 @@ msgid "Rear" msgstr "åŽæ–¹" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +#, fuzzy +msgid "Align with View" msgstr "与视图对é½" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6016,6 +6279,12 @@ msgid "Freelook Speed Modifier" msgstr "自由视图速度调整" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "é”定视角旋转" @@ -6024,6 +6293,11 @@ msgid "XForm Dialog" msgstr "XForm对è¯æ¡†" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Snap Nodes To Floor" +msgstr "å¸é™„到地é¢" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Select Mode (Q)" msgstr "é€‰æ‹©æ¨¡å¼ (Q)" @@ -6303,10 +6577,6 @@ msgid "Add Empty" msgstr "æ·»åŠ ç©ºç™½å¸§" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "修改循环" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "修改FPS" @@ -6632,6 +6902,11 @@ msgid "Erase bitmask." msgstr "擦除ä½æŽ©ç 。" #: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Create a new rectangle." +msgstr "创建新节点。" + +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Create a new polygon." msgstr "创建新多边形。" @@ -6809,6 +7084,29 @@ msgid "TileSet" msgstr "瓦片集" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Set Input Default Port" +msgstr "将默认设置为 '%s'" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Add Node to Visual Shader" +msgstr "å¯è§†ç€è‰²å™¨" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "å¤åˆ¶èŠ‚点" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "顶点" @@ -6824,6 +7122,16 @@ msgstr "ç¯å…‰" msgid "VisualShader" msgstr "å¯è§†ç€è‰²å™¨" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "编辑ç£è´´ä¼˜å…ˆçº§" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "ç€è‰²å™¨å˜æ›´" + #: editor/project_export.cpp msgid "Runnable" msgstr "å¯æ‰§è¡Œçš„" @@ -6837,8 +7145,17 @@ msgid "Delete preset '%s'?" msgstr "åˆ é™¤å½“å‰çš„ '%s' ?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" -msgstr "没有æ¤å¹³å°çš„导出模æ¿:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." +msgstr "" #: editor/project_export.cpp msgid "Release" @@ -6849,6 +7166,10 @@ msgid "Exporting All" msgstr "全部导出" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "没有æ¤å¹³å°çš„导出模æ¿:" + +#: editor/project_export.cpp msgid "Presets" msgstr "预设" @@ -7857,6 +8178,11 @@ msgid "Instantiated scenes can't become root" msgstr "实例化的场景ä¸èƒ½æˆä¸ºæ ¹èŠ‚点" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "åˆ›å»ºåœºæ™¯æ ¹èŠ‚ç‚¹" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "确定è¦åˆ 除节点å—？" @@ -7891,6 +8217,11 @@ msgid "Make Local" msgstr "使用本地" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "New Scene Root" +msgstr "åˆ›å»ºåœºæ™¯æ ¹èŠ‚ç‚¹" + +#: editor/scene_tree_dock.cpp msgid "Create Root Node:" msgstr "åˆ›å»ºæ ¹èŠ‚ç‚¹ï¼š" @@ -8315,6 +8646,21 @@ msgid "Set From Tree" msgstr "ä»Žåœºæ™¯æ ‘è®¾ç½®" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "æ¸å‡º" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "å¿«æ·é”®" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "编辑锚点" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "å¿«æ·é”®" @@ -8519,6 +8865,10 @@ msgid "GridMap Duplicate Selection" msgstr "å¤åˆ¶é€‰ä¸é¡¹" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Paint" +msgstr "ç»˜åˆ¶æ …æ ¼å›¾" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "ç½‘æ ¼æ˜ å°„" @@ -8814,10 +9164,6 @@ msgid "Change Expression" msgstr "更改表达å¼" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "æ·»åŠ èŠ‚ç‚¹" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "åˆ é™¤ VisualScript 节点" @@ -8898,6 +9244,11 @@ msgid "Change Input Value" msgstr "更改输入值" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Resize Comment" +msgstr "调整 CanvasItem 尺寸" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "æ— æ³•å¤åˆ¶å‡½æ•°èŠ‚点。" @@ -9615,9 +9966,8 @@ msgid "Switch between hexadecimal and code values." msgstr "在åå…进制值和代ç 值之间切æ¢ã€‚" #: scene/gui/color_picker.cpp -#, fuzzy msgid "Add current color as a preset." -msgstr "将当å‰é¢œè‰²æ·»åŠ 为预设" +msgstr "将当å‰é¢œè‰²æ·»åŠ 为预设。" #: scene/gui/dialogs.cpp msgid "Alert!" @@ -9706,6 +10056,9 @@ msgstr "对uniform的赋值。" msgid "Varyings can only be assigned in vertex function." msgstr "å˜é‡åªèƒ½åœ¨é¡¶ç‚¹å‡½æ•°ä¸æŒ‡å®šã€‚" +#~ msgid "FPS" +#~ msgstr "帧数" + #~ msgid "Warnings:" #~ msgstr "è¦å‘Šï¼š" @@ -9876,9 +10229,6 @@ msgstr "å˜é‡åªèƒ½åœ¨é¡¶ç‚¹å‡½æ•°ä¸æŒ‡å®šã€‚" #~ msgid "Convert To Lowercase" #~ msgstr "转æ¢ä¸ºå°å†™" -#~ msgid "Snap To Floor" -#~ msgstr "å¸é™„到地é¢" - #~ msgid "Rotate 0 degrees" #~ msgstr "旋转0度" @@ -10414,9 +10764,6 @@ msgstr "å˜é‡åªèƒ½åœ¨é¡¶ç‚¹å‡½æ•°ä¸æŒ‡å®šã€‚" #~ msgid "Added:" #~ msgstr "å·²æ·»åŠ :" -#~ msgid "Removed:" -#~ msgstr "已移除:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "æ— æ³•ä¿å˜ç²¾çµé›†å贴图:" @@ -10681,9 +11028,6 @@ msgstr "å˜é‡åªèƒ½åœ¨é¡¶ç‚¹å‡½æ•°ä¸æŒ‡å®šã€‚" #~ msgid "Error importing:" #~ msgstr "导入出错:" -#~ msgid "Only one file is required for large texture." -#~ msgstr "大图导入仅支æŒä¸€ä¸ªè¾“入文件。" - #~ msgid "Max Texture Size:" #~ msgstr "最大纹ç†å°ºå¯¸:" @@ -10912,9 +11256,6 @@ msgstr "å˜é‡åªèƒ½åœ¨é¡¶ç‚¹å‡½æ•°ä¸æŒ‡å®šã€‚" #~ msgid "Edit Groups" #~ msgstr "编辑分组" -#~ msgid "GridMap Paint" -#~ msgstr "ç»˜åˆ¶æ …æ ¼å›¾" - #~ msgid "Tiles" #~ msgstr "ç –å—（Tiles）" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 6e72949b92..662dbaddf2 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -88,6 +88,16 @@ msgstr "複製 Selection" msgid "Delete Selected Key(s)" msgstr "刪除é¸ä¸æª”案" +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Add Bezier Point" +msgstr "新增訊號" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "下移" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "複製動畫幀" @@ -119,6 +129,16 @@ msgid "Anim Change Call" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "更改動畫å稱：" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -172,6 +192,10 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +msgid "Change Track Path" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -199,6 +223,11 @@ msgid "Time (s): " msgstr "時間：" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "啟用" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "連續" @@ -253,6 +282,21 @@ msgid "Delete Key(s)" msgstr "移除動畫幀" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "更改動畫å稱：" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "無干擾模å¼" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "更改動畫循環" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "移除動畫軌跡" @@ -301,6 +345,16 @@ msgid "Anim Insert Key" msgstr "å‹•æ™æ’入關éµå¹€ï¼Ÿ" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "更改動畫å稱：" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "é‡æ–°æŽ’例Autoloads" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -325,6 +379,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "新增動畫軌跡" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -333,10 +392,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "æ’入軌跡和關éµå¹€" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "新增動畫軌跡" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "æ’入軌跡和關éµå¹€" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -350,6 +424,11 @@ msgid "Clipboard is empty" msgstr "路徑為空" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "貼上åƒæ•¸" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -396,11 +475,6 @@ msgid "Copy Tracks" msgstr "複製åƒæ•¸" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "貼上åƒæ•¸" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "縮放selection" @@ -513,6 +587,19 @@ msgstr "" msgid "Copy" msgstr "複製" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "新增動畫軌跡" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "" @@ -1357,6 +1444,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1952,6 +2045,15 @@ msgid "Save changes to '%s' before closing?" msgstr "關閉å‰è¦å…ˆå„²å˜å° '%s' 任何更改嗎？" #: editor/editor_node.cpp +#, fuzzy +msgid "Saved %s modified resource(s)." +msgstr "資æºåŠ 載失敗。" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "æŠŠå ´æ™¯å¦å˜ç‚º" @@ -3641,12 +3743,47 @@ msgstr "載入" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "下移" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "新增節點" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "新增動畫" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "åªé™é¸ä¸" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3688,6 +3825,28 @@ msgid "Triangle already exists" msgstr "錯誤：動畫å稱已å˜åœ¨ï¼" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "新增動畫軌跡" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "åªé™é¸ä¸" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3696,6 +3855,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "é–‹ï¼é—œè‡ªå‹•æ’放" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3713,6 +3877,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "當改變時更新" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3723,11 +3892,55 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Add Node to BlendTree" +msgstr "由主幹新增節點" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "移動模å¼" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "連到" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "ä¸æ–·" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "æ–°çš„å‹•ç•«å稱：" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "ä¸é¸" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "（ä¸ï¼‰é¡¯ç¤ºæœ€æ„›" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "更改動畫長度" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3743,6 +3956,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "有效å稱" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp #, fuzzy msgid "Add Node..." @@ -3982,6 +4201,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "移動模å¼" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "éŽæ¸¡" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "新增節點" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -4011,6 +4245,20 @@ msgid "No playback resource set at path: %s." msgstr "ä¸åœ¨è³‡æºè·¯å¾‘。" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "已移除：" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "éŽæ¸¡" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4839,6 +5087,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -6029,6 +6281,15 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +#, fuzzy +msgid "Create Rest Pose from Bones" +msgstr "é‹è¡Œå ´æ™¯" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp msgid "Skeleton2D" msgstr "" @@ -6143,10 +6404,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6191,7 +6448,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6288,6 +6545,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "View Rotation Locked" msgstr "本地化" @@ -6297,6 +6560,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "é¸æ“‡æ¨¡å¼" @@ -6583,10 +6850,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6930,6 +7193,11 @@ msgstr "縮放selection" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "新增" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "縮放selection" @@ -7114,6 +7382,27 @@ msgid "TileSet" msgstr "TileSet..." #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "複製動畫幀" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -7129,6 +7418,16 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "檔案" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Visual Shader Mode Changed" +msgstr "當改變時更新" + #: editor/project_export.cpp #, fuzzy msgid "Runnable" @@ -7145,7 +7444,16 @@ msgid "Delete preset '%s'?" msgstr "è¦åˆªé™¤é¸ä¸æª”案?" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7158,6 +7466,10 @@ msgid "Exporting All" msgstr "匯出" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8176,6 +8488,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "儲å˜å ´æ™¯" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8211,6 +8528,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "儲å˜å ´æ™¯" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "新增資料夾" @@ -8649,6 +8971,19 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "縮放selection" + +#: editor/settings_config_dialog.cpp +msgid "Restore Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Change Shortcut" +msgstr "" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "" @@ -8862,6 +9197,11 @@ msgid "GridMap Duplicate Selection" msgstr "複製 Selection" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "è¨å®š" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9171,10 +9511,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "新增節點" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9261,6 +9597,10 @@ msgid "Change Input Value" msgstr "動畫變化數值" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10157,17 +10497,6 @@ msgstr "" #~ msgid "Anim Add Key" #~ msgstr "新增動畫幀" -#~ msgid "Transitions" -#~ msgstr "éŽæ¸¡" - -#, fuzzy -#~ msgid "Change Anim Len" -#~ msgstr "更改動畫長度" - -#, fuzzy -#~ msgid "Change Anim Loop" -#~ msgstr "更改動畫循環" - #~ msgid "Length (s):" #~ msgstr "時長（秒）：" @@ -10302,9 +10631,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "å·²åŠ å…¥ï¼š" -#~ msgid "Removed:" -#~ msgstr "已移除：" - #, fuzzy #~ msgid "Tiles" #~ msgstr "檔案" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 4d9b3b578f..e267264d11 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -93,6 +93,15 @@ msgstr "複製所é¸ç•«æ ¼" msgid "Delete Selected Key(s)" msgstr "刪除所é¸ç•«æ ¼" +#: editor/animation_bezier_editor.cpp +msgid "Add Bezier Point" +msgstr "" + +#: editor/animation_bezier_editor.cpp +#, fuzzy +msgid "Move Bezier Points" +msgstr "移除" + #: editor/animation_bezier_editor.cpp editor/animation_track_editor.cpp msgid "Anim Duplicate Keys" msgstr "複製關éµç•«æ ¼" @@ -122,6 +131,16 @@ msgid "Anim Change Call" msgstr "更改回調" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Length" +msgstr "變更動畫長度" + +#: editor/animation_track_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/animation_track_editor.cpp msgid "Property Track" msgstr "" @@ -173,6 +192,11 @@ msgid "Anim Clips:" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Track Path" +msgstr "調整陣列資料" + +#: editor/animation_track_editor.cpp msgid "Toggle this track on/off." msgstr "" @@ -199,6 +223,11 @@ msgid "Time (s): " msgstr "æ¥é©Ÿ :" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Toggle Track Enabled" +msgstr "啟用" + +#: editor/animation_track_editor.cpp msgid "Continuous" msgstr "連續" @@ -251,6 +280,21 @@ msgid "Delete Key(s)" msgstr "刪除動畫關éµç•«æ ¼" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Update Mode" +msgstr "改變å—å…¸ value" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Interpolation Mode" +msgstr "改變å—å…¸ value" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Loop Mode" +msgstr "變更動畫迴圈" + +#: editor/animation_track_editor.cpp msgid "Remove Anim Track" msgstr "刪除動畫軌" @@ -293,6 +337,16 @@ msgid "Anim Insert Key" msgstr "新增關éµç•«æ ¼" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Change Animation Step" +msgstr "變更動畫長度" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Rearrange Tracks" +msgstr "é‡æ–°æŽ’列 Autoload" + +#: editor/animation_track_editor.cpp msgid "Transform tracks only apply to Spatial-based nodes." msgstr "" @@ -317,6 +371,11 @@ msgid "Not possible to add a new track without a root" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Bezier Track" +msgstr "æ·»åŠ å‹•ç•«è»Œ" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a key." msgstr "" @@ -325,10 +384,25 @@ msgid "Track is not of type Spatial, can't insert key" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Transform Track Key" +msgstr "動畫新增軌跡與按éµ" + +#: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Track Key" +msgstr "æ·»åŠ å‹•ç•«è»Œ" + +#: editor/animation_track_editor.cpp msgid "Track path is invalid, so can't add a method key." msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Add Method Track Key" +msgstr "動畫新增軌跡與按éµ" + +#: editor/animation_track_editor.cpp msgid "Method not found in object: " msgstr "" @@ -341,6 +415,11 @@ msgid "Clipboard is empty" msgstr "" #: editor/animation_track_editor.cpp +#, fuzzy +msgid "Paste Tracks" +msgstr "貼上åƒæ•¸" + +#: editor/animation_track_editor.cpp msgid "Anim Scale Keys" msgstr "" @@ -387,11 +466,6 @@ msgid "Copy Tracks" msgstr "複製åƒæ•¸" #: editor/animation_track_editor.cpp -#, fuzzy -msgid "Paste Tracks" -msgstr "貼上åƒæ•¸" - -#: editor/animation_track_editor.cpp msgid "Scale Selection" msgstr "縮放所é¸" @@ -495,6 +569,19 @@ msgstr "" msgid "Copy" msgstr "" +#: editor/animation_track_editor_plugins.cpp +#, fuzzy +msgid "Add Audio Track Clip" +msgstr "æ·»åŠ å‹•ç•«è»Œ" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip Start Offset" +msgstr "" + +#: editor/animation_track_editor_plugins.cpp +msgid "Change Audio Track Clip End Offset" +msgstr "" + #: editor/array_property_edit.cpp msgid "Resize Array" msgstr "調整陣列大å°" @@ -1324,6 +1411,12 @@ msgstr "" msgid "Packing" msgstr "" +#: editor/editor_export.cpp +msgid "" +"Target platform requires 'ETC' texture compression for GLES2. Enable support " +"in Project Settings." +msgstr "" + #: editor/editor_export.cpp platform/android/export/export.cpp #: platform/iphone/export/export.cpp platform/javascript/export/export.cpp #: platform/osx/export/export.cpp platform/uwp/export/export.cpp @@ -1896,6 +1989,14 @@ msgid "Save changes to '%s' before closing?" msgstr "" #: editor/editor_node.cpp +msgid "Saved %s modified resource(s)." +msgstr "" + +#: editor/editor_node.cpp +msgid "A root node is required to save the scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Save Scene As..." msgstr "å¦å˜å ´æ™¯ç‚º..." @@ -3545,12 +3646,47 @@ msgstr "載入" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Move Node Point" +msgstr "移除" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Change BlendSpace1D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "This type of node can't be used. Only root nodes are allowed." msgstr "" #: editor/plugins/animation_blend_space_1d_editor.cpp #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Node Point" +msgstr "移除" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Animation Point" +msgstr "動畫空間。" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace1D Point" +msgstr "移除" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +msgid "Move BlendSpace1D Node Point" +msgstr "" + +#: editor/plugins/animation_blend_space_1d_editor.cpp +#: editor/plugins/animation_blend_space_2d_editor.cpp #: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_state_machine_editor.cpp msgid "" @@ -3592,6 +3728,28 @@ msgid "Triangle already exists" msgstr "Autoload「%sã€å·²ç¶“å˜åœ¨!" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Add Triangle" +msgstr "æ·»åŠ å‹•ç•«è»Œ" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Limits" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Change BlendSpace2D Labels" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Remove BlendSpace2D Point" +msgstr "移除" + +#: editor/plugins/animation_blend_space_2d_editor.cpp +msgid "Remove BlendSpace2D Triangle" +msgstr "" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "BlendSpace2D does not belong to an AnimationTree node." msgstr "" @@ -3600,6 +3758,11 @@ msgid "No triangles exist, so no blending can take place." msgstr "" #: editor/plugins/animation_blend_space_2d_editor.cpp +#, fuzzy +msgid "Toggle Auto Triangles" +msgstr "切æ›æœ€æ„›" + +#: editor/plugins/animation_blend_space_2d_editor.cpp msgid "Create triangles by connecting points." msgstr "" @@ -3617,6 +3780,11 @@ msgid "Blend:" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Parameter Changed" +msgstr "æ£åœ¨å„²å˜è®Šæ›´..." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/animation_tree_player_editor_plugin.cpp #, fuzzy msgid "Edit Filters" @@ -3627,11 +3795,54 @@ msgid "Output node can't be added to the blend tree." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +msgid "Add Node to BlendTree" +msgstr "" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Node Moved" +msgstr "節點å稱:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Unable to connect, port may be in use or connection may be invalid." msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Connected" +msgstr "連接..." + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Nodes Disconnected" +msgstr "æ–·ç·š" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Set Animation" +msgstr "動畫最佳化" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Delete Node" +msgstr "刪除" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Toggle Filter On/Off" +msgstr "切æ›æœ€æ„›" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp +#, fuzzy +msgid "Change Filter" +msgstr "變更é¡é 尺寸" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp msgid "No animation player set, so unable to retrieve track names." msgstr "" @@ -3647,6 +3858,12 @@ msgid "" msgstr "" #: editor/plugins/animation_blend_tree_editor_plugin.cpp +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Renamed" +msgstr "節點å稱:" + +#: editor/plugins/animation_blend_tree_editor_plugin.cpp #: editor/plugins/visual_shader_editor_plugin.cpp msgid "Add Node..." msgstr "" @@ -3880,6 +4097,21 @@ msgid "Cross-Animation Blend Times" msgstr "" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Move Node" +msgstr "移動 Autoload" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Add Transition" +msgstr "è½‰å ´" + +#: editor/plugins/animation_state_machine_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "End" msgstr "" @@ -3909,6 +4141,20 @@ msgid "No playback resource set at path: %s." msgstr "在資æºè·¯å¾‘ä¸æ‰¾ä¸åˆ°" #: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Node Removed" +msgstr "已刪除:" + +#: editor/plugins/animation_state_machine_editor.cpp +#, fuzzy +msgid "Transition Removed" +msgstr "è½‰å ´" + +#: editor/plugins/animation_state_machine_editor.cpp +msgid "Set Start Node (Autoplay)" +msgstr "" + +#: editor/plugins/animation_state_machine_editor.cpp msgid "" "Select and move nodes.\n" "RMB to add new nodes.\n" @@ -4728,6 +4974,10 @@ msgstr "" msgid "Bake GI Probe" msgstr "" +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Gradient Edited" +msgstr "" + #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" msgstr "" @@ -5911,6 +6161,14 @@ msgid "This skeleton has no bones, create some children Bone2D nodes." msgstr "" #: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Create Rest Pose from Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp +msgid "Set Rest Pose to Bones" +msgstr "" + +#: editor/plugins/skeleton_2d_editor_plugin.cpp #, fuzzy msgid "Skeleton2D" msgstr "單例" @@ -6023,10 +6281,6 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Top View." msgstr "" @@ -6071,7 +6325,7 @@ msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Align with view" +msgid "Align with View" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -6166,6 +6420,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Note: The FPS value displayed is the editor's framerate.\n" +"It cannot be used as a reliable indication of in-game performance." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "View Rotation Locked" msgstr "" @@ -6174,6 +6434,10 @@ msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Nodes To Floor" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Select Mode (Q)" msgstr "僅é¸æ“‡å€åŸŸ" @@ -6456,10 +6720,6 @@ msgid "Add Empty" msgstr "" #: editor/plugins/sprite_frames_editor_plugin.cpp -msgid "Change Animation Loop" -msgstr "" - -#: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Change Animation FPS" msgstr "" @@ -6800,6 +7060,11 @@ msgstr "所有的é¸æ“‡" #: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy +msgid "Create a new rectangle." +msgstr "新增 %s" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy msgid "Create a new polygon." msgstr "新增資料夾" @@ -6981,6 +7246,27 @@ msgid "TileSet" msgstr "" #: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Uniform Name" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Set Input Default Port" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Add Node to Visual Shader" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Duplicate Nodes" +msgstr "複製動畫關éµç•«æ ¼" + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Input Type Changed" +msgstr "" + +#: editor/plugins/visual_shader_editor_plugin.cpp msgid "Vertex" msgstr "" @@ -6997,6 +7283,15 @@ msgstr "" msgid "VisualShader" msgstr "" +#: editor/plugins/visual_shader_editor_plugin.cpp +#, fuzzy +msgid "Edit Visual Property" +msgstr "éŽæ¿¾æª”案..." + +#: editor/plugins/visual_shader_editor_plugin.cpp +msgid "Visual Shader Mode Changed" +msgstr "" + #: editor/project_export.cpp msgid "Runnable" msgstr "" @@ -7010,7 +7305,16 @@ msgid "Delete preset '%s'?" msgstr "" #: editor/project_export.cpp -msgid "Export templates for this platform are missing/corrupted:" +msgid "" +"Failed to export the project for platform '%s'.\n" +"Export templates seem to be missing or invalid." +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Failed to export the project for platform '%s'.\n" +"This might be due to a configuration issue in the export preset or your " +"export settings." msgstr "" #: editor/project_export.cpp @@ -7023,6 +7327,10 @@ msgid "Exporting All" msgstr "輸出" #: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp msgid "Presets" msgstr "" @@ -8029,6 +8337,11 @@ msgid "Instantiated scenes can't become root" msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Make node as Root" +msgstr "儲å˜å ´æ™¯" + +#: editor/scene_tree_dock.cpp msgid "Delete Node(s)?" msgstr "" @@ -8064,6 +8377,11 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "New Scene Root" +msgstr "儲å˜å ´æ™¯" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Create Root Node:" msgstr "新增資料夾" @@ -8495,6 +8813,21 @@ msgid "Set From Tree" msgstr "" #: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Erase Shortcut" +msgstr "æ·å¾‘" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Restore Shortcut" +msgstr "æ·å¾‘" + +#: editor/settings_config_dialog.cpp +#, fuzzy +msgid "Change Shortcut" +msgstr "æ·å¾‘" + +#: editor/settings_config_dialog.cpp msgid "Shortcuts" msgstr "æ·å¾‘" @@ -8719,6 +9052,11 @@ msgid "GridMap Duplicate Selection" msgstr "複製所é¸" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "GridMap Paint" +msgstr "專案è¨å®š" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" msgstr "" @@ -9024,10 +9362,6 @@ msgid "Change Expression" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Add Node" -msgstr "" - -#: modules/visual_script/visual_script_editor.cpp msgid "Remove VisualScript Nodes" msgstr "" @@ -9112,6 +9446,10 @@ msgid "Change Input Value" msgstr "" #: modules/visual_script/visual_script_editor.cpp +msgid "Resize Comment" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." msgstr "" @@ -10011,12 +10349,6 @@ msgstr "" #~ msgid "Out-In" #~ msgstr "外-å…§" -#~ msgid "Change Anim Len" -#~ msgstr "變更動畫長度" - -#~ msgid "Change Anim Loop" -#~ msgstr "變更動畫迴圈" - #, fuzzy #~ msgid "Anim Create Typed Value Key" #~ msgstr "動畫新增具類別之éµå€¼" @@ -10096,9 +10428,6 @@ msgstr "" #~ msgid "Added:" #~ msgstr "已新增:" -#~ msgid "Removed:" -#~ msgstr "已刪除:" - #~ msgid "Ctrl+" #~ msgstr "Ctrl+" diff --git a/main/input_default.cpp b/main/input_default.cpp index 18b4649f4d..e8133f9eba 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -657,8 +657,35 @@ void InputDefault::set_mouse_in_window(bool p_in_window) { */ } +void InputDefault::accumulate_input_event(const Ref<InputEvent> &p_event) { + ERR_FAIL_COND(p_event.is_null()); + + if (!use_accumulated_input) { + parse_input_event(p_event); + return; + } + if (!accumulated_events.empty() && accumulated_events.back()->get()->accumulate(p_event)) { + return; //event was accumulated, exit + } + + accumulated_events.push_back(p_event); +} +void InputDefault::flush_accumulated_events() { + + while (accumulated_events.front()) { + parse_input_event(accumulated_events.front()->get()); + accumulated_events.pop_front(); + } +} + +void InputDefault::set_use_accumulated_input(bool p_enable) { + + use_accumulated_input = p_enable; +} + InputDefault::InputDefault() { + use_accumulated_input = true; mouse_button_mask = 0; emulate_touch_from_mouse = false; emulate_mouse_from_touch = false; diff --git a/main/input_default.h b/main/input_default.h index 75dd1e67f6..79a90cc4a4 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -183,6 +183,9 @@ private: void _parse_input_event_impl(const Ref<InputEvent> &p_event, bool p_is_emulated); + List<Ref<InputEvent> > accumulated_events; + bool use_accumulated_input; + public: virtual bool is_key_pressed(int p_scancode) const; virtual bool is_mouse_button_pressed(int p_button) const; @@ -264,6 +267,11 @@ public: bool is_joy_mapped(int p_device); String get_joy_guid_remapped(int p_device) const; void set_fallback_mapping(String p_guid); + + virtual void accumulate_input_event(const Ref<InputEvent> &p_event); + virtual void flush_accumulated_events(); + virtual void set_use_accumulated_input(bool p_enable); + InputDefault(); }; diff --git a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist index 1c68c72385..b7cd94e3d5 100644 --- a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist +++ b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist @@ -34,8 +34,6 @@ </array> <key>NSCameraUsageDescription</key> <string>$camera_usage_description</string> - <key>NSMicrophoneUsageDescription</key> - <string>$microphone_usage_description</string> <key>NSPhotoLibraryUsageDescription</key> <string>$photolibrary_usage_description</string> <key>UIRequiresFullScreen</key> diff --git a/modules/csg/csg.cpp b/modules/csg/csg.cpp index fb7f829cf0..0eb539b182 100644 --- a/modules/csg/csg.cpp +++ b/modules/csg/csg.cpp @@ -953,13 +953,15 @@ void CSGBrushOperation::_merge_poly(MeshMerge &mesh, int p_face_idx, const Build //duplicate point int insert_at = with_outline_vertex; - polys.write[i].points.insert(insert_at, polys[i].points[insert_at]); + int point = polys[i].points[insert_at]; + polys.write[i].points.insert(insert_at, point); insert_at++; //insert all others, outline should be backwards (must check) int holesize = polys[i].holes[j].size(); for (int k = 0; k <= holesize; k++) { int idx = (from_hole_vertex + k) % holesize; - polys.write[i].points.insert(insert_at, polys[i].holes[j][idx]); + int point2 = polys[i].holes[j][idx]; + polys.write[i].points.insert(insert_at, point2); insert_at++; } diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index e07911fa44..670aabc34c 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -1835,73 +1835,92 @@ String GDScriptLanguage::get_global_class_name(const String &p_path, String *r_b PoolVector<uint8_t> sourcef; Error err; - FileAccess *f = FileAccess::open(p_path, FileAccess::READ, &err); + FileAccessRef f = FileAccess::open(p_path, FileAccess::READ, &err); if (err) { return String(); } - int len = f->get_len(); - sourcef.resize(len + 1); - PoolVector<uint8_t>::Write w = sourcef.write(); - int r = f->get_buffer(w.ptr(), len); - f->close(); - memdelete(f); - ERR_FAIL_COND_V(r != len, String()); - w[len] = 0; - - String s; - if (s.parse_utf8((const char *)w.ptr())) { - return String(); - } + String source = f->get_as_utf8_string(); GDScriptParser parser; - - parser.parse(s, p_path.get_base_dir(), true, p_path); + parser.parse(source, p_path.get_base_dir(), true, p_path, false, NULL, true); if (parser.get_parse_tree() && parser.get_parse_tree()->type == GDScriptParser::Node::TYPE_CLASS) { const GDScriptParser::ClassNode *c = static_cast<const GDScriptParser::ClassNode *>(parser.get_parse_tree()); + if (r_icon_path) { + if (c->icon_path.empty() || c->icon_path.is_abs_path()) + *r_icon_path = c->icon_path; + else if (c->icon_path.is_rel_path()) + *r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path(); + } if (r_base_type) { - GDScriptParser::DataType base_type; - if (c->base_type.has_type) { - base_type = c->base_type; - while (base_type.has_type && base_type.kind != GDScriptParser::DataType::NATIVE) { - switch (base_type.kind) { - case GDScriptParser::DataType::CLASS: { - base_type = base_type.class_type->base_type; - } break; - case GDScriptParser::DataType::GDSCRIPT: { - Ref<GDScript> gds = base_type.script_type; - if (gds.is_valid()) { - base_type.kind = GDScriptParser::DataType::NATIVE; - base_type.native_type = gds->get_instance_base_type(); - } else { - base_type = GDScriptParser::DataType(); + + const GDScriptParser::ClassNode *subclass = c; + String path = p_path; + GDScriptParser subparser; + while (subclass) { + if (subclass->extends_used) { + if (subclass->extends_file) { + if (subclass->extends_class.size() == 0) { + get_global_class_name(subclass->extends_file, r_base_type); + subclass = NULL; + break; + } else { + Vector<StringName> extend_classes = subclass->extends_class; + + FileAccessRef subfile = FileAccess::open(subclass->extends_file, FileAccess::READ); + if (!subfile) { + break; + } + String subsource = subfile->get_as_utf8_string(); + + if (subsource.empty()) { + break; + } + String subpath = subclass->extends_file; + if (subpath.is_rel_path()) { + subpath = path.get_base_dir().plus_file(subpath).simplify_path(); + } + + if (OK != subparser.parse(subsource, subpath.get_base_dir(), true, subpath, false, NULL, true)) { + break; + } + path = subpath; + if (!subparser.get_parse_tree() || subparser.get_parse_tree()->type != GDScriptParser::Node::TYPE_CLASS) { + break; } - } break; - default: { - base_type = GDScriptParser::DataType(); - } break; + subclass = static_cast<const GDScriptParser::ClassNode *>(subparser.get_parse_tree()); + + while (extend_classes.size() > 0) { + bool found = false; + for (int i = 0; i < subclass->subclasses.size(); i++) { + const GDScriptParser::ClassNode *inner_class = subclass->subclasses[i]; + if (inner_class->name == extend_classes[0]) { + extend_classes.remove(0); + found = true; + subclass = inner_class; + break; + } + } + if (!found) { + subclass = NULL; + break; + } + } + } + } else if (subclass->extends_class.size() == 1) { + *r_base_type = subclass->extends_class[0]; + subclass = NULL; + } else { + break; } - } - } - if (base_type.has_type) { - *r_base_type = base_type.native_type; - } else { - // Fallback - if (c->extends_used && c->extends_class.size() == 1) { - *r_base_type = c->extends_class[0]; - } else if (!c->extends_used) { + } else { *r_base_type = "Reference"; + subclass = NULL; } } } - if (r_icon_path) { - if (c->icon_path.empty() || c->icon_path.is_abs_path()) - *r_icon_path = c->icon_path; - else if (c->icon_path.is_rel_path()) - *r_icon_path = p_path.get_base_dir().plus_file(c->icon_path).simplify_path(); - } return c->name; } @@ -2183,6 +2202,26 @@ String ResourceFormatLoaderGDScript::get_resource_type(const String &p_path) con return ""; } +void ResourceFormatLoaderGDScript::get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types) { + + FileAccessRef file = FileAccess::open(p_path, FileAccess::READ); + ERR_FAIL_COND(!file); + + String source = file->get_as_utf8_string(); + if (source.empty()) { + return; + } + + GDScriptParser parser; + if (OK != parser.parse(source, p_path.get_base_dir(), true, p_path, false, NULL, true)) { + return; + } + + for (const List<String>::Element *E = parser.get_dependencies().front(); E; E = E->next()) { + p_dependencies->push_back(E->get()); + } +} + Error ResourceFormatSaverGDScript::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { Ref<GDScript> sqscr = p_resource; diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index 86c00c0b59..ded873c7d3 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -511,6 +511,7 @@ public: virtual void get_recognized_extensions(List<String> *p_extensions) const; virtual bool handles_type(const String &p_type) const; virtual String get_resource_type(const String &p_path) const; + virtual void get_dependencies(const String &p_path, List<String> *p_dependencies, bool p_add_types = false); }; class ResourceFormatSaverGDScript : public ResourceFormatSaver { diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index 98871ddec3..cff9ba55b8 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -329,10 +329,15 @@ Variant GDScriptFunction::call(GDScriptInstance *p_instance, const Variant **p_a } if (!argument_types[i].is_type(*p_args[i], true)) { - r_err.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; - r_err.argument = i; - r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT; - return Variant(); + if (argument_types[i].is_type(Variant(), true)) { + memnew_placement(&stack[i], Variant); + continue; + } else { + r_err.error = Variant::CallError::CALL_ERROR_INVALID_ARGUMENT; + r_err.argument = i; + r_err.expected = argument_types[i].kind == GDScriptDataType::BUILTIN ? argument_types[i].builtin_type : Variant::OBJECT; + return Variant(); + } } if (argument_types[i].kind == GDScriptDataType::BUILTIN) { Variant arg = Variant::construct(argument_types[i].builtin_type, &p_args[i], 1, r_err); diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 5ebf68177d..5619729c13 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -473,29 +473,31 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s } Ref<Resource> res; - if (!validating) { + dependencies.push_back(path); + if (!dependencies_only) { + if (!validating) { - //this can be too slow for just validating code - if (for_completion && ScriptCodeCompletionCache::get_singleton() && FileAccess::exists(path)) { - res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); - } else if (!for_completion || FileAccess::exists(path)) { - res = ResourceLoader::load(path); - } - } else { + //this can be too slow for just validating code + if (for_completion && ScriptCodeCompletionCache::get_singleton() && FileAccess::exists(path)) { + res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); + } else if (!for_completion || FileAccess::exists(path)) { + res = ResourceLoader::load(path); + } + } else { - if (!FileAccess::exists(path)) { + if (!FileAccess::exists(path)) { + _set_error("Can't preload resource at path: " + path); + return NULL; + } else if (ScriptCodeCompletionCache::get_singleton()) { + res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); + } + } + if (!res.is_valid()) { _set_error("Can't preload resource at path: " + path); return NULL; - } else if (ScriptCodeCompletionCache::get_singleton()) { - res = ScriptCodeCompletionCache::get_singleton()->get_cached_resource(path); } } - if (!res.is_valid()) { - _set_error("Can't preload resource at path: " + path); - return NULL; - } - if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) { _set_error("Expected ')' after 'preload' path"); return NULL; @@ -812,17 +814,19 @@ GDScriptParser::Node *GDScriptParser::_parse_expression(Node *p_parent, bool p_s bfn = true; } - // Check parents for the constant - if (!bfn && cln->extends_file != StringName()) { - Ref<GDScript> parent = ResourceLoader::load(cln->extends_file); - if (parent.is_valid() && parent->is_valid()) { - Map<StringName, Variant> parent_constants; - parent->get_constants(&parent_constants); - if (parent_constants.has(identifier)) { - ConstantNode *constant = alloc_node<ConstantNode>(); - constant->value = parent_constants[identifier]; - expr = constant; - bfn = true; + if (!dependencies_only) { + // Check parents for the constant + if (!bfn && cln->extends_file != StringName()) { + Ref<GDScript> parent = ResourceLoader::load(cln->extends_file); + if (parent.is_valid() && parent->is_valid()) { + Map<StringName, Variant> parent_constants; + parent->get_constants(&parent_constants); + if (parent_constants.has(identifier)) { + ConstantNode *constant = alloc_node<ConstantNode>(); + constant->value = parent_constants[identifier]; + expr = constant; + bfn = true; + } } } } @@ -2082,7 +2086,7 @@ GDScriptParser::PatternNode *GDScriptParser::_parse_pattern(bool p_static) { return NULL; } pattern->pt_type = GDScriptParser::PatternNode::PT_BIND; - pattern->bind = tokenizer->get_token_identifier(); + pattern->bind = tokenizer->get_token_literal(); // Check if variable name is already used BlockNode *bl = current_block; while (bl) { @@ -3053,7 +3057,6 @@ void GDScriptParser::_parse_block(BlockNode *p_block, bool p_static) { } DataType iter_type; - iter_type.is_constant = true; if (container->type == Node::TYPE_OPERATOR) { @@ -3378,6 +3381,13 @@ void GDScriptParser::_parse_extends(ClassNode *p_class) { p_class->extends_file = constant; tokenizer->advance(); + // Add parent script as a dependency + String parent = constant; + if (parent.is_rel_path()) { + parent = base_path.plus_file(parent).simplify_path(); + } + dependencies.push_back(parent); + if (tokenizer->get_token() != GDScriptTokenizer::TK_PERIOD) { return; } else @@ -5434,7 +5444,7 @@ GDScriptParser::DataType GDScriptParser::_resolve_type(const DataType &p_source, String script_path = ScriptServer::get_global_class_path(id); if (script_path == self_path) { result.kind = DataType::CLASS; - result.class_type = current_class; + result.class_type = static_cast<ClassNode *>(head); } else { Ref<Script> script = ResourceLoader::load(script_path); Ref<GDScript> gds = script; @@ -7842,13 +7852,16 @@ void GDScriptParser::_check_block_types(BlockNode *p_block) { return; } - if (!lh_type.has_type && check_types) { - if (op->arguments[0]->type == Node::TYPE_OPERATOR) { - _mark_line_as_unsafe(op->line); + if (check_types) { + if (!lh_type.has_type) { + if (op->arguments[0]->type == Node::TYPE_OPERATOR) { + _mark_line_as_unsafe(op->line); + } + } + if (lh_type.is_constant) { + _set_error("Cannot assign a new value to a constant.", op->line); + return; } - } else if (lh_type.is_constant) { - _set_error("Cannot assign a new value to a constant.", op->line); - return; } DataType rh_type; @@ -8149,6 +8162,10 @@ Error GDScriptParser::_parse(const String &p_base_path) { return ERR_PARSE_ERROR; } + if (dependencies_only) { + return OK; + } + _determine_inheritance(main_class); if (error_set) { @@ -8227,7 +8244,7 @@ Error GDScriptParser::parse_bytecode(const Vector<uint8_t> &p_bytecode, const St return ret; } -Error GDScriptParser::parse(const String &p_code, const String &p_base_path, bool p_just_validate, const String &p_self_path, bool p_for_completion, Set<int> *r_safe_lines) { +Error GDScriptParser::parse(const String &p_code, const String &p_base_path, bool p_just_validate, const String &p_self_path, bool p_for_completion, Set<int> *r_safe_lines, bool p_dependencies_only) { clear(); @@ -8237,6 +8254,7 @@ Error GDScriptParser::parse(const String &p_code, const String &p_base_path, boo validating = p_just_validate; for_completion = p_for_completion; + dependencies_only = p_dependencies_only; #ifdef DEBUG_ENABLED safe_lines = r_safe_lines; #endif // DEBUG_ENABLED @@ -8293,6 +8311,8 @@ void GDScriptParser::clear() { parenthesis = 0; current_export.type = Variant::NIL; check_types = true; + dependencies_only = false; + dependencies.clear(); error = ""; #ifdef DEBUG_ENABLED safe_lines = NULL; diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 9c1ea1c7e4..809bff8f20 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -533,6 +533,8 @@ private: int error_line; int error_column; bool check_types; + bool dependencies_only; + List<String> dependencies; #ifdef DEBUG_ENABLED Set<int> *safe_lines; #endif // DEBUG_ENABLED @@ -634,7 +636,7 @@ public: #ifdef DEBUG_ENABLED const List<GDScriptWarning> &get_warnings() const { return warnings; } #endif // DEBUG_ENABLED - Error parse(const String &p_code, const String &p_base_path = "", bool p_just_validate = false, const String &p_self_path = "", bool p_for_completion = false, Set<int> *r_safe_lines = NULL); + Error parse(const String &p_code, const String &p_base_path = "", bool p_just_validate = false, const String &p_self_path = "", bool p_for_completion = false, Set<int> *r_safe_lines = NULL, bool p_dependencies_only = false); Error parse_bytecode(const Vector<uint8_t> &p_bytecode, const String &p_base_path = "", const String &p_self_path = ""); bool is_tool_script() const; @@ -653,6 +655,8 @@ public: int get_completion_argument_index(); int get_completion_identifier_is_function(); + const List<String> &get_dependencies() const { return dependencies; } + void clear(); GDScriptParser(); ~GDScriptParser(); diff --git a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs index e7d0486c76..79ef46ebb5 100644 --- a/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs +++ b/modules/mono/editor/GodotSharpTools/Build/BuildSystem.cs @@ -21,6 +21,8 @@ namespace GodotSharpTools.Build private extern static string godot_icall_BuildInstance_get_MonoWindowsBinDir(); [MethodImpl(MethodImplOptions.InternalCall)] private extern static bool godot_icall_BuildInstance_get_UsingMonoMSBuildOnWindows(); + [MethodImpl(MethodImplOptions.InternalCall)] + private extern static bool godot_icall_BuildInstance_get_PrintBuildOutput(); private static string GetMSBuildPath() { @@ -53,6 +55,14 @@ namespace GodotSharpTools.Build } } + private static bool PrintBuildOutput + { + get + { + return godot_icall_BuildInstance_get_PrintBuildOutput(); + } + } + private string solution; private string config; @@ -71,8 +81,6 @@ namespace GodotSharpTools.Build public bool Build(string loggerAssemblyPath, string loggerOutputDir, string[] customProperties = null) { - bool debugMSBuild = IsDebugMSBuildRequested(); - List<string> customPropertiesList = new List<string>(); if (customProperties != null) @@ -82,7 +90,7 @@ namespace GodotSharpTools.Build ProcessStartInfo startInfo = new ProcessStartInfo(GetMSBuildPath(), compilerArgs); - bool redirectOutput = !debugMSBuild; + bool redirectOutput = !IsDebugMSBuildRequested() && !PrintBuildOutput; startInfo.RedirectStandardOutput = redirectOutput; startInfo.RedirectStandardError = redirectOutput; @@ -123,8 +131,6 @@ namespace GodotSharpTools.Build public bool BuildAsync(string loggerAssemblyPath, string loggerOutputDir, string[] customProperties = null) { - bool debugMSBuild = IsDebugMSBuildRequested(); - if (process != null) throw new InvalidOperationException("Already in use"); @@ -137,7 +143,7 @@ namespace GodotSharpTools.Build ProcessStartInfo startInfo = new ProcessStartInfo(GetMSBuildPath(), compilerArgs); - bool redirectOutput = !debugMSBuild; + bool redirectOutput = !IsDebugMSBuildRequested() && !PrintBuildOutput; startInfo.RedirectStandardOutput = redirectOutput; startInfo.RedirectStandardError = redirectOutput; diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index 5e1c9875f0..00c780d1b7 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -195,6 +195,11 @@ MonoBoolean godot_icall_BuildInstance_get_UsingMonoMSBuildOnWindows() { #endif } +MonoBoolean godot_icall_BuildInstance_get_PrintBuildOutput() { + + return (bool)EDITOR_GET("mono/builds/print_build_output"); +} + void GodotSharpBuilds::register_internal_calls() { static bool registered = false; @@ -205,6 +210,7 @@ void GodotSharpBuilds::register_internal_calls() { mono_add_internal_call("GodotSharpTools.Build.BuildInstance::godot_icall_BuildInstance_get_MSBuildPath", (void *)godot_icall_BuildInstance_get_MSBuildPath); mono_add_internal_call("GodotSharpTools.Build.BuildInstance::godot_icall_BuildInstance_get_MonoWindowsBinDir", (void *)godot_icall_BuildInstance_get_MonoWindowsBinDir); mono_add_internal_call("GodotSharpTools.Build.BuildInstance::godot_icall_BuildInstance_get_UsingMonoMSBuildOnWindows", (void *)godot_icall_BuildInstance_get_UsingMonoMSBuildOnWindows); + mono_add_internal_call("GodotSharpTools.Build.BuildInstance::godot_icall_BuildInstance_get_PrintBuildOutput", (void *)godot_icall_BuildInstance_get_PrintBuildOutput); } void GodotSharpBuilds::show_build_error_dialog(const String &p_message) { @@ -457,6 +463,8 @@ GodotSharpBuilds::GodotSharpBuilds() { "," PROP_NAME_MSBUILD_VS #endif "," PROP_NAME_XBUILD)); + + EDITOR_DEF("mono/builds/print_build_output", false); } GodotSharpBuilds::~GodotSharpBuilds() { diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index dfabfddd64..acd8a3b73b 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -34,6 +34,7 @@ #include <mono/metadata/mono-config.h> #include <mono/metadata/mono-debug.h> #include <mono/metadata/mono-gc.h> +#include <mono/metadata/profiler.h> #include "core/os/dir_access.h" #include "core/os/file_access.h" @@ -54,6 +55,10 @@ #include "main/main.h" #endif +#define OUT_OF_SYNC_ERR_MESSAGE(m_assembly_name) "The assembly '" m_assembly_name "' is out of sync. " \ + "This error is expected if you just upgraded to a newer Godot version. " \ + "Building the project will update the assembly to the correct version." + GDMono *GDMono::singleton = NULL; namespace { @@ -79,6 +84,14 @@ void setup_runtime_main_args() { mono_runtime_set_main_args(main_args.size(), main_args.ptrw()); } +void gdmono_profiler_init() { + String profiler_args = GLOBAL_DEF("mono/profiler/args", "log:calls,alloc,sample,output=output.mlpd"); + bool profiler_enabled = GLOBAL_DEF("mono/profiler/enabled", false); + if (profiler_enabled) { + mono_profiler_load(profiler_args.utf8()); + } +} + #ifdef DEBUG_ENABLED static bool _wait_for_debugger_msecs(uint32_t p_msecs) { @@ -265,6 +278,8 @@ void GDMono::initialize() { GDMonoAssembly::initialize(); + gdmono_profiler_init(); + #ifdef DEBUG_ENABLED gdmono_debug_init(); #endif @@ -353,15 +368,15 @@ void GDMono::initialize() { // metadata, so we invalidate the version in the metadata and unload the script domain. if (core_api_assembly_out_of_sync) { - ERR_PRINT("The loaded Core API assembly is out of sync"); + ERR_PRINT(OUT_OF_SYNC_ERR_MESSAGE(CORE_API_ASSEMBLY_NAME)); metadata_set_api_assembly_invalidated(APIAssembly::API_CORE, true); } else if (!GDMonoUtils::mono_cache.godot_api_cache_updated) { - ERR_PRINT("The loaded Core API assembly is in sync, but the cache update failed"); + ERR_PRINT("The loaded assembly '" CORE_API_ASSEMBLY_NAME "' is in sync, but the cache update failed"); metadata_set_api_assembly_invalidated(APIAssembly::API_CORE, true); } if (editor_api_assembly_out_of_sync) { - ERR_PRINT("The loaded Editor API assembly is out of sync"); + ERR_PRINT(OUT_OF_SYNC_ERR_MESSAGE(EDITOR_API_ASSEMBLY_NAME)); metadata_set_api_assembly_invalidated(APIAssembly::API_EDITOR, true); } @@ -852,7 +867,7 @@ Error GDMono::reload_scripts_domain() { // metadata, so we invalidate the version in the metadata and unload the script domain. if (core_api_assembly_out_of_sync) { - ERR_PRINT("The loaded Core API assembly is out of sync"); + ERR_PRINT(OUT_OF_SYNC_ERR_MESSAGE(CORE_API_ASSEMBLY_NAME)); metadata_set_api_assembly_invalidated(APIAssembly::API_CORE, true); } else if (!GDMonoUtils::mono_cache.godot_api_cache_updated) { ERR_PRINT("The loaded Core API assembly is in sync, but the cache update failed"); @@ -860,7 +875,7 @@ Error GDMono::reload_scripts_domain() { } if (editor_api_assembly_out_of_sync) { - ERR_PRINT("The loaded Editor API assembly is out of sync"); + ERR_PRINT(OUT_OF_SYNC_ERR_MESSAGE(EDITOR_API_ASSEMBLY_NAME)); metadata_set_api_assembly_invalidated(APIAssembly::API_EDITOR, true); } diff --git a/modules/opensimplex/noise_texture.cpp b/modules/opensimplex/noise_texture.cpp index b8126ab775..9240183265 100644 --- a/modules/opensimplex/noise_texture.cpp +++ b/modules/opensimplex/noise_texture.cpp @@ -41,6 +41,7 @@ NoiseTexture::NoiseTexture() { size = Vector2i(512, 512); seamless = false; as_normalmap = false; + bump_strength = 8.0; flags = FLAGS_DEFAULT; noise = Ref<OpenSimplexNoise>(); @@ -68,6 +69,9 @@ void NoiseTexture::_bind_methods() { ClassDB::bind_method(D_METHOD("set_as_normalmap", "as_normalmap"), &NoiseTexture::set_as_normalmap); ClassDB::bind_method(D_METHOD("is_normalmap"), &NoiseTexture::is_normalmap); + ClassDB::bind_method(D_METHOD("set_bump_strength", "bump_strength"), &NoiseTexture::set_bump_strength); + ClassDB::bind_method(D_METHOD("get_bump_strength"), &NoiseTexture::get_bump_strength); + ClassDB::bind_method(D_METHOD("_update_texture"), &NoiseTexture::_update_texture); ClassDB::bind_method(D_METHOD("_generate_texture"), &NoiseTexture::_generate_texture); ClassDB::bind_method(D_METHOD("_thread_done", "image"), &NoiseTexture::_thread_done); @@ -76,9 +80,19 @@ void NoiseTexture::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "height", PROPERTY_HINT_RANGE, "1,2048,1,or_greater"), "set_height", "get_height"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "seamless"), "set_seamless", "get_seamless"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "as_normalmap"), "set_as_normalmap", "is_normalmap"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "bump_strength", PROPERTY_HINT_RANGE, "0,32,0.1,or_greater"), "set_bump_strength", "get_bump_strength"); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "noise", PROPERTY_HINT_RESOURCE_TYPE, "OpenSimplexNoise"), "set_noise", "get_noise"); } +void NoiseTexture::_validate_property(PropertyInfo &property) const { + + if (property.name == "bump_strength") { + if (!as_normalmap) { + property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL; + } + } +} + void NoiseTexture::_set_texture_data(const Ref<Image> &p_image) { data = p_image; if (data.is_valid()) { @@ -129,7 +143,7 @@ Ref<Image> NoiseTexture::_generate_texture() { } if (as_normalmap) { - image->bumpmap_to_normalmap(); + image->bumpmap_to_normalmap(bump_strength); } return image; @@ -202,12 +216,26 @@ void NoiseTexture::set_as_normalmap(bool p_as_normalmap) { if (p_as_normalmap == as_normalmap) return; as_normalmap = p_as_normalmap; _queue_update(); + _change_notify(); } bool NoiseTexture::is_normalmap() { return as_normalmap; } +void NoiseTexture::set_bump_strength(float p_bump_strength) { + + if (p_bump_strength == bump_strength) return; + bump_strength = p_bump_strength; + if (as_normalmap) + _queue_update(); +} + +float NoiseTexture::get_bump_strength() { + + return bump_strength; +} + int NoiseTexture::get_width() const { return size.x; diff --git a/modules/opensimplex/noise_texture.h b/modules/opensimplex/noise_texture.h index d1705f4070..0d00ee154d 100644 --- a/modules/opensimplex/noise_texture.h +++ b/modules/opensimplex/noise_texture.h @@ -58,6 +58,7 @@ private: Vector2i size; bool seamless; bool as_normalmap; + float bump_strength; void _thread_done(const Ref<Image> &p_image); static void _thread_function(void *p_ud); @@ -69,6 +70,7 @@ private: protected: static void _bind_methods(); + virtual void _validate_property(PropertyInfo &property) const; public: void set_noise(Ref<OpenSimplexNoise> p_noise); @@ -83,6 +85,9 @@ public: void set_as_normalmap(bool p_seamless); bool is_normalmap(); + void set_bump_strength(float p_bump_strength); + float get_bump_strength(); + int get_width() const; int get_height() const; diff --git a/modules/opus/SCsub b/modules/opus/SCsub index cd5da75bab..aa656c575a 100644 --- a/modules/opus/SCsub +++ b/modules/opus/SCsub @@ -138,7 +138,7 @@ if env['builtin_opus']: opus_sources_silk = [] - if("opus_fixed_point" in env and env.opus_fixed_point == "yes"): + if env["platform"] in ["android", "iphone", "javascript"]: env_opus.Append(CFLAGS=["-DFIXED_POINT"]) opus_sources_silk = [ "silk/fixed/LTP_analysis_filter_FIX.c", @@ -220,6 +220,12 @@ if env['builtin_opus']: ] env_opus.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) + if env["platform"] == "android" or env["platform"] == "iphone": + if ("arch" in env and env["arch"] == "arm") or ("android_arch" in env and env["android_arch"] in ["armv6", "armv7"]): + env_opus.Append(CFLAGS=["-DOPUS_ARM_OPT"]) + elif ("arch" in env and env["arch"] == "arm64") or ("android_arch" in env and env["android_arch"] == "arm64v8"): + env_opus.Append(CFLAGS=["-DOPUS_ARM64_OPT"]) + env_thirdparty = env_opus.Clone() env_thirdparty.disable_warnings() env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 2c89e5a35c..581809fec9 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -48,22 +48,12 @@ bool VisualScriptNode::is_breakpoint() const { void VisualScriptNode::_notification(int p_what) { if (p_what == NOTIFICATION_POSTINITIALIZE) { - _update_input_ports(); - } -} - -void VisualScriptNode::_update_input_ports() { - default_input_values.resize(MAX(default_input_values.size(), get_input_value_port_count())); //let it grow as big as possible, we don't want to lose values on resize - int port_count = get_input_value_port_count(); - for (int i = 0; i < port_count; i++) { - Variant::Type expected = get_input_value_port_info(i).type; - Variant::CallError ce; - set_default_input_value(i, Variant::construct(expected, NULL, 0, ce, false)); + validate_input_default_values(); } } void VisualScriptNode::ports_changed_notify() { - _update_input_ports(); + validate_input_default_values(); emit_signal("ports_changed"); } @@ -92,8 +82,7 @@ void VisualScriptNode::_set_default_input_values(Array p_values) { } void VisualScriptNode::validate_input_default_values() { - - default_input_values.resize(get_input_value_port_count()); + default_input_values.resize(MAX(default_input_values.size(), get_input_value_port_count())); //let it grow as big as possible, we don't want to lose values on resize //actually validate on save for (int i = 0; i < get_input_value_port_count(); i++) { @@ -119,8 +108,10 @@ void VisualScriptNode::validate_input_default_values() { Array VisualScriptNode::_get_default_input_values() const { //validate on save, since on load there is little info about this + Array values = default_input_values; + values.resize(get_input_value_port_count()); - return default_input_values; + return values; } String VisualScriptNode::get_text() const { diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index 0768ff61f7..0171b8e6f1 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -52,7 +52,6 @@ class VisualScriptNode : public Resource { Array _get_default_input_values() const; void validate_input_default_values(); - void _update_input_ports(); protected: void _notification(int p_what); diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp index 7dba8fd488..bb0435a679 100644 --- a/modules/visual_script/visual_script_func_nodes.cpp +++ b/modules/visual_script/visual_script_func_nodes.cpp @@ -129,9 +129,8 @@ StringName VisualScriptFunctionCall::_get_base_type() const { int VisualScriptFunctionCall::get_input_value_port_count() const { if (call_mode == CALL_MODE_BASIC_TYPE) { - - Vector<StringName> names = Variant::get_method_argument_names(basic_type, function); - return names.size() + (rpc_call_mode >= RPC_RELIABLE_TO_ID ? 1 : 0) + 1; + Vector<Variant::Type> types = Variant::get_method_argument_types(basic_type, function); + return types.size() + (rpc_call_mode >= RPC_RELIABLE_TO_ID ? 1 : 0) + 1; } else { diff --git a/modules/webp/SCsub b/modules/webp/SCsub index d215f19cef..fa3896c457 100644 --- a/modules/webp/SCsub +++ b/modules/webp/SCsub @@ -29,13 +29,11 @@ if env['builtin_libwebp']: "dsp/cost.c", "dsp/cost_mips32.c", "dsp/cost_mips_dsp_r2.c", + "dsp/cost_neon.c", "dsp/cost_sse2.c", "dsp/cpu.c", "dsp/dec.c", "dsp/dec_clip_tables.c", - "dsp/ssim.c", - "dsp/ssim_sse2.c", - "dsp/yuv_neon.c", "dsp/dec_mips32.c", "dsp/dec_mips_dsp_r2.c", "dsp/dec_msa.c", @@ -72,6 +70,8 @@ if env['builtin_libwebp']: "dsp/rescaler_msa.c", "dsp/rescaler_neon.c", "dsp/rescaler_sse2.c", + "dsp/ssim.c", + "dsp/ssim_sse2.c", "dsp/upsampling.c", "dsp/upsampling_mips_dsp_r2.c", "dsp/upsampling_msa.c", @@ -81,6 +81,7 @@ if env['builtin_libwebp']: "dsp/yuv.c", "dsp/yuv_mips32.c", "dsp/yuv_mips_dsp_r2.c", + "dsp/yuv_neon.c", "dsp/yuv_sse2.c", "dsp/yuv_sse41.c", "enc/alpha_enc.c", diff --git a/platform/android/audio_driver_opensl.cpp b/platform/android/audio_driver_opensl.cpp index e259380a63..0d62b242a8 100644 --- a/platform/android/audio_driver_opensl.cpp +++ b/platform/android/audio_driver_opensl.cpp @@ -211,6 +211,110 @@ void AudioDriverOpenSL::start() { active = true; } +void AudioDriverOpenSL::_record_buffer_callback(SLAndroidSimpleBufferQueueItf queueItf) { + + for (int i = 0; i < rec_buffer.size(); i++) { + int32_t sample = rec_buffer[i] << 16; + input_buffer_write(sample); + input_buffer_write(sample); // call twice to convert to Stereo + } + + SLresult res = (*recordBufferQueueItf)->Enqueue(recordBufferQueueItf, rec_buffer.ptrw(), rec_buffer.size() * sizeof(int16_t)); + ERR_FAIL_COND(res != SL_RESULT_SUCCESS); +} + +void AudioDriverOpenSL::_record_buffer_callbacks(SLAndroidSimpleBufferQueueItf queueItf, void *pContext) { + + AudioDriverOpenSL *ad = (AudioDriverOpenSL *)pContext; + + ad->_record_buffer_callback(queueItf); +} + +Error AudioDriverOpenSL::capture_start() { + + SLDataLocator_IODevice loc_dev = { + SL_DATALOCATOR_IODEVICE, + SL_IODEVICE_AUDIOINPUT, + SL_DEFAULTDEVICEID_AUDIOINPUT, + NULL + }; + SLDataSource recSource = { &loc_dev, NULL }; + + SLDataLocator_AndroidSimpleBufferQueue loc_bq = { + SL_DATALOCATOR_ANDROIDSIMPLEBUFFERQUEUE, + 2 + }; + SLDataFormat_PCM format_pcm = { + SL_DATAFORMAT_PCM, + 1, + SL_SAMPLINGRATE_44_1, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_PCMSAMPLEFORMAT_FIXED_16, + SL_SPEAKER_FRONT_CENTER, + SL_BYTEORDER_LITTLEENDIAN + }; + SLDataSink recSnk = { &loc_bq, &format_pcm }; + + const SLInterfaceID ids[2] = { SL_IID_ANDROIDSIMPLEBUFFERQUEUE, SL_IID_ANDROIDCONFIGURATION }; + const SLboolean req[2] = { SL_BOOLEAN_TRUE, SL_BOOLEAN_TRUE }; + + SLresult res = (*EngineItf)->CreateAudioRecorder(EngineItf, &recorder, &recSource, &recSnk, 2, ids, req); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recorder)->Realize(recorder, SL_BOOLEAN_FALSE); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recorder)->GetInterface(recorder, SL_IID_RECORD, (void *)&recordItf); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recorder)->GetInterface(recorder, SL_IID_ANDROIDSIMPLEBUFFERQUEUE, (void *)&recordBufferQueueItf); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recordBufferQueueItf)->RegisterCallback(recordBufferQueueItf, _record_buffer_callbacks, this); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + SLuint32 state; + res = (*recordItf)->GetRecordState(recordItf, &state); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + if (state != SL_RECORDSTATE_STOPPED) { + res = (*recordItf)->SetRecordState(recordItf, SL_RECORDSTATE_STOPPED); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recordBufferQueueItf)->Clear(recordBufferQueueItf); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + } + + const int rec_buffer_frames = 2048; + rec_buffer.resize(rec_buffer_frames); + input_buffer_init(rec_buffer_frames); + + res = (*recordBufferQueueItf)->Enqueue(recordBufferQueueItf, rec_buffer.ptrw(), rec_buffer.size() * sizeof(int16_t)); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recordItf)->SetRecordState(recordItf, SL_RECORDSTATE_RECORDING); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + return OK; +} + +Error AudioDriverOpenSL::capture_stop() { + + SLuint32 state; + SLresult res = (*recordItf)->GetRecordState(recordItf, &state); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + if (state != SL_RECORDSTATE_STOPPED) { + res = (*recordItf)->SetRecordState(recordItf, SL_RECORDSTATE_STOPPED); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + + res = (*recordBufferQueueItf)->Clear(recordBufferQueueItf); + ERR_FAIL_COND_V(res != SL_RESULT_SUCCESS, ERR_CANT_OPEN); + } + + return OK; +} + int AudioDriverOpenSL::get_mix_rate() const { return 44100; diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h index 77e16e507a..9bd0d5e999 100644 --- a/platform/android/audio_driver_opensl.h +++ b/platform/android/audio_driver_opensl.h @@ -54,13 +54,18 @@ class AudioDriverOpenSL : public AudioDriver { int32_t *mixdown_buffer; int last_free; + Vector<int16_t> rec_buffer; + SLPlayItf playItf; + SLRecordItf recordItf; SLObjectItf sl; SLEngineItf EngineItf; SLObjectItf OutputMix; SLVolumeItf volumeItf; SLObjectItf player; + SLObjectItf recorder; SLAndroidSimpleBufferQueueItf bufferQueueItf; + SLAndroidSimpleBufferQueueItf recordBufferQueueItf; SLDataSource audioSource; SLDataFormat_PCM pcm; SLDataSink audioSink; @@ -76,6 +81,13 @@ class AudioDriverOpenSL : public AudioDriver { SLAndroidSimpleBufferQueueItf queueItf, void *pContext); + void _record_buffer_callback( + SLAndroidSimpleBufferQueueItf queueItf); + + static void _record_buffer_callbacks( + SLAndroidSimpleBufferQueueItf queueItf, + void *pContext); + public: void set_singleton(); @@ -91,6 +103,9 @@ public: virtual void set_pause(bool p_pause); + virtual Error capture_start(); + virtual Error capture_stop(); + AudioDriverOpenSL(); }; diff --git a/platform/android/detect.py b/platform/android/detect.py index aa48252435..80cda68a9e 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -298,12 +298,6 @@ def configure(env): env.Append(CPPFLAGS=['-DANDROID_ENABLED', '-DUNIX_ENABLED', '-DNO_FCNTL']) env.Append(LIBS=['OpenSLES', 'EGL', 'GLESv3', 'android', 'log', 'z', 'dl']) - # TODO: Move that to opus module's config - if 'module_opus_enabled' in env and env['module_opus_enabled']: - if (env["android_arch"] == "armv6" or env["android_arch"] == "armv7"): - env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) - env.opus_fixed_point = "yes" - # Return NDK version string in source.properties (adapted from the Chromium project). def get_ndk_version(path): if path is None: diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 8d9d9c697e..0f2455914d 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1114,16 +1114,10 @@ public: public: virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { - // Re-enable when a GLES 2.0 backend is read - /*int api = p_preset->get("graphics/api"); - if (api == 0) - r_features->push_back("etc"); - else*/ String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); - if (driver == "GLES2" || driver == "GLES3") { + if (driver == "GLES2") { r_features->push_back("etc"); - } - if (driver == "GLES3") { + } else if (driver == "GLES3") { r_features->push_back("etc2"); } @@ -1495,6 +1489,10 @@ public: } } + if (!FileAccess::exists(p_path.get_base_dir())) { + return ERR_FILE_BAD_PATH; + } + FileAccess *src_f = NULL; zlib_filefunc_def io = zipio_create_io_from_file(&src_f); diff --git a/platform/android/java/src/org/godotengine/godot/GodotIO.java b/platform/android/java/src/org/godotengine/godot/GodotIO.java index 8cee20e435..85bba8bb4c 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotIO.java +++ b/platform/android/java/src/org/godotengine/godot/GodotIO.java @@ -516,14 +516,6 @@ public class GodotIO { public void hideKeyboard() { if (edit != null) edit.hideKeyboard(); - - InputMethodManager inputMgr = (InputMethodManager)activity.getSystemService(Context.INPUT_METHOD_SERVICE); - View v = activity.getCurrentFocus(); - if (v != null) { - inputMgr.hideSoftInputFromWindow(v.getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } else { - inputMgr.hideSoftInputFromWindow(new View(activity).getWindowToken(), InputMethodManager.HIDE_NOT_ALWAYS); - } }; public void setScreenOrientation(int p_orientation) { diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index d0e6a4cefe..172572bcb4 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -174,11 +174,3 @@ def configure(env): env.Append(CPPPATH=['#platform/iphone']) env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES_ENABLED', '-DCOREAUDIO_ENABLED']) - - # TODO: Move that to opus module's config - if 'module_opus_enabled' in env and env['module_opus_enabled']: - env.opus_fixed_point = "yes" - if (env["arch"] == "arm"): - env.Append(CFLAGS=["-DOPUS_ARM_OPT"]) - elif (env["arch"] == "arm64"): - env.Append(CFLAGS=["-DOPUS_ARM64_OPT"]) diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 09ded63e96..05907be020 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -196,15 +196,13 @@ public: void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { - if (p_preset->get("texture_format/s3tc")) { - r_features->push_back("s3tc"); - } - if (p_preset->get("texture_format/etc")) { + String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); + if (driver == "GLES2") { r_features->push_back("etc"); - } - if (p_preset->get("texture_format/etc2")) { + } else if (driver == "GLES3") { r_features->push_back("etc2"); } + Vector<String> architectures = _get_preset_architectures(p_preset); for (int i = 0; i < architectures.size(); ++i) { r_features->push_back(architectures[i]); @@ -268,7 +266,6 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "capabilities/push_notifications"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/camera_usage_description"), "Godot would like to use your camera")); - r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/microphone_usage_description"), "Godot would like to use your microphone")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "privacy/photolibrary_usage_description"), "Godot would like to use your photos")); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "orientation/portrait"), true)); @@ -290,10 +287,6 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, loading_screen_infos[i].preset_key, PROPERTY_HINT_FILE, "*.png"), "")); } - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), false)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), true)); - Vector<ExportArchitecture> architectures = _get_supported_architectures(); for (int i = 0; i < architectures.size(); ++i) { r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + architectures[i].name), architectures[i].is_default)); @@ -402,9 +395,6 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_ } else if (lines[i].find("$camera_usage_description") != -1) { String description = p_preset->get("privacy/camera_usage_description"); strnew += lines[i].replace("$camera_usage_description", description) + "\n"; - } else if (lines[i].find("$microphone_usage_description") != -1) { - String description = p_preset->get("privacy/microphone_usage_description"); - strnew += lines[i].replace("$microphone_usage_description", description) + "\n"; } else if (lines[i].find("$photolibrary_usage_description") != -1) { String description = p_preset->get("privacy/photolibrary_usage_description"); strnew += lines[i].replace("$photolibrary_usage_description", description) + "\n"; @@ -846,6 +836,10 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p } } + if (!FileAccess::exists(dest_dir)) { + return ERR_FILE_BAD_PATH; + } + DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); if (da) { String current_dir = da->get_current_dir(); diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 3cc79097f8..47da8de5df 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -136,7 +136,3 @@ def configure(env): # TODO: Reevaluate usage of this setting now that engine.js manages engine runtime. env.Append(LINKFLAGS=['-s', 'NO_EXIT_RUNTIME=1']) - - # TODO: Move that to opus module's config. - if 'module_opus_enabled' in env and env['module_opus_enabled']: - env.opus_fixed_point = 'yes' diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 2da6ea6670..b7ca1eb1d7 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -104,22 +104,24 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t> &p_html, const Re void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { - if (p_preset->get("texture_format/s3tc")) { + if (p_preset->get("vram_texture_compression/for_desktop")) { r_features->push_back("s3tc"); } - if (p_preset->get("texture_format/etc")) { - r_features->push_back("etc"); - } - if (p_preset->get("texture_format/etc2")) { - r_features->push_back("etc2"); + + if (p_preset->get("vram_texture_compression/for_mobile")) { + String driver = ProjectSettings::get_singleton()->get("rendering/quality/driver/driver_name"); + if (driver == "GLES2") { + r_features->push_back("etc"); + } else if (driver == "GLES3") { + r_features->push_back("etc2"); + } } } void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) { - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), true)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), true)); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_desktop"), true)); // S3TC + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "vram_texture_compression/for_mobile"), false)); // ETC or ETC2, depending on renderer r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/custom_html_shell", PROPERTY_HINT_FILE, "*.html"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/head_include", PROPERTY_HINT_MULTILINE_TEXT), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "*.zip"), "")); @@ -167,16 +169,19 @@ bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p } } - String etc_error = test_etc2(); - if (etc_error != String()) { - valid = false; - err += etc_error; + r_missing_templates = !valid; + + if (p_preset->get("vram_texture_compression/for_mobile")) { + String etc_error = test_etc2(); + if (etc_error != String()) { + valid = false; + err += etc_error; + } } if (!err.empty()) r_error = err; - r_missing_templates = !valid; return valid; } @@ -206,6 +211,10 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese template_path = find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE); } + if (!FileAccess::exists(p_path.get_base_dir())) { + return ERR_FILE_BAD_PATH; + } + if (template_path != String() && !FileAccess::exists(template_path)) { EditorNode::get_singleton()->show_warning(TTR("Template file not found:") + "\n" + template_path); return ERR_FILE_NOT_FOUND; @@ -355,7 +364,7 @@ Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_prese if (err) { return err; } - OS::get_singleton()->shell_open(path); + OS::get_singleton()->shell_open(String("file://") + path); return OK; } diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index b8f6977b39..a0eccceed0 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -425,6 +425,10 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p } } + if (!FileAccess::exists(p_path.get_base_dir())) { + return ERR_FILE_BAD_PATH; + } + FileAccess *src_f = NULL; zlib_filefunc_def io = zipio_create_io_from_file(&src_f); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 5206dc13b6..027a4e76f6 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -2529,6 +2529,8 @@ void OS_OSX::process_events() { [autoreleasePool drain]; autoreleasePool = [[NSAutoreleasePool alloc] init]; + + input->flush_accumulated_events(); } void OS_OSX::process_key_events() { @@ -2571,7 +2573,7 @@ void OS_OSX::process_key_events() { void OS_OSX::push_input(const Ref<InputEvent> &p_event) { Ref<InputEvent> ev = p_event; - input->parse_input_event(ev); + input->accumulate_input_event(ev); } void OS_OSX::force_process_input() { diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index a4655117a7..8405608dd6 100644 --- a/platform/uwp/export/export.cpp +++ b/platform/uwp/export/export.cpp @@ -1265,6 +1265,10 @@ public: } } + if (!FileAccess::exists(p_path.get_base_dir())) { + return ERR_FILE_BAD_PATH; + } + Error err = OK; FileAccess *fa_pack = FileAccess::open(p_path, FileAccess::WRITE, &err); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 61aeb3ec93..1a5e97cfb1 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -271,7 +271,7 @@ void OS_Windows::_touch_event(bool p_pressed, float p_x, float p_y, int idx) { event->set_position(Vector2(p_x, p_y)); if (main_loop) { - input->parse_input_event(event); + input->accumulate_input_event(event); } }; @@ -293,11 +293,21 @@ void OS_Windows::_drag_event(float p_x, float p_y, int idx) { event->set_position(Vector2(p_x, p_y)); if (main_loop) - input->parse_input_event(event); + input->accumulate_input_event(event); }; LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { + if (drop_events) { + + if (user_proc) { + + return CallWindowProcW(user_proc, hWnd, uMsg, wParam, lParam); + } else { + return DefWindowProcW(hWnd, uMsg, wParam, lParam); + } + }; + switch (uMsg) // Check For Windows Messages { case WM_SETFOCUS: { @@ -448,7 +458,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) } if (window_has_focus && main_loop && mm->get_relative() != Vector2()) - input->parse_input_event(mm); + input->accumulate_input_event(mm); } delete[] lpb; } break; @@ -535,7 +545,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) old_x = mm->get_position().x; old_y = mm->get_position().y; if (window_has_focus && main_loop) - input->parse_input_event(mm); + input->accumulate_input_event(mm); } break; case WM_LBUTTONDOWN: @@ -708,14 +718,14 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) mb->set_global_position(mb->get_position()); if (main_loop) { - input->parse_input_event(mb); + input->accumulate_input_event(mb); if (mb->is_pressed() && mb->get_button_index() > 3 && mb->get_button_index() < 8) { //send release for mouse wheel Ref<InputEventMouseButton> mbd = mb->duplicate(); last_button_state &= ~(1 << (mbd->get_button_index() - 1)); mbd->set_button_mask(last_button_state); mbd->set_pressed(false); - input->parse_input_event(mbd); + input->accumulate_input_event(mbd); } } } break; @@ -978,7 +988,7 @@ void OS_Windows::process_key_events() { if (k->get_unicode() < 32) k->set_unicode(0); - input->parse_input_event(k); + input->accumulate_input_event(k); } //do nothing @@ -1016,7 +1026,7 @@ void OS_Windows::process_key_events() { k->set_echo((ke.uMsg == WM_KEYDOWN && (ke.lParam & (1 << 30)))); - input->parse_input_event(k); + input->accumulate_input_event(k); } break; } @@ -2230,7 +2240,9 @@ void OS_Windows::process_events() { MSG msg; - joypad->process_joypads(); + if (!drop_events) { + joypad->process_joypads(); + } while (PeekMessageW(&msg, NULL, 0, 0, PM_REMOVE)) { @@ -2238,7 +2250,10 @@ void OS_Windows::process_events() { DispatchMessageW(&msg); } - process_key_events(); + if (!drop_events) { + process_key_events(); + input->flush_accumulated_events(); + } } void OS_Windows::set_cursor_shape(CursorShape p_shape) { @@ -2987,6 +3002,13 @@ bool OS_Windows::is_disable_crash_handler() const { return crash_handler.is_disabled(); } +void OS_Windows::process_and_drop_events() { + + drop_events = true; + process_events(); + drop_events = false; +} + Error OS_Windows::move_to_trash(const String &p_path) { SHFILEOPSTRUCTW sf; WCHAR *from = new WCHAR[p_path.length() + 2]; @@ -3015,6 +3037,7 @@ Error OS_Windows::move_to_trash(const String &p_path) { OS_Windows::OS_Windows(HINSTANCE _hInstance) { + drop_events = false; key_event_pos = 0; layered_window = false; hBitmap = NULL; diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 6c257016ec..2d03532c69 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -127,6 +127,7 @@ class OS_Windows : public OS { bool window_has_focus; uint32_t last_button_state; bool use_raw_input; + bool drop_events; HCURSOR cursors[CURSOR_MAX] = { NULL }; CursorShape cursor_shape; @@ -330,6 +331,8 @@ public: virtual Error move_to_trash(const String &p_path); + virtual void process_and_drop_events(); + OS_Windows(HINSTANCE _hInstance); ~OS_Windows(); }; diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 1355ae542d..b5ad59e60a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -20,12 +20,10 @@ def can_build(): # Check the minimal dependencies x11_error = os.system("pkg-config --version > /dev/null") if (x11_error): - print("pkg-config not found.. x11 disabled.") return False x11_error = os.system("pkg-config x11 --modversion > /dev/null ") if (x11_error): - print("X11 not found.. x11 disabled.") return False x11_error = os.system("pkg-config xcursor --modversion > /dev/null ") diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index b7fbb89edf..cc4d57ea99 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -1660,7 +1660,7 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) { k->set_shift(true); } - input->parse_input_event(k); + input->accumulate_input_event(k); } return; } @@ -1804,7 +1804,7 @@ void OS_X11::handle_key_event(XKeyEvent *p_event, bool p_echo) { } //printf("key: %x\n",k->get_scancode()); - input->parse_input_event(k); + input->accumulate_input_event(k); } struct Property { @@ -1991,12 +1991,12 @@ void OS_X11::process_xevents() { // in a spurious mouse motion event being sent to Godot; remember it to be able to filter it out xi.mouse_pos_to_filter = pos; } - input->parse_input_event(st); + input->accumulate_input_event(st); } else { if (!xi.state.has(index)) // Defensive break; xi.state.erase(index); - input->parse_input_event(st); + input->accumulate_input_event(st); } } break; @@ -2014,7 +2014,7 @@ void OS_X11::process_xevents() { sd->set_index(index); sd->set_position(pos); sd->set_relative(pos - curr_pos_elem->value()); - input->parse_input_event(sd); + input->accumulate_input_event(sd); curr_pos_elem->value() = pos; } @@ -2102,7 +2102,7 @@ void OS_X11::process_xevents() { st.instance(); st->set_index(E->key()); st->set_position(E->get()); - input->parse_input_event(st); + input->accumulate_input_event(st); } xi.state.clear(); #endif @@ -2163,7 +2163,7 @@ void OS_X11::process_xevents() { } } - input->parse_input_event(mb); + input->accumulate_input_event(mb); } break; case MotionNotify: { @@ -2273,7 +2273,7 @@ void OS_X11::process_xevents() { // this is so that the relative motion doesn't get messed up // after we regain focus. if (window_has_focus || !mouse_mode_grab) - input->parse_input_event(mm); + input->accumulate_input_event(mm); } break; case KeyPress: @@ -2457,6 +2457,8 @@ void OS_X11::process_xevents() { printf("Win: %d,%d\n", win_x, win_y); */ } + + input->flush_accumulated_events(); } MainLoop *OS_X11::get_main_loop() const { diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 9e8bf62fc5..2a225e5797 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -428,8 +428,8 @@ void Area2D::set_monitorable(bool p_enable) { if (locked || (is_inside_tree() && Physics2DServer::get_singleton()->is_flushing_queries())) { ERR_EXPLAIN("Function blocked during in/out signal. Use set_deferred(\"monitorable\",true/false)"); + ERR_FAIL(); } - ERR_FAIL_COND(locked || Physics2DServer::get_singleton()->is_flushing_queries()); if (p_enable == monitorable) return; diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 5edd49b3a3..ef7644fcab 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -78,40 +78,7 @@ void CollisionPolygon2D::_build_polygon() { } Vector<Vector<Vector2> > CollisionPolygon2D::_decompose_in_convex() { - - Vector<Vector<Vector2> > decomp; - List<TriangulatorPoly> in_poly, out_poly; - - TriangulatorPoly inp; - inp.Init(polygon.size()); - for (int i = 0; i < polygon.size(); i++) { - inp.GetPoint(i) = polygon[i]; - } - inp.SetOrientation(TRIANGULATOR_CCW); - in_poly.push_back(inp); - TriangulatorPartition tpart; - if (tpart.ConvexPartition_HM(&in_poly, &out_poly) == 0) { //failed! - ERR_PRINT("Convex decomposing failed!"); - return decomp; - } - - decomp.resize(out_poly.size()); - int idx = 0; - - for (List<TriangulatorPoly>::Element *I = out_poly.front(); I; I = I->next()) { - - TriangulatorPoly &tp = I->get(); - - decomp.write[idx].resize(tp.GetNumPoints()); - - for (int i = 0; i < tp.GetNumPoints(); i++) { - - decomp.write[idx].write[i] = tp.GetPoint(i); - } - - idx++; - } - + Vector<Vector<Vector2> > decomp = Geometry::decompose_polygon_in_convex(polygon); return decomp; } diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index eeabe15b08..1b7e1a6b8b 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -1198,6 +1198,9 @@ bool KinematicBody2D::separate_raycast_shapes(bool p_infinite_inertia, Collision bool KinematicBody2D::move_and_collide(const Vector2 &p_motion, bool p_infinite_inertia, Collision &r_collision, bool p_exclude_raycast_shapes, bool p_test_only) { + if (sync_to_physics) { + ERR_PRINT("Functions move_and_slide and move_and_collide do not work together with 'sync to physics' option. Please read the documentation."); + } Transform2D gt = get_global_transform(); Physics2DServer::MotionResult result; bool colliding = Physics2DServer::get_singleton()->body_test_motion(get_rid(), gt, p_motion, p_infinite_inertia, margin, &result, p_exclude_raycast_shapes); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index 1c58073f1d..f6f1bad581 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -307,7 +307,9 @@ void Polygon2D::_notification(int p_what) { if (invert || polygons.size() == 0) { Vector<int> indices = Geometry::triangulate_polygon(points); - VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, bones, weights, texture.is_valid() ? texture->get_rid() : RID()); + if (indices.size()) { + VS::get_singleton()->canvas_item_add_triangle_array(get_canvas_item(), indices, points, colors, uvs, bones, weights, texture.is_valid() ? texture->get_rid() : RID()); + } } else { //draw individual polygons Vector<int> total_indices; diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 91e4f061cb..ed0a9c4915 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -479,10 +479,28 @@ void TileMap::update_dirty_quadrants() { vs->canvas_item_add_set_transform(debug_canvas_item, xform); shape->draw(debug_canvas_item, debug_collision_color); } - ps->body_add_shape(q.body, shape->get_rid(), xform); - ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y)); - ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[j].one_way_collision, shapes[j].one_way_collision_margin); - shape_idx++; + + if (shape->has_meta("decomposed")) { + Array _shapes = shape->get_meta("decomposed"); + for (int k = 0; k < _shapes.size(); k++) { + Ref<ConvexPolygonShape2D> convex = _shapes[k]; + if (convex.is_valid()) { + ps->body_add_shape(q.body, convex->get_rid(), xform); + ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y)); + ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[j].one_way_collision, shapes[j].one_way_collision_margin); + shape_idx++; +#ifdef DEBUG_ENABLED + } else { + print_error("The TileSet asigned to the TileMap " + get_name() + " has an invalid convex shape."); +#endif + } + } + } else { + ps->body_add_shape(q.body, shape->get_rid(), xform); + ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y)); + ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[j].one_way_collision, shapes[j].one_way_collision_margin); + shape_idx++; + } } } } diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index 9e15a416b2..e58e26d2d1 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -441,8 +441,8 @@ void Area::set_monitorable(bool p_enable) { if (locked || (is_inside_tree() && PhysicsServer::get_singleton()->is_flushing_queries())) { ERR_EXPLAIN("Function blocked during in/out signal. Use set_deferred(\"monitorable\",true/false)"); + ERR_FAIL(); } - ERR_FAIL_COND(locked || PhysicsServer::get_singleton()->is_flushing_queries()); if (p_enable == monitorable) return; diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index daee291ba3..ac33e2b714 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -124,6 +124,10 @@ String CollisionShape::get_configuration_warning() const { return TTR("A shape must be provided for CollisionShape to function. Please create a shape resource for it!"); } + if (shape->is_class("PlaneShape")) { + return TTR("Plane shapes don't work well and will be removed in future versions. Please don't use them."); + } + return String(); } diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index 5b08ea7790..c491275f00 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -30,6 +30,8 @@ #include "gi_probe.h" +#include "core/os/os.h" + #include "mesh_instance.h" #include "voxel_light_baker.h" @@ -490,6 +492,14 @@ PoolVector<Face3> GIProbe::get_faces(uint32_t p_usage_flags) const { return PoolVector<Face3>(); } +String GIProbe::get_configuration_warning() const { + + if (OS::get_singleton()->get_current_video_driver() == OS::VIDEO_DRIVER_GLES2) { + return TTR("GIProbes are not supported by the GLES2 video driver.\nUse a BakedLightmap instead."); + } + return String(); +} + void GIProbe::_bind_methods() { ClassDB::bind_method(D_METHOD("set_probe_data", "data"), &GIProbe::set_probe_data); diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index 87664e06b8..4badabbadf 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -168,6 +168,8 @@ public: virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; + virtual String get_configuration_warning() const; + GIProbe(); ~GIProbe(); }; diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 3b514dab8c..cf1af918f7 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -210,6 +210,13 @@ bool Light::is_editor_only() const { return editor_only; } +void Light::_validate_property(PropertyInfo &property) const { + + if (VisualServer::get_singleton()->is_low_end() && property.name == "shadow_contact") { + property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL; + } +} + void Light::_bind_methods() { ClassDB::bind_method(D_METHOD("set_editor_only", "editor_only"), &Light::set_editor_only); diff --git a/scene/3d/light.h b/scene/3d/light.h index 85e0ce3c24..ddd5bc6b3a 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -92,6 +92,7 @@ protected: static void _bind_methods(); void _notification(int p_what); + virtual void _validate_property(PropertyInfo &property) const; Light(VisualServer::LightType p_type); diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index ab1eed0859..05214ed669 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -1104,10 +1104,10 @@ void RigidBody::_reload_physics_characteristics() { ////////////////////////////////////////////////////// ////////////////////////// -Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion, bool p_infinite_inertia, bool p_test_only) { +Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion, bool p_infinite_inertia, bool p_exclude_raycast_shapes, bool p_test_only) { Collision col; - if (move_and_collide(p_motion, p_infinite_inertia, col, p_test_only)) { + if (move_and_collide(p_motion, p_infinite_inertia, col, p_exclude_raycast_shapes, p_test_only)) { if (motion_cache.is_null()) { motion_cache.instance(); motion_cache->owner = this; @@ -1121,11 +1121,11 @@ Ref<KinematicCollision> KinematicBody::_move(const Vector3 &p_motion, bool p_inf return Ref<KinematicCollision>(); } -bool KinematicBody::move_and_collide(const Vector3 &p_motion, bool p_infinite_inertia, Collision &r_collision, bool p_test_only) { +bool KinematicBody::move_and_collide(const Vector3 &p_motion, bool p_infinite_inertia, Collision &r_collision, bool p_exclude_raycast_shapes, bool p_test_only) { Transform gt = get_global_transform(); PhysicsServer::MotionResult result; - bool colliding = PhysicsServer::get_singleton()->body_test_motion(get_rid(), gt, p_motion, p_infinite_inertia, &result); + bool colliding = PhysicsServer::get_singleton()->body_test_motion(get_rid(), gt, p_motion, p_infinite_inertia, &result, p_exclude_raycast_shapes); if (colliding) { r_collision.collider_metadata = result.collider_metadata; @@ -1280,7 +1280,7 @@ Vector3 KinematicBody::move_and_slide_with_snap(const Vector3 &p_linear_velocity Collision col; Transform gt = get_global_transform(); - if (move_and_collide(p_snap, p_infinite_inertia, col, true)) { + if (move_and_collide(p_snap, p_infinite_inertia, col, false, true)) { bool apply = true; if (p_floor_direction != Vector3()) { @@ -1415,7 +1415,7 @@ Ref<KinematicCollision> KinematicBody::_get_slide_collision(int p_bounce) { void KinematicBody::_bind_methods() { - ClassDB::bind_method(D_METHOD("move_and_collide", "rel_vec", "infinite_inertia", "test_only"), &KinematicBody::_move, DEFVAL(true), DEFVAL(false)); + ClassDB::bind_method(D_METHOD("move_and_collide", "rel_vec", "infinite_inertia", "exclude_raycast_shapes", "test_only"), &KinematicBody::_move, DEFVAL(true), DEFVAL(true), DEFVAL(false)); ClassDB::bind_method(D_METHOD("move_and_slide", "linear_velocity", "floor_normal", "stop_on_slope", "max_slides", "floor_max_angle", "infinite_inertia"), &KinematicBody::move_and_slide, DEFVAL(Vector3(0, 0, 0)), DEFVAL(false), DEFVAL(4), DEFVAL(Math::deg2rad((float)45)), DEFVAL(true)); ClassDB::bind_method(D_METHOD("move_and_slide_with_snap", "linear_velocity", "snap", "floor_normal", "stop_on_slope", "max_slides", "floor_max_angle", "infinite_inertia"), &KinematicBody::move_and_slide_with_snap, DEFVAL(Vector3(0, 0, 0)), DEFVAL(false), DEFVAL(4), DEFVAL(Math::deg2rad((float)45)), DEFVAL(true)); diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index 5570d0c86b..589af98062 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -310,14 +310,14 @@ private: _FORCE_INLINE_ bool _ignores_mode(PhysicsServer::BodyMode) const; - Ref<KinematicCollision> _move(const Vector3 &p_motion, bool p_infinite_inertia = true, bool p_test_only = false); + Ref<KinematicCollision> _move(const Vector3 &p_motion, bool p_infinite_inertia = true, bool p_exclude_raycast_shapes = true, bool p_test_only = false); Ref<KinematicCollision> _get_slide_collision(int p_bounce); protected: static void _bind_methods(); public: - bool move_and_collide(const Vector3 &p_motion, bool p_infinite_inertia, Collision &r_collisionz, bool p_test_only = false); + bool move_and_collide(const Vector3 &p_motion, bool p_infinite_inertia, Collision &r_collisionz, bool p_exclude_raycast_shapes = true, bool p_test_only = false); bool test_move(const Transform &p_from, const Vector3 &p_motion, bool p_infinite_inertia); bool separate_raycast_shapes(bool p_infinite_inertia, Collision &r_collision); diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index ceea50f74a..b7279e4d4f 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -198,11 +198,7 @@ void Skeleton::_notification(int p_what) { case NOTIFICATION_ENTER_WORLD: { - if (dirty) { - - dirty = false; - _make_dirty(); // property make it dirty - } + VS::get_singleton()->skeleton_set_world_transform(skeleton, use_bones_in_world_transform, get_global_transform()); } break; case NOTIFICATION_EXIT_WORLD: { @@ -210,21 +206,7 @@ void Skeleton::_notification(int p_what) { } break; case NOTIFICATION_TRANSFORM_CHANGED: { - if (dirty) - break; //will be eventually updated - - //if moved, just update transforms - VisualServer *vs = VisualServer::get_singleton(); - const Bone *bonesptr = bones.ptr(); - int len = bones.size(); - Transform global_transform = get_global_transform(); - Transform global_transform_inverse = global_transform.affine_inverse(); - - for (int i = 0; i < len; i++) { - - const Bone &b = bonesptr[i]; - vs->skeleton_bone_set_transform(skeleton, i, global_transform * (b.transform_final * global_transform_inverse)); - } + VS::get_singleton()->skeleton_set_world_transform(skeleton, use_bones_in_world_transform, get_global_transform()); } break; case NOTIFICATION_UPDATE_SKELETON: { @@ -257,9 +239,6 @@ void Skeleton::_notification(int p_what) { rest_global_inverse_dirty = false; } - Transform global_transform = get_global_transform(); - Transform global_transform_inverse = global_transform.affine_inverse(); - for (int i = 0; i < len; i++) { Bone &b = bonesptr[order[i]]; @@ -320,7 +299,7 @@ void Skeleton::_notification(int p_what) { } b.transform_final = b.pose_global * b.rest_global_inverse; - vs->skeleton_bone_set_transform(skeleton, order[i], global_transform * (b.transform_final * global_transform_inverse)); + vs->skeleton_bone_set_transform(skeleton, order[i], b.transform_final); for (List<uint32_t>::Element *E = b.nodes_bound.front(); E; E = E->next()) { @@ -594,10 +573,6 @@ void Skeleton::_make_dirty() { if (dirty) return; - if (!is_inside_tree()) { - dirty = true; - return; - } MessageQueue::get_singleton()->push_notification(this, NOTIFICATION_UPDATE_SKELETON); dirty = true; } @@ -771,6 +746,16 @@ void Skeleton::physical_bones_remove_collision_exception(RID p_exception) { #endif // _3D_DISABLED +void Skeleton::set_use_bones_in_world_transform(bool p_enable) { + use_bones_in_world_transform = p_enable; + if (is_inside_tree()) { + VS::get_singleton()->skeleton_set_world_transform(skeleton, use_bones_in_world_transform, get_global_transform()); + } +} +bool Skeleton::is_using_bones_in_world_transform() const { + return use_bones_in_world_transform; +} + void Skeleton::_bind_methods() { ClassDB::bind_method(D_METHOD("add_bone", "name"), &Skeleton::add_bone); @@ -807,6 +792,9 @@ void Skeleton::_bind_methods() { ClassDB::bind_method(D_METHOD("get_bone_transform", "bone_idx"), &Skeleton::get_bone_transform); + ClassDB::bind_method(D_METHOD("set_use_bones_in_world_transform", "enable"), &Skeleton::set_use_bones_in_world_transform); + ClassDB::bind_method(D_METHOD("is_using_bones_in_world_transform"), &Skeleton::is_using_bones_in_world_transform); + #ifndef _3D_DISABLED ClassDB::bind_method(D_METHOD("physical_bones_stop_simulation"), &Skeleton::physical_bones_stop_simulation); @@ -818,6 +806,7 @@ void Skeleton::_bind_methods() { ClassDB::bind_method(D_METHOD("set_bone_ignore_animation", "bone", "ignore"), &Skeleton::set_bone_ignore_animation); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "bones_in_world_transform"), "set_use_bones_in_world_transform", "is_using_bones_in_world_transform"); BIND_CONSTANT(NOTIFICATION_UPDATE_SKELETON); } @@ -828,6 +817,7 @@ Skeleton::Skeleton() { process_order_dirty = true; skeleton = VisualServer::get_singleton()->skeleton_create(); set_notify_transform(true); + use_bones_in_world_transform = false; } Skeleton::~Skeleton() { diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index 0f463c9ea7..5f43b3c6c3 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.h @@ -100,6 +100,7 @@ class Skeleton : public Spatial { void _make_dirty(); bool dirty; + bool use_bones_in_world_transform; // bind helpers Array _get_bound_child_nodes_to_bone(int p_bone) const { @@ -179,6 +180,9 @@ public: void localize_rests(); // used for loaders and tools int get_process_order(int p_idx); + void set_use_bones_in_world_transform(bool p_enable); + bool is_using_bones_in_world_transform() const; + #ifndef _3D_DISABLED // Physical bone API diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 43ec8cebb0..016db15b73 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -287,7 +287,6 @@ void AnimationPlayer::_ensure_node_caches(AnimationData *p_anim) { // broken track (nonexistent bone) p_anim->node_cache[i]->skeleton = NULL; p_anim->node_cache[i]->spatial = NULL; - printf("bone is %ls\n", String(bone_name).c_str()); ERR_CONTINUE(p_anim->node_cache[i]->bone_idx < 0); } } else { @@ -1133,8 +1132,6 @@ void AnimationPlayer::play_backwards(const StringName &p_name, float p_custom_bl void AnimationPlayer::play(const StringName &p_name, float p_custom_blend, float p_custom_scale, bool p_from_end) { - //printf("animation is %ls\n", String(p_name).c_str()); - //ERR_FAIL_COND(!is_inside_scene()); StringName name = p_name; if (String(name) == "") diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp index 5c95cf4279..2688041d18 100644 --- a/scene/audio/audio_stream_player.cpp +++ b/scene/audio/audio_stream_player.cpp @@ -91,8 +91,10 @@ void AudioStreamPlayer::_mix_internal(bool p_fadeout) { void AudioStreamPlayer::_mix_audio() { - if (!stream_playback.is_valid() || !active) + if (!stream_playback.is_valid() || !active || + (stream_paused && !stream_fade)) { return; + } if (stream_fade) { _mix_internal(true); diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 2579321773..7f1ca58d58 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -169,6 +169,19 @@ void Container::_notification(int p_what) { } } +String Container::get_configuration_warning() const { + + String warning = Control::get_configuration_warning(); + + if (get_class() == "Container" && get_script().is_null()) { + if (warning != String()) { + warning += "\n"; + } + warning += TTR("Container by itself serves no purpose unless a script configures it's children placement behavior.\nIf you dont't intend to add a script, then please use a plain 'Control' node instead."); + } + return warning; +} + void Container::_bind_methods() { ClassDB::bind_method(D_METHOD("_sort_children"), &Container::_sort_children); diff --git a/scene/gui/container.h b/scene/gui/container.h index 0b014137f4..80d3f6ee5d 100644 --- a/scene/gui/container.h +++ b/scene/gui/container.h @@ -57,6 +57,8 @@ public: void fit_child_in_rect(Control *p_child, const Rect2 &p_rect); + virtual String get_configuration_warning() const; + Container(); }; diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 998e91cfc2..86894ce070 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2721,7 +2721,7 @@ void Control::_bind_methods() { ClassDB::bind_method(D_METHOD("get_scale"), &Control::get_scale); ClassDB::bind_method(D_METHOD("get_pivot_offset"), &Control::get_pivot_offset); ClassDB::bind_method(D_METHOD("get_custom_minimum_size"), &Control::get_custom_minimum_size); - ClassDB::bind_method(D_METHOD("get_parent_area_size"), &Control::get_size); + ClassDB::bind_method(D_METHOD("get_parent_area_size"), &Control::get_parent_area_size); ClassDB::bind_method(D_METHOD("get_global_position"), &Control::get_global_position); ClassDB::bind_method(D_METHOD("get_rect"), &Control::get_rect); ClassDB::bind_method(D_METHOD("get_global_rect"), &Control::get_global_rect); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 5599c64daa..059e59ea21 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -861,7 +861,7 @@ FileDialog::FileDialog() { HBoxContainer *hbc = memnew(HBoxContainer); dir_up = memnew(ToolButton); - dir_up->set_tooltip(RTR("Go to parent folder")); + dir_up->set_tooltip(RTR("Go to parent folder.")); hbc->add_child(dir_up); dir_up->connect("pressed", this, "_go_up"); @@ -871,6 +871,7 @@ FileDialog::FileDialog() { dir->set_h_size_flags(SIZE_EXPAND_FILL); refresh = memnew(ToolButton); + refresh->set_tooltip(RTR("Refresh")); refresh->connect("pressed", this, "_update_file_list"); hbc->add_child(refresh); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index f3f2e586a6..68e734502b 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -261,8 +261,9 @@ void GraphEdit::add_child_notify(Node *p_child) { void GraphEdit::remove_child_notify(Node *p_child) { Control::remove_child_notify(p_child); - - top_layer->call_deferred("raise"); //top layer always on top! + if (is_inside_tree()) { + top_layer->call_deferred("raise"); //top layer always on top! + } GraphNode *gn = Object::cast_to<GraphNode>(p_child); if (gn) { gn->disconnect("offset_changed", this, "_graph_node_moved"); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index d4b008e277..9bcf10d5e7 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1133,12 +1133,13 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { } Variant meta; - if (item && !outside && _find_meta(item, &meta)) { - if (meta_hovering != item) { + ItemMeta *item_meta; + if (item && !outside && _find_meta(item, &meta, &item_meta)) { + if (meta_hovering != item_meta) { if (meta_hovering) { emit_signal("meta_hover_ended", current_meta); } - meta_hovering = static_cast<ItemMeta *>(item); + meta_hovering = item_meta; current_meta = meta; emit_signal("meta_hover_started", meta); } @@ -1269,7 +1270,7 @@ bool RichTextLabel::_find_strikethrough(Item *p_item) { return false; } -bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta) { +bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta, ItemMeta **r_item) { Item *item = p_item; @@ -1280,6 +1281,8 @@ bool RichTextLabel::_find_meta(Item *p_item, Variant *r_meta) { ItemMeta *meta = static_cast<ItemMeta *>(item); if (r_meta) *r_meta = meta->meta; + if (r_item) + *r_item = meta; return true; } diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index bec2c5ac02..114c6103e2 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -285,7 +285,7 @@ private: Color _find_color(Item *p_item, const Color &p_default_color); bool _find_underline(Item *p_item); bool _find_strikethrough(Item *p_item); - bool _find_meta(Item *p_item, Variant *r_meta); + bool _find_meta(Item *p_item, Variant *r_meta, ItemMeta **r_item = NULL); void _update_scroll(); void _scroll_changed(double); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index f38bc62a3c..2bf2364873 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -666,7 +666,7 @@ void TextEdit::_notification(int p_what) { bool brace_close_matching = false; bool brace_close_mismatch = false; - if (brace_matching_enabled) { + if (brace_matching_enabled && cursor.line >= 0 && cursor.line < text.size() && cursor.column >= 0) { if (cursor.column < text[cursor.line].length()) { //check for open diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 090e6bdcb0..d86c241ec6 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1783,13 +1783,15 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { */ gui.mouse_focus = _gui_find_control(pos); - gui.mouse_focus_mask = 1 << (mb->get_button_index() - 1); gui.last_mouse_focus = gui.mouse_focus; if (!gui.mouse_focus) { + gui.mouse_focus_mask = 0; return; } + gui.mouse_focus_mask = 1 << (mb->get_button_index() - 1); + if (mb->get_button_index() == BUTTON_LEFT) { gui.drag_accum = Vector2(); gui.drag_attempted = false; @@ -2923,6 +2925,13 @@ bool Viewport::is_handling_input_locally() const { return handle_input_locally; } +void Viewport::_validate_property(PropertyInfo &property) const { + + if (VisualServer::get_singleton()->is_low_end() && property.name == "hdr") { + property.usage = PROPERTY_USAGE_NOEDITOR | PROPERTY_USAGE_INTERNAL; + } +} + void Viewport::_bind_methods() { ClassDB::bind_method(D_METHOD("set_use_arvr", "use"), &Viewport::set_use_arvr); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 4d0a4e8c87..b8b5bf07a7 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -390,6 +390,7 @@ private: protected: void _notification(int p_what); static void _bind_methods(); + virtual void _validate_property(PropertyInfo &property) const; public: Listener *get_listener() const; diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 2af92a788e..3eb16c544c 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1836,9 +1836,14 @@ Variant Animation::value_track_interpolate(int p_track, float p_time) const { void Animation::_value_track_get_key_indices_in_range(const ValueTrack *vt, float from_time, float to_time, List<int> *p_indices) const { if (from_time != length && to_time == length) - to_time = length * 1.01; //include a little more if at the end + to_time = length * 1.001; //include a little more if at the end int to = _find(vt->values, to_time); + if (to >= 0 && from_time == to_time && vt->values[to].time == from_time) { + //find exact (0 delta), return if found + p_indices->push_back(to); + return; + } // can't really send the events == time, will be sent in the next frame. // if event>=len then it will probably never be requested by the anim player. @@ -1884,7 +1889,7 @@ void Animation::value_track_get_key_indices(int p_track, float p_time, float p_d if (from_time > to_time) { // handle loop by splitting - _value_track_get_key_indices_in_range(vt, length - from_time, length, p_indices); + _value_track_get_key_indices_in_range(vt, from_time, length, p_indices); _value_track_get_key_indices_in_range(vt, 0, to_time, p_indices); return; } diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 98402dbeaf..85018f38d7 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -1028,34 +1028,6 @@ AABB ArrayMesh::get_custom_aabb() const { return custom_aabb; } -void ArrayMesh::center_geometry() { - - /* - Vector3 ofs = aabb.pos+aabb.size*0.5; - - for(int i=0;i<get_surface_count();i++) { - - PoolVector<Vector3> geom = surface_get_array(i,ARRAY_VERTEX); - int gc =geom.size(); - PoolVector<Vector3>::Write w = geom.write(); - surfaces[i].aabb.pos-=ofs; - - for(int i=0;i<gc;i++) { - - w[i]-=ofs; - } - - w = PoolVector<Vector3>::Write(); - - surface_set_array(i,ARRAY_VERTEX,geom); - - } - - aabb.pos-=ofs; - -*/ -} - void ArrayMesh::regen_normalmaps() { Vector<Ref<SurfaceTool> > surfs; @@ -1295,8 +1267,6 @@ void ArrayMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("create_trimesh_shape"), &ArrayMesh::create_trimesh_shape); ClassDB::bind_method(D_METHOD("create_convex_shape"), &ArrayMesh::create_convex_shape); ClassDB::bind_method(D_METHOD("create_outline", "margin"), &ArrayMesh::create_outline); - ClassDB::bind_method(D_METHOD("center_geometry"), &ArrayMesh::center_geometry); - ClassDB::set_method_flags(get_class_static(), _scs_create("center_geometry"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR); ClassDB::bind_method(D_METHOD("regen_normalmaps"), &ArrayMesh::regen_normalmaps); ClassDB::set_method_flags(get_class_static(), _scs_create("regen_normalmaps"), METHOD_FLAGS_DEFAULT | METHOD_FLAG_EDITOR); ClassDB::bind_method(D_METHOD("lightmap_unwrap", "transform", "texel_size"), &ArrayMesh::lightmap_unwrap); diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 2d0aef8ab0..dabfc6ea60 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -223,7 +223,6 @@ public: AABB get_aabb() const; virtual RID get_rid() const; - void center_geometry(); void regen_normalmaps(); Error lightmap_unwrap(const Transform &p_base_transform = Transform(), float p_texel_size = 0.05); diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 0d12d388ef..626ed9f5b4 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -92,6 +92,8 @@ Node *SceneState::instance(GenEditState p_edit_state) const { if (i > 0) { + ERR_EXPLAIN(vformat("Invalid scene: node %s does not specify its parent node.", snames[n.name])) + ERR_FAIL_COND_V(n.parent == -1, NULL) NODE_FROM_ID(nparent, n.parent); #ifdef DEBUG_ENABLED if (!nparent && (n.parent & FLAG_ID_IS_PATH)) { @@ -175,8 +177,8 @@ Node *SceneState::instance(GenEditState p_edit_state) const { node = Object::cast_to<Node>(obj); } else { - print_line("Class is disabled for: " + itos(n.type)); - print_line("name: " + String(snames[n.type])); + //print_line("Class is disabled for: " + itos(n.type)); + //print_line("name: " + String(snames[n.type])); } if (node) { diff --git a/scene/resources/sky.cpp b/scene/resources/sky.cpp index dfbf619c01..f9f8ff19e4 100644 --- a/scene/resources/sky.cpp +++ b/scene/resources/sky.cpp @@ -536,7 +536,7 @@ void ProceduralSky::_bind_methods() { BIND_ENUM_CONSTANT(TEXTURE_SIZE_MAX); } -ProceduralSky::ProceduralSky() { +ProceduralSky::ProceduralSky(bool p_desaturate) { sky = VS::get_singleton()->sky_create(); texture = VS::get_singleton()->texture_create(); @@ -552,6 +552,12 @@ ProceduralSky::ProceduralSky() { ground_curve = 0.02; ground_energy = 1; + if (p_desaturate) { + sky_top_color.set_hsv(sky_top_color.get_h(),0,sky_top_color.get_v()); + sky_horizon_color.set_hsv(sky_horizon_color.get_h(),0,sky_horizon_color.get_v()); + ground_bottom_color.set_hsv(ground_bottom_color.get_h(),0,ground_bottom_color.get_v()); + ground_horizon_color.set_hsv(ground_horizon_color.get_h(),0,ground_horizon_color.get_v()); + } sun_color = Color(1, 1, 1); sun_latitude = 35; sun_longitude = 0; diff --git a/scene/resources/sky.h b/scene/resources/sky.h index 3b410396e0..7327b2a627 100644 --- a/scene/resources/sky.h +++ b/scene/resources/sky.h @@ -191,7 +191,7 @@ public: virtual RID get_rid() const; - ProceduralSky(); + ProceduralSky(bool p_desaturate=false); ~ProceduralSky(); }; diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 3c83de91fd..4ddfc0331b 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -30,6 +30,7 @@ #include "tile_set.h" #include "core/array.h" +#include "core/engine.h" bool TileSet::_set(const StringName &p_name, const Variant &p_value) { @@ -662,6 +663,7 @@ void TileSet::tile_set_shape(int p_id, int p_shape_id, const Ref<Shape2D> &p_sha if (tile_map[p_id].shapes_data.size() <= p_shape_id) tile_map[p_id].shapes_data.resize(p_shape_id + 1); tile_map[p_id].shapes_data.write[p_shape_id].shape = p_shape; + _decompose_convex_shape(p_shape); emit_changed(); } @@ -844,6 +846,9 @@ void TileSet::tile_set_shapes(int p_id, const Vector<ShapeData> &p_shapes) { ERR_FAIL_COND(!tile_map.has(p_id)); tile_map[p_id].shapes_data = p_shapes; + for (int i = 0; i < p_shapes.size(); i++) { + _decompose_convex_shape(p_shapes[i].shape); + } emit_changed(); } @@ -888,9 +893,10 @@ void TileSet::_tile_set_shapes(int p_id, const Array &p_shapes) { } else if (p_shapes[i].get_type() == Variant::DICTIONARY) { Dictionary d = p_shapes[i]; - if (d.has("shape") && d["shape"].get_type() == Variant::OBJECT) + if (d.has("shape") && d["shape"].get_type() == Variant::OBJECT) { s.shape = d["shape"]; - else + _decompose_convex_shape(s.shape); + } else continue; if (d.has("shape_transform") && d["shape_transform"].get_type() == Variant::TRANSFORM2D) @@ -956,6 +962,26 @@ Array TileSet::_get_tiles_ids() const { return arr; } +void TileSet::_decompose_convex_shape(Ref<Shape2D> p_shape) { + if (Engine::get_singleton()->is_editor_hint()) + return; + Ref<ConvexPolygonShape2D> convex = p_shape; + if (!convex.is_valid()) + return; + Vector<Vector<Vector2> > decomp = Geometry::decompose_polygon_in_convex(convex->get_points()); + if (decomp.size() > 1) { + Array sub_shapes; + for (int i = 0; i < decomp.size(); i++) { + Ref<ConvexPolygonShape2D> _convex = memnew(ConvexPolygonShape2D); + _convex->set_points(decomp[i]); + sub_shapes.append(_convex); + } + convex->set_meta("decomposed", sub_shapes); + } else { + convex->set_meta("decomposed", Variant()); + } +} + void TileSet::get_tile_list(List<int> *p_tiles) const { for (Map<int, TileData>::Element *E = tile_map.front(); E; E = E->next()) { diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 4800371d3c..fac48243d0 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -35,6 +35,7 @@ #include "core/resource.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_polygon.h" +#include "scene/resources/convex_polygon_shape_2d.h" #include "scene/resources/shape_2d.h" #include "scene/resources/texture.h" @@ -134,6 +135,7 @@ protected: void _tile_set_shapes(int p_id, const Array &p_shapes); Array _tile_get_shapes(int p_id) const; Array _get_tiles_ids() const; + void _decompose_convex_shape(Ref<Shape2D> p_shape); static void _bind_methods(); diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index 692c28ed99..4e5909eb2e 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -1087,6 +1087,8 @@ const VisualShaderNodeInput::Port VisualShaderNodeInput::ports[] = { { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR, "attenuation", "ATTENUATION" }, { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR, "albedo", "ALBEDO" }, { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR, "transmission", "TRANSMISSION" }, + { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR, "diffuse", "DIFFUSE_LIGHT" }, + { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_VECTOR, "specular", "SPECULAR_LIGHT" }, { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_SCALAR, "roughness", "ROUGHNESS" }, { Shader::MODE_SPATIAL, VisualShader::TYPE_LIGHT, VisualShaderNode::PORT_TYPE_TRANSFORM, "world", "WORLD_MATRIX" }, diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp index 12ee98595d..1a6430c499 100644 --- a/servers/audio/audio_stream.cpp +++ b/servers/audio/audio_stream.cpp @@ -150,7 +150,7 @@ void AudioStreamPlaybackMicrophone::_mix_internal(AudioFrame *p_buffer, int p_fr input_ofs = 0; } else { for (int i = 0; i < p_frames; i++) { - if (input_size > input_ofs) { + if (input_size > input_ofs && (int)input_ofs < buf.size()) { float l = (buf[input_ofs++] >> 16) / 32768.f; if ((int)input_ofs >= buf.size()) { input_ofs = 0; @@ -186,6 +186,10 @@ float AudioStreamPlaybackMicrophone::get_stream_sampling_rate() { void AudioStreamPlaybackMicrophone::start(float p_from_pos) { + if (active) { + return; + } + if (!GLOBAL_GET("audio/enable_audio_input")) { WARN_PRINTS("Need to enable Project settings > Audio > Enable Audio Input option to use capturing."); return; @@ -193,15 +197,17 @@ void AudioStreamPlaybackMicrophone::start(float p_from_pos) { input_ofs = 0; - AudioDriver::get_singleton()->capture_start(); - - active = true; - _begin_resample(); + if (AudioDriver::get_singleton()->capture_start() == OK) { + active = true; + _begin_resample(); + } } void AudioStreamPlaybackMicrophone::stop() { - AudioDriver::get_singleton()->capture_stop(); - active = false; + if (active) { + AudioDriver::get_singleton()->capture_stop(); + active = false; + } } bool AudioStreamPlaybackMicrophone::is_playing() const { diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index df6218ac79..14c555ab5b 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -90,12 +90,16 @@ void AudioDriver::input_buffer_init(int driver_buffer_frames) { void AudioDriver::input_buffer_write(int32_t sample) { - input_buffer.write[input_position++] = sample; - if ((int)input_position >= input_buffer.size()) { - input_position = 0; - } - if ((int)input_size < input_buffer.size()) { - input_size++; + if ((int)input_position < input_buffer.size()) { + input_buffer.write[input_position++] = sample; + if ((int)input_position >= input_buffer.size()) { + input_position = 0; + } + if ((int)input_size < input_buffer.size()) { + input_size++; + } + } else { + WARN_PRINTS("input_buffer_write: Invalid input_position=" + itos(input_position) + " input_buffer.size()=" + itos(input_buffer.size())); } } @@ -145,6 +149,8 @@ AudioDriver::AudioDriver() { _last_mix_time = 0; _mix_amount = 0; + input_position = 0; + input_size = 0; #ifdef DEBUG_ENABLED prof_time = 0; diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index 2975ae9453..36d18e8901 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -40,10 +40,10 @@ #include "joints/pin_joint_sw.h" #include "joints/slider_joint_sw.h" -#define FLUSH_QUERY_CHECK \ - if (flushing_queries) { \ - ERR_EXPLAIN("Can't change this state while flushing queries. Use call_deferred()/set_deferred() to change monitoring state instead"); \ - ERR_FAIL(); \ +#define FLUSH_QUERY_CHECK(m_object) \ + if (m_object->get_space() && flushing_queries) { \ + ERR_EXPLAIN("Can't change this state while flushing queries. Use call_deferred() or set_deferred() to change monitoring state instead"); \ + ERR_FAIL(); \ } RID PhysicsServerSW::shape_create(ShapeType p_shape) { @@ -358,11 +358,10 @@ void PhysicsServerSW::area_clear_shapes(RID p_area) { void PhysicsServerSW::area_set_shape_disabled(RID p_area, int p_shape_idx, bool p_disabled) { - FLUSH_QUERY_CHECK - AreaSW *area = area_owner.get(p_area); ERR_FAIL_COND(!area); ERR_FAIL_INDEX(p_shape_idx, area->get_shape_count()); + FLUSH_QUERY_CHECK(area); area->set_shape_as_disabled(p_shape_idx, p_disabled); } @@ -443,10 +442,9 @@ void PhysicsServerSW::area_set_collision_mask(RID p_area, uint32_t p_mask) { void PhysicsServerSW::area_set_monitorable(RID p_area, bool p_monitorable) { - FLUSH_QUERY_CHECK - AreaSW *area = area_owner.get(p_area); ERR_FAIL_COND(!area); + FLUSH_QUERY_CHECK(area); area->set_monitorable(p_monitorable); } @@ -592,11 +590,11 @@ RID PhysicsServerSW::body_get_shape(RID p_body, int p_shape_idx) const { void PhysicsServerSW::body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) { - FLUSH_QUERY_CHECK - BodySW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); ERR_FAIL_INDEX(p_shape_idx, body->get_shape_count()); + FLUSH_QUERY_CHECK(body); + body->set_shape_as_disabled(p_shape_idx, p_disabled); } diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index 4d1c56b843..283d20876d 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -36,8 +36,8 @@ #include "core/project_settings.h" #include "core/script_language.h" -#define FLUSH_QUERY_CHECK \ - if (flushing_queries) { \ +#define FLUSH_QUERY_CHECK(m_object) \ + if (m_object->get_space() && flushing_queries) { \ ERR_EXPLAIN("Can't change this state while flushing queries. Use call_deferred() or set_deferred() to change monitoring state instead"); \ ERR_FAIL(); \ } @@ -410,12 +410,11 @@ void Physics2DServerSW::area_set_shape_transform(RID p_area, int p_shape_idx, co void Physics2DServerSW::area_set_shape_disabled(RID p_area, int p_shape, bool p_disabled) { - FLUSH_QUERY_CHECK - Area2DSW *area = area_owner.get(p_area); ERR_FAIL_COND(!area); - ERR_FAIL_INDEX(p_shape, area->get_shape_count()); + FLUSH_QUERY_CHECK(area); + area->set_shape_as_disabled(p_shape, p_disabled); } @@ -550,10 +549,9 @@ void Physics2DServerSW::area_set_pickable(RID p_area, bool p_pickable) { void Physics2DServerSW::area_set_monitorable(RID p_area, bool p_monitorable) { - FLUSH_QUERY_CHECK - Area2DSW *area = area_owner.get(p_area); ERR_FAIL_COND(!area); + FLUSH_QUERY_CHECK(area); area->set_monitorable(p_monitorable); } @@ -630,10 +628,9 @@ RID Physics2DServerSW::body_get_space(RID p_body) const { void Physics2DServerSW::body_set_mode(RID p_body, BodyMode p_mode) { - FLUSH_QUERY_CHECK - Body2DSW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); + FLUSH_QUERY_CHECK(body); body->set_mode(p_mode); }; @@ -734,12 +731,10 @@ void Physics2DServerSW::body_clear_shapes(RID p_body) { void Physics2DServerSW::body_set_shape_disabled(RID p_body, int p_shape_idx, bool p_disabled) { - FLUSH_QUERY_CHECK - Body2DSW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); - ERR_FAIL_INDEX(p_shape_idx, body->get_shape_count()); + FLUSH_QUERY_CHECK(body); body->set_shape_as_disabled(p_shape_idx, p_disabled); } @@ -747,8 +742,8 @@ void Physics2DServerSW::body_set_shape_as_one_way_collision(RID p_body, int p_sh Body2DSW *body = body_owner.get(p_body); ERR_FAIL_COND(!body); - ERR_FAIL_INDEX(p_shape_idx, body->get_shape_count()); + FLUSH_QUERY_CHECK(body); body->set_shape_as_one_way_collision(p_shape_idx, p_enable, p_margin); } diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index 922f017d0b..0cc1cc119c 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -73,7 +73,11 @@ static void _debugger_get_resource_usage(List<ScriptDebuggerRemote::ResourceUsag usage.vram = E->get().bytes; usage.id = E->get().texture; usage.type = "Texture"; - usage.format = itos(E->get().width) + "x" + itos(E->get().height) + " " + Image::get_format_name(E->get().format); + if (E->get().depth == 0) { + usage.format = itos(E->get().width) + "x" + itos(E->get().height) + " " + Image::get_format_name(E->get().format); + } else { + usage.format = itos(E->get().width) + "x" + itos(E->get().height) + "x" + itos(E->get().depth) + " " + Image::get_format_name(E->get().format); + } r_usage->push_back(usage); } } diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 8502ef5bf7..dd54698471 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -355,6 +355,7 @@ public: virtual void skeleton_bone_set_transform_2d(RID p_skeleton, int p_bone, const Transform2D &p_transform) = 0; virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton, int p_bone) const = 0; virtual void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) = 0; + virtual void skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_world_transform) = 0; /* Light API */ diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index fb57de5a7b..85dcaa6b03 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -758,11 +758,12 @@ void VisualServerCanvas::canvas_item_add_triangle_array(RID p_item, const Vector Item *canvas_item = canvas_item_owner.getornull(p_item); ERR_FAIL_COND(!canvas_item); - int ps = p_points.size(); - ERR_FAIL_COND(!p_colors.empty() && p_colors.size() != ps && p_colors.size() != 1); - ERR_FAIL_COND(!p_uvs.empty() && p_uvs.size() != ps); - ERR_FAIL_COND(!p_bones.empty() && p_bones.size() != ps * 4); - ERR_FAIL_COND(!p_weights.empty() && p_weights.size() != ps * 4); + int vertex_count = p_points.size(); + ERR_FAIL_COND(vertex_count == 0); + ERR_FAIL_COND(!p_colors.empty() && p_colors.size() != vertex_count && p_colors.size() != 1); + ERR_FAIL_COND(!p_uvs.empty() && p_uvs.size() != vertex_count); + ERR_FAIL_COND(!p_bones.empty() && p_bones.size() != vertex_count * 4); + ERR_FAIL_COND(!p_weights.empty() && p_weights.size() != vertex_count * 4); Vector<int> indices = p_indices; @@ -770,9 +771,9 @@ void VisualServerCanvas::canvas_item_add_triangle_array(RID p_item, const Vector if (indices.empty()) { - ERR_FAIL_COND(ps % 3 != 0); + ERR_FAIL_COND(vertex_count % 3 != 0); if (p_count == -1) - count = ps; + count = vertex_count; } else { ERR_FAIL_COND(indices.size() % 3 != 0); diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index 6622433b17..a9ca920178 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -123,7 +123,6 @@ void VisualServerRaster::draw(bool p_swap_buffers, double frame_step) { frame_drawn_callbacks.pop_front(); } - VS::get_singleton()->emit_signal("frame_post_draw"); } void VisualServerRaster::sync() { diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 89a759b963..a1204c7573 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -296,6 +296,7 @@ public: BIND3(skeleton_bone_set_transform_2d, RID, int, const Transform2D &) BIND2RC(Transform2D, skeleton_bone_get_transform_2d, RID, int) BIND2(skeleton_set_base_transform_2d, RID, const Transform2D &) + BIND3(skeleton_set_world_transform, RID, bool, const Transform &) /* Light API */ diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index 42be56cfdd..2590e29aef 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -445,6 +445,9 @@ void VisualServerScene::instance_set_base(RID p_instance, RID p_base) { InstanceGeometryData *geom = memnew(InstanceGeometryData); instance->base_data = geom; + if (instance->base_type == VS::INSTANCE_MESH) { + instance->blend_values.resize(VSG::storage->mesh_get_blend_shape_count(p_base)); + } } break; case VS::INSTANCE_REFLECTION_PROBE: { diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h index 4e3015c020..5176551540 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/visual/visual_server_viewport.h @@ -90,7 +90,8 @@ public: } CanvasKey(const RID &p_canvas, int p_layer, int p_sublayer) { canvas = p_canvas; - stacking = ((int64_t)p_layer << 32) + p_sublayer; + int64_t sign = p_layer < 0 ? -1 : 1; + stacking = sign * (((int64_t)ABS(p_layer)) << 32) + p_sublayer; } int get_layer() const { return stacking >> 32; } }; diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index a6f0bd9d16..c6da6799a5 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -232,6 +232,7 @@ public: FUNC3(skeleton_bone_set_transform_2d, RID, int, const Transform2D &) FUNC2RC(Transform2D, skeleton_bone_get_transform_2d, RID, int) FUNC2(skeleton_set_base_transform_2d, RID, const Transform2D &) + FUNC3(skeleton_set_world_transform, RID, bool, const Transform &) /* Light API */ diff --git a/servers/visual_server.h b/servers/visual_server.h index 96a5d19efd..63ddc3328a 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -393,6 +393,7 @@ public: virtual void skeleton_bone_set_transform_2d(RID p_skeleton, int p_bone, const Transform2D &p_transform) = 0; virtual Transform2D skeleton_bone_get_transform_2d(RID p_skeleton, int p_bone) const = 0; virtual void skeleton_set_base_transform_2d(RID p_skeleton, const Transform2D &p_base_transform) = 0; + virtual void skeleton_set_world_transform(RID p_skeleton, bool p_enable, const Transform &p_base_transform) = 0; /* Light API */ diff --git a/thirdparty/README.md b/thirdparty/README.md index 994a320122..b0039c2865 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -19,7 +19,7 @@ comments. ## bullet - Upstream: https://github.com/bulletphysics/bullet3 -- Version: git (126b676, 2018-12-31) +- Version: 2.88 - License: zlib Files extracted from upstream source: @@ -128,7 +128,7 @@ Files extracted from upstream source: ## glad - Upstream: https://github.com/Dav1dde/glad -- Version: 0.1.28 +- Version: 0.1.29 - License: MIT The files we package are automatically generated. @@ -239,7 +239,7 @@ from the Android NDK r18. ## libwebp - Upstream: https://chromium.googlesource.com/webm/libwebp/ -- Version: 1.0.1 +- Version: 1.0.2 - License: BSD-3-Clause Files extracted from upstream source: @@ -255,7 +255,7 @@ changes are marked with `// -- GODOT --` comments. ## libwebsockets - Upstream: https://github.com/warmcat/libwebsockets -- Version: 3.0.0 +- Version: 3.0.1 - License: LGPLv2.1 + static linking exception File extracted from upstream source: @@ -292,10 +292,11 @@ File extracted from upstream release tarball `mbedtls-2.16.0-apache.tgz`: ## miniupnpc - Upstream: https://github.com/miniupnp/miniupnp/tree/master/miniupnpc -- Version: 2.1 (git 25615e0, 2018-05-08) with modifications +- Version: git (25615e0, 2018) - License: BSD-3-Clause -The only modified file is miniupnpcstrings.h, which was created for Godot (is usually autogenerated by cmake). +The only modified file is miniupnpcstrings.h, which was created for Godot +(it is usually autogenerated by cmake). ## minizip @@ -380,7 +381,7 @@ Collection of single-file libraries used in Godot components. - `ifaddrs-android.{cc,h}` * Upstream: https://chromium.googlesource.com/external/webrtc/stable/talk/+/master/base/ifaddrs-android.h - * Version: 5976650 (2013) + * Version: git (5976650, 2013) * License: BSD-3-Clause ### scene @@ -395,18 +396,18 @@ Collection of single-file libraries used in Godot components. * License: zlib - `stb_truetype.h` * Upstream: https://github.com/nothings/stb - * Version: 1.19 + * Version: 1.21 * License: Public Domain (Unlicense) or MIT - `stb_vorbis.c` * Upstream: https://github.com/nothings/stb - * Version: 1.14 + * Version: 1.15 * License: Public Domain (Unlicense) or MIT ## nanosvg - Upstream: https://github.com/memononen/nanosvg -- Version: 9a74da4 (git) +- Version: git (c1f6e20, 2018) - License: zlib Files extracted from the upstream source: @@ -435,16 +436,16 @@ Files extracted from upstream source: ## pcre2 - Upstream: http://www.pcre.org/ -- Version: 10.31 +- Version: 10.32 - License: BSD-3-Clause Files extracted from upstream source: - Files listed in the file NON-AUTOTOOLS-BUILD steps 1-4 -- All .h files in src/ +- All .h files in src/ apart from pcre2posix.h +- src/pcre2_jit_compile.c - src/pcre2_jit_match.c - src/pcre2_jit_misc.c -- src/pcre2_jit_maketables.c - src/sljit/* - AUTHORS and LICENCE @@ -506,7 +507,7 @@ changes are marked with `// -- GODOT --` comments. ## tinyexr - Upstream: https://github.com/syoyo/tinyexr -- Version: git (5ae30aa, 2018) +- Version: git (65f9859, 2018) - License: BSD-3-Clause Files extracted from upstream source: diff --git a/thirdparty/glad/LICENSE b/thirdparty/glad/LICENSE new file mode 100644 index 0000000000..b6e2ca25b0 --- /dev/null +++ b/thirdparty/glad/LICENSE @@ -0,0 +1,20 @@ +The MIT License (MIT) + +Copyright (c) 2013-2018 David Herberth + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS +FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/thirdparty/glad/glad.c b/thirdparty/glad/glad.c index 8cc09e46e1..e7c64a7e17 100644 --- a/thirdparty/glad/glad.c +++ b/thirdparty/glad/glad.c @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.28 on Thu Nov 22 16:50:04 2018. + OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. Language/Generator: C/C++ Specification: gl @@ -180,11 +180,7 @@ static int get_exts(void) { num_exts_i = 0; glGetIntegerv(GL_NUM_EXTENSIONS, &num_exts_i); if (num_exts_i > 0) { - char **tmp_exts_i = (char **)realloc((void *)exts_i, (size_t)num_exts_i * (sizeof *exts_i)); - if (tmp_exts_i == NULL) { - return 0; - } - exts_i = tmp_exts_i; + exts_i = (char **)malloc((size_t)num_exts_i * (sizeof *exts_i)); } if (exts_i == NULL) { diff --git a/thirdparty/glad/glad/glad.h b/thirdparty/glad/glad/glad.h index 52b05e0ae6..6345de6f7a 100644 --- a/thirdparty/glad/glad/glad.h +++ b/thirdparty/glad/glad/glad.h @@ -1,6 +1,6 @@ /* - OpenGL loader generated by glad 0.1.28 on Thu Nov 22 16:50:04 2018. + OpenGL loader generated by glad 0.1.29 on Mon Mar 4 12:47:22 2019. Language/Generator: C/C++ Specification: gl diff --git a/thirdparty/libpng/LICENSE b/thirdparty/libpng/LICENSE index 6ee9c8f554..62ab8e48dc 100644 --- a/thirdparty/libpng/LICENSE +++ b/thirdparty/libpng/LICENSE @@ -1,14 +1,43 @@ +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= -This copy of the libpng notices is provided for your convenience. In case of -any discrepancy between this copy and the notices in the file png.h that is -included in the libpng distribution, the latter shall prevail. +PNG Reference Library License version 2 +--------------------------------------- -COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + * Copyright (c) 1995-2018 The PNG Reference Library Authors. + * Copyright (c) 2018 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. -If you modify libpng you may insert additional notices immediately following -this sentence. +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no even shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. -This code is released under the libpng license. +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + + +PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) +----------------------------------------------------------------------- libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are @@ -16,38 +45,38 @@ derived from libpng-1.0.6, and are distributed according to the same disclaimer and license as libpng-1.0.6 with the following individuals added to the list of Contributing Authors: - Simon-Pierre Cadieux - Eric S. Raymond - Mans Rullgard - Cosmin Truta - Gilles Vollant - James Yu - Mandar Sahastrabuddhe - Google Inc. - Vadim Barkov + Simon-Pierre Cadieux + Eric S. Raymond + Mans Rullgard + Cosmin Truta + Gilles Vollant + James Yu + Mandar Sahastrabuddhe + Google Inc. + Vadim Barkov and with the following additions to the disclaimer: - There is no warranty against interference with your enjoyment of the - library or against infringement. There is no warranty that our - efforts or the library will fulfill any of your particular purposes - or needs. This library is provided with all faults, and the entire - risk of satisfactory quality, performance, accuracy, and effort is with - the user. + There is no warranty against interference with your enjoyment of + the library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is + with the user. Some files in the "contrib" directory and some configure-generated -files that are distributed with libpng have other copyright owners and +files that are distributed with libpng have other copyright owners, and are released under other open source licenses. libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from libpng-0.96, and are distributed according to the same disclaimer and -license as libpng-0.96, with the following individuals added to the list -of Contributing Authors: +license as libpng-0.96, with the following individuals added to the +list of Contributing Authors: - Tom Lane - Glenn Randers-Pehrson - Willem van Schaik + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik libpng versions 0.89, June 1996, through 0.96, May 1997, are Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -55,14 +84,14 @@ and are distributed according to the same disclaimer and license as libpng-0.88, with the following individuals added to the list of Contributing Authors: - John Bowler - Kevin Bracey - Sam Bushell - Magnus Holmgren - Greg Roelofs - Tom Tanner + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner -Some files in the "scripts" directory have other copyright owners +Some files in the "scripts" directory have other copyright owners, but are released under this license. libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -71,63 +100,35 @@ Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. For the purposes of this copyright and license, "Contributing Authors" is defined as the following set of individuals: - Andreas Dilger - Dave Martindale - Guy Eric Schalnat - Paul Schmidt - Tim Wegner - -The PNG Reference Library is supplied "AS IS". The Contributing Authors -and Group 42, Inc. disclaim all warranties, expressed or implied, -including, without limitation, the warranties of merchantability and of -fitness for any purpose. The Contributing Authors and Group 42, Inc. -assume no liability for direct, indirect, incidental, special, exemplary, -or consequential damages, which may result from the use of the PNG -Reference Library, even if advised of the possibility of such damage. + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing +Authors and Group 42, Inc. disclaim all warranties, expressed or +implied, including, without limitation, the warranties of +merchantability and of fitness for any purpose. The Contributing +Authors and Group 42, Inc. assume no liability for direct, indirect, +incidental, special, exemplary, or consequential damages, which may +result from the use of the PNG Reference Library, even if advised of +the possibility of such damage. Permission is hereby granted to use, copy, modify, and distribute this source code, or portions hereof, for any purpose, without fee, subject to the following restrictions: - 1. The origin of this source code must not be misrepresented. - - 2. Altered versions must be plainly marked as such and must not - be misrepresented as being the original source. - - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. - -The Contributing Authors and Group 42, Inc. specifically permit, without -fee, and encourage the use of this source code as a component to -supporting the PNG file format in commercial products. If you use this -source code in a product, acknowledgment is not required but would be -appreciated. - -END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. - -TRADEMARK: - -The name "libpng" has not been registered by the Copyright owner -as a trademark in any jurisdiction. However, because libpng has -been distributed and maintained world-wide, continually since 1995, -the Copyright owner claims "common-law trademark protection" in any -jurisdiction where common-law trademark is recognized. - -OSI CERTIFICATION: - -Libpng is OSI Certified Open Source Software. OSI Certified Open Source is -a certification mark of the Open Source Initiative. OSI has not addressed -the additional disclaimers inserted at version 1.0.7. + 1. The origin of this source code must not be misrepresented. -EXPORT CONTROL: + 2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. -The Copyright owner believes that the Export Control Classification -Number (ECCN) for libpng is EAR99, which means not subject to export -controls or International Traffic in Arms Regulations (ITAR) because -it is open source, publicly available software, that does not contain -any encryption software. See the EAR, paragraphs 734.3(b)(3) and -734.7(b). + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. -Glenn Randers-Pehrson -glennrp at users.sourceforge.net -July 15, 2018 +The Contributing Authors and Group 42, Inc. specifically permit, +without fee, and encourage the use of this source code as a component +to supporting the PNG file format in commercial products. If you use +this source code in a product, acknowledgment is not required but would +be appreciated. diff --git a/thirdparty/libpng/arm/arm_init.c b/thirdparty/libpng/arm/arm_init.c index 02df812e77..a34ecdbef7 100644 --- a/thirdparty/libpng/arm/arm_init.c +++ b/thirdparty/libpng/arm/arm_init.c @@ -1,14 +1,15 @@ /* arm_init.c - NEON optimised filter functions * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 2014,2016 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.22 [May 26, 2016] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h */ + /* Below, after checking __linux__, various non-C90 POSIX 1003.1 functions are * called. */ diff --git a/thirdparty/libpng/arm/filter_neon.S b/thirdparty/libpng/arm/filter_neon.S index 000764cd21..2308aad13e 100644 --- a/thirdparty/libpng/arm/filter_neon.S +++ b/thirdparty/libpng/arm/filter_neon.S @@ -1,9 +1,9 @@ /* filter_neon.S - NEON optimised filter functions * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 2014,2017 Glenn Randers-Pehrson * Written by Mans Rullgard, 2011. - * Last changed in libpng 1.6.31 [July 27, 2017] * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/arm/filter_neon_intrinsics.c b/thirdparty/libpng/arm/filter_neon_intrinsics.c index ea7e356bcc..553c0be21c 100644 --- a/thirdparty/libpng/arm/filter_neon_intrinsics.c +++ b/thirdparty/libpng/arm/filter_neon_intrinsics.c @@ -1,12 +1,11 @@ /* filter_neon_intrinsics.c - NEON optimised filter functions * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 2014,2016 Glenn Randers-Pehrson * Written by James Yu <james.yu at linaro.org>, October 2013. * Based on filter_neon.S, written by Mans Rullgard, 2011. * - * Last changed in libpng 1.6.22 [May 26, 2016] - * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer * and license in png.h @@ -19,7 +18,11 @@ /* This code requires -mfpu=neon on the command line: */ #if PNG_ARM_NEON_IMPLEMENTATION == 1 /* intrinsics code from pngpriv.h */ -#include <arm_neon.h> +#if defined(_MSC_VER) && defined(_M_ARM64) +# include <arm64_neon.h> +#else +# include <arm_neon.h> +#endif /* libpng row pointers are not necessarily aligned to any particular boundary, * however this code will only work with appropriate alignment. arm/arm_init.c @@ -33,6 +36,11 @@ * 'type'. This is written this way just to hide the GCC strict aliasing * warning; note that the code is safe because there never is an alias between * the input and output pointers. + * + * When compiling with MSVC ARM64, the png_ldr macro can't be passed directly + * to vst4_lane_u32, because of an internal compiler error inside MSVC. + * To avoid this compiler bug, we use a temporary variable (vdest_val) to store + * the result of png_ldr. */ #define png_ldr(type,pointer)\ (temp_pointer = png_ptr(type,pointer), *temp_pointer) @@ -125,12 +133,15 @@ png_read_filter_row_sub4_neon(png_row_infop row_info, png_bytep row, uint8x8x4_t *vrpt = png_ptr(uint8x8x4_t,&vtmp); uint8x8x4_t vrp = *vrpt; uint32x2x4_t *temp_pointer; + uint32x2x4_t vdest_val; vdest.val[0] = vadd_u8(vdest.val[3], vrp.val[0]); vdest.val[1] = vadd_u8(vdest.val[0], vrp.val[1]); vdest.val[2] = vadd_u8(vdest.val[1], vrp.val[2]); vdest.val[3] = vadd_u8(vdest.val[2], vrp.val[3]); - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + + vdest_val = png_ldr(uint32x2x4_t, &vdest); + vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0); } PNG_UNUSED(prev_row) @@ -223,6 +234,7 @@ png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row, uint8x8x4_t *vrpt, *vppt; uint8x8x4_t vrp, vpp; uint32x2x4_t *temp_pointer; + uint32x2x4_t vdest_val; vtmp = vld4_u32(png_ptr(uint32_t,rp)); vrpt = png_ptr(uint8x8x4_t,&vtmp); @@ -240,7 +252,8 @@ png_read_filter_row_avg4_neon(png_row_infop row_info, png_bytep row, vdest.val[3] = vhadd_u8(vdest.val[2], vpp.val[3]); vdest.val[3] = vadd_u8(vdest.val[3], vrp.val[3]); - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + vdest_val = png_ldr(uint32x2x4_t, &vdest); + vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0); } } @@ -359,6 +372,7 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, uint8x8x4_t *vrpt, *vppt; uint8x8x4_t vrp, vpp; uint32x2x4_t *temp_pointer; + uint32x2x4_t vdest_val; vtmp = vld4_u32(png_ptr(uint32_t,rp)); vrpt = png_ptr(uint8x8x4_t,&vtmp); @@ -378,7 +392,8 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row, vlast = vpp.val[3]; - vst4_lane_u32(png_ptr(uint32_t,rp), png_ldr(uint32x2x4_t,&vdest), 0); + vdest_val = png_ldr(uint32x2x4_t, &vdest); + vst4_lane_u32(png_ptr(uint32_t,rp), vdest_val, 0); } } diff --git a/thirdparty/libpng/arm/palette_neon_intrinsics.c b/thirdparty/libpng/arm/palette_neon_intrinsics.c new file mode 100644 index 0000000000..fa02d6a8b3 --- /dev/null +++ b/thirdparty/libpng/arm/palette_neon_intrinsics.c @@ -0,0 +1,149 @@ + +/* palette_neon_intrinsics.c - NEON optimised palette expansion functions + * + * Copyright (c) 2018 Cosmin Truta + * Copyright (c) 2017-2018 Arm Holdings. All rights reserved. + * Written by Richard Townsend <Richard.Townsend@arm.com>, February 2017. + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + */ + +#include "../pngpriv.h" + +#if PNG_ARM_NEON_IMPLEMENTATION == 1 + +#if defined(_MSC_VER) && defined(_M_ARM64) +# include <arm64_neon.h> +#else +# include <arm_neon.h> +#endif + +/* Build an RGBA palette from the RGB and separate alpha palettes. */ +void +png_riffle_palette_rgba(png_structrp png_ptr, png_row_infop row_info) +{ + png_const_colorp palette = png_ptr->palette; + png_bytep riffled_palette = png_ptr->riffled_palette; + png_const_bytep trans_alpha = png_ptr->trans_alpha; + int num_trans = png_ptr->num_trans; + int i; + + /* Initially black, opaque. */ + uint8x16x4_t w = {{ + vdupq_n_u8(0x00), + vdupq_n_u8(0x00), + vdupq_n_u8(0x00), + vdupq_n_u8(0xff), + }}; + + if (row_info->bit_depth != 8) + { + png_error(png_ptr, "bit_depth must be 8 for png_riffle_palette_rgba"); + return; + } + + /* First, riffle the RGB colours into a RGBA palette, the A value is + * set to opaque for now. + */ + for (i = 0; i < (1 << row_info->bit_depth); i += 16) + { + uint8x16x3_t v = vld3q_u8((png_const_bytep)(palette + i)); + w.val[0] = v.val[0]; + w.val[1] = v.val[1]; + w.val[2] = v.val[2]; + vst4q_u8(riffled_palette + (i << 2), w); + } + + /* Fix up the missing transparency values. */ + for (i = 0; i < num_trans; i++) + riffled_palette[(i << 2) + 3] = trans_alpha[i]; +} + +/* Expands a palettized row into RGBA. */ +int +png_do_expand_palette_neon_rgba(png_structrp png_ptr, png_row_infop row_info, + png_const_bytep row, png_bytepp ssp, png_bytepp ddp) +{ + png_uint_32 row_width = row_info->width; + const png_uint_32 *riffled_palette = + (const png_uint_32 *)png_ptr->riffled_palette; + const png_int_32 pixels_per_chunk = 4; + int i; + + if (row_width < pixels_per_chunk) + return 0; + + /* This function originally gets the last byte of the output row. + * The NEON part writes forward from a given position, so we have + * to seek this back by 4 pixels x 4 bytes. + */ + *ddp = *ddp - ((pixels_per_chunk * sizeof(png_uint_32)) - 1); + + for (i = 0; i < row_width; i += pixels_per_chunk) + { + uint32x4_t cur; + png_bytep sp = *ssp - i, dp = *ddp - (i << 2); + cur = vld1q_dup_u32 (riffled_palette + *(sp - 3)); + cur = vld1q_lane_u32(riffled_palette + *(sp - 2), cur, 1); + cur = vld1q_lane_u32(riffled_palette + *(sp - 1), cur, 2); + cur = vld1q_lane_u32(riffled_palette + *(sp - 0), cur, 3); + vst1q_u32((void *)dp, cur); + } + if (i != row_width) + { + /* Remove the amount that wasn't processed. */ + i -= pixels_per_chunk; + } + + /* Decrement output pointers. */ + *ssp = *ssp - i; + *ddp = *ddp - (i << 2); + return i; +} + +/* Expands a palettized row into RGB format. */ +int +png_do_expand_palette_neon_rgb(png_structrp png_ptr, png_row_infop row_info, + png_const_bytep row, png_bytepp ssp, png_bytepp ddp) +{ + png_uint_32 row_width = row_info->width; + png_const_bytep palette = (png_const_bytep)png_ptr->palette; + const png_uint_32 pixels_per_chunk = 8; + int i; + + if (row_width <= pixels_per_chunk) + return 0; + + /* Seeking this back by 8 pixels x 3 bytes. */ + *ddp = *ddp - ((pixels_per_chunk * sizeof(png_color)) - 1); + + for (i = 0; i < row_width; i += pixels_per_chunk) + { + uint8x8x3_t cur; + png_bytep sp = *ssp - i, dp = *ddp - ((i << 1) + i); + cur = vld3_dup_u8(palette + sizeof(png_color) * (*(sp - 7))); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 6)), cur, 1); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 5)), cur, 2); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 4)), cur, 3); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 3)), cur, 4); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 2)), cur, 5); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 1)), cur, 6); + cur = vld3_lane_u8(palette + sizeof(png_color) * (*(sp - 0)), cur, 7); + vst3_u8((void *)dp, cur); + } + + if (i != row_width) + { + /* Remove the amount that wasn't processed. */ + i -= pixels_per_chunk; + } + + /* Decrement output pointers. */ + *ssp = *ssp - i; + *ddp = *ddp - ((i << 1) + i); + return i; +} + +#endif /* PNG_ARM_NEON_IMPLEMENTATION */ diff --git a/thirdparty/libpng/png.c b/thirdparty/libpng/png.c index a25afebcc8..3dce191d17 100644 --- a/thirdparty/libpng/png.c +++ b/thirdparty/libpng/png.c @@ -1,10 +1,10 @@ /* png.c - location for general purpose libpng functions * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -14,7 +14,7 @@ #include "pngpriv.h" /* Generate a compiler error if there is an old png.h in the search path. */ -typedef png_libpng_version_1_6_35 Your_png_h_is_not_version_1_6_35; +typedef png_libpng_version_1_6_36 Your_png_h_is_not_version_1_6_36; #ifdef __GNUC__ /* The version tests may need to be added to, but the problem warning has @@ -736,7 +736,7 @@ png_save_int_32(png_bytep buf, png_int_32 i) int PNGAPI png_convert_to_rfc1123_buffer(char out[29], png_const_timep ptime) { - static PNG_CONST char short_months[12][4] = + static const char short_months[12][4] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"}; @@ -814,20 +814,14 @@ png_get_copyright(png_const_structrp png_ptr) #ifdef PNG_STRING_COPYRIGHT return PNG_STRING_COPYRIGHT #else -# ifdef __STDC__ return PNG_STRING_NEWLINE \ - "libpng version 1.6.35 - July 15, 2018" PNG_STRING_NEWLINE \ + "libpng version 1.6.36" PNG_STRING_NEWLINE \ + "Copyright (c) 2018 Cosmin Truta" PNG_STRING_NEWLINE \ "Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson" \ PNG_STRING_NEWLINE \ "Copyright (c) 1996-1997 Andreas Dilger" PNG_STRING_NEWLINE \ "Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc." \ PNG_STRING_NEWLINE; -# else - return "libpng version 1.6.35 - July 15, 2018\ - Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson\ - Copyright (c) 1996-1997 Andreas Dilger\ - Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc."; -# endif #endif } @@ -1121,7 +1115,7 @@ png_colorspace_set_gamma(png_const_structrp png_ptr, png_colorspacerp colorspace, png_fixed_point gAMA) { /* Changed in libpng-1.5.4 to limit the values to ensure overflow can't - * occur. Since the fixed point representation is asymetrical it is + * occur. Since the fixed point representation is asymmetrical it is * possible for 1/gamma to overflow the limit of 21474 and this means the * gamma value must be at least 5/100000 and hence at most 20000.0. For * safety the limits here are a little narrower. The values are 0.00016 to @@ -3134,11 +3128,11 @@ png_ascii_from_fp(png_const_structrp png_ptr, png_charp ascii, size_t size, /* The total output count (max) is now 4+precision */ /* Check for an exponent, if we don't need one we are - * done and just need to terminate the string. At - * this point exp_b10==(-1) is effectively a flag - it got - * to '-1' because of the decrement after outputting - * the decimal point above (the exponent required is - * *not* -1!) + * done and just need to terminate the string. At this + * point, exp_b10==(-1) is effectively a flag: it got + * to '-1' because of the decrement, after outputting + * the decimal point above. (The exponent required is + * *not* -1.) */ if (exp_b10 >= (-1) && exp_b10 <= 2) { @@ -3976,18 +3970,18 @@ png_gamma_correct(png_structrp png_ptr, unsigned int value, */ static void png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, - PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val) + unsigned int shift, png_fixed_point gamma_val) { /* Various values derived from 'shift': */ - PNG_CONST unsigned int num = 1U << (8U - shift); + unsigned int num = 1U << (8U - shift); #ifdef PNG_FLOATING_ARITHMETIC_SUPPORTED /* CSE the division and work round wacky GCC warnings (see the comments * in png_gamma_8bit_correct for where these come from.) */ - PNG_CONST double fmax = 1./(((png_int_32)1 << (16U - shift))-1); + double fmax = 1.0 / (((png_int_32)1 << (16U - shift)) - 1); #endif - PNG_CONST unsigned int max = (1U << (16U - shift))-1U; - PNG_CONST unsigned int max_by_2 = 1U << (15U-shift); + unsigned int max = (1U << (16U - shift)) - 1U; + unsigned int max_by_2 = 1U << (15U - shift); unsigned int i; png_uint_16pp table = *ptable = @@ -4053,10 +4047,10 @@ png_build_16bit_table(png_structrp png_ptr, png_uint_16pp *ptable, */ static void png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable, - PNG_CONST unsigned int shift, PNG_CONST png_fixed_point gamma_val) + unsigned int shift, png_fixed_point gamma_val) { - PNG_CONST unsigned int num = 1U << (8U - shift); - PNG_CONST unsigned int max = (1U << (16U - shift))-1U; + unsigned int num = 1U << (8U - shift); + unsigned int max = (1U << (16U - shift))-1U; unsigned int i; png_uint_32 last; @@ -4121,7 +4115,7 @@ png_build_16to8_table(png_structrp png_ptr, png_uint_16pp *ptable, */ static void png_build_8bit_table(png_structrp png_ptr, png_bytepp ptable, - PNG_CONST png_fixed_point gamma_val) + png_fixed_point gamma_val) { unsigned int i; png_bytep table = *ptable = (png_bytep)png_malloc(png_ptr, 256); diff --git a/thirdparty/libpng/png.h b/thirdparty/libpng/png.h index 19e464cc17..8e272a0553 100644 --- a/thirdparty/libpng/png.h +++ b/thirdparty/libpng/png.h @@ -1,29 +1,65 @@ /* png.h - header file for PNG reference library * - * libpng version 1.6.35, July 15, 2018 + * libpng version 1.6.36 - December 1, 2018 * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * - * This code is released under the libpng license (See LICENSE, below) + * This code is released under the libpng license. (See LICENSE, below.) * * Authors and maintainers: * libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat * libpng versions 0.89, June 1996, through 0.96, May 1997: Andreas Dilger - * libpng versions 0.97, January 1998, through 1.6.35, July 15, 2018: + * libpng versions 0.97, January 1998, through 1.6.35, July 2018: * Glenn Randers-Pehrson. + * libpng version 1.6.36, December 1, 2018: Cosmin Truta * See also "Contributing Authors", below. */ /* - * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + * COPYRIGHT NOTICE, DISCLAIMER, and LICENSE + * ========================================= + * + * PNG Reference Library License version 2 + * --------------------------------------- + * + * * Copyright (c) 1995-2018 The PNG Reference Library Authors. + * * Copyright (c) 2018 Cosmin Truta. + * * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * * Copyright (c) 1996-1997 Andreas Dilger. + * * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + * + * The software is supplied "as is", without warranty of any kind, + * express or implied, including, without limitation, the warranties + * of merchantability, fitness for a particular purpose, title, and + * non-infringement. In no even shall the Copyright owners, or + * anyone distributing the software, be liable for any damages or + * other liability, whether in contract, tort or otherwise, arising + * from, out of, or in connection with the software, or the use or + * other dealings in the software, even if advised of the possibility + * of such damage. + * + * Permission is hereby granted to use, copy, modify, and distribute + * this software, or portions hereof, for any purpose, without fee, + * subject to the following restrictions: * - * If you modify libpng you may insert additional notices immediately following - * this sentence. + * 1. The origin of this software must not be misrepresented; you + * must not claim that you wrote the original software. If you + * use this software in a product, an acknowledgment in the product + * documentation would be appreciated, but is not required. * - * This code is released under the libpng license. + * 2. Altered source versions must be plainly marked as such, and must + * not be misrepresented as being the original software. + * + * 3. This Copyright notice may not be removed or altered from any + * source or altered source distribution. + * + * + * PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35) + * ----------------------------------------------------------------------- * * libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are @@ -31,38 +67,38 @@ * disclaimer and license as libpng-1.0.6 with the following individuals * added to the list of Contributing Authors: * - * Simon-Pierre Cadieux - * Eric S. Raymond - * Mans Rullgard - * Cosmin Truta - * Gilles Vollant - * James Yu - * Mandar Sahastrabuddhe - * Google Inc. - * Vadim Barkov + * Simon-Pierre Cadieux + * Eric S. Raymond + * Mans Rullgard + * Cosmin Truta + * Gilles Vollant + * James Yu + * Mandar Sahastrabuddhe + * Google Inc. + * Vadim Barkov * * and with the following additions to the disclaimer: * - * There is no warranty against interference with your enjoyment of the - * library or against infringement. There is no warranty that our - * efforts or the library will fulfill any of your particular purposes - * or needs. This library is provided with all faults, and the entire - * risk of satisfactory quality, performance, accuracy, and effort is with - * the user. + * There is no warranty against interference with your enjoyment of + * the library or against infringement. There is no warranty that our + * efforts or the library will fulfill any of your particular purposes + * or needs. This library is provided with all faults, and the entire + * risk of satisfactory quality, performance, accuracy, and effort is + * with the user. * * Some files in the "contrib" directory and some configure-generated - * files that are distributed with libpng have other copyright owners and + * files that are distributed with libpng have other copyright owners, and * are released under other open source licenses. * * libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are * Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from * libpng-0.96, and are distributed according to the same disclaimer and - * license as libpng-0.96, with the following individuals added to the list - * of Contributing Authors: + * license as libpng-0.96, with the following individuals added to the + * list of Contributing Authors: * - * Tom Lane - * Glenn Randers-Pehrson - * Willem van Schaik + * Tom Lane + * Glenn Randers-Pehrson + * Willem van Schaik * * libpng versions 0.89, June 1996, through 0.96, May 1997, are * Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88, @@ -70,14 +106,14 @@ * libpng-0.88, with the following individuals added to the list of * Contributing Authors: * - * John Bowler - * Kevin Bracey - * Sam Bushell - * Magnus Holmgren - * Greg Roelofs - * Tom Tanner + * John Bowler + * Kevin Bracey + * Sam Bushell + * Magnus Holmgren + * Greg Roelofs + * Tom Tanner * - * Some files in the "scripts" directory have other copyright owners + * Some files in the "scripts" directory have other copyright owners, * but are released under this license. * * libpng versions 0.5, May 1995, through 0.88, January 1996, are @@ -86,62 +122,49 @@ * For the purposes of this copyright and license, "Contributing Authors" * is defined as the following set of individuals: * - * Andreas Dilger - * Dave Martindale - * Guy Eric Schalnat - * Paul Schmidt - * Tim Wegner - * - * The PNG Reference Library is supplied "AS IS". The Contributing Authors - * and Group 42, Inc. disclaim all warranties, expressed or implied, - * including, without limitation, the warranties of merchantability and of - * fitness for any purpose. The Contributing Authors and Group 42, Inc. - * assume no liability for direct, indirect, incidental, special, exemplary, - * or consequential damages, which may result from the use of the PNG - * Reference Library, even if advised of the possibility of such damage. + * Andreas Dilger + * Dave Martindale + * Guy Eric Schalnat + * Paul Schmidt + * Tim Wegner + * + * The PNG Reference Library is supplied "AS IS". The Contributing + * Authors and Group 42, Inc. disclaim all warranties, expressed or + * implied, including, without limitation, the warranties of + * merchantability and of fitness for any purpose. The Contributing + * Authors and Group 42, Inc. assume no liability for direct, indirect, + * incidental, special, exemplary, or consequential damages, which may + * result from the use of the PNG Reference Library, even if advised of + * the possibility of such damage. * * Permission is hereby granted to use, copy, modify, and distribute this * source code, or portions hereof, for any purpose, without fee, subject * to the following restrictions: * - * 1. The origin of this source code must not be misrepresented. + * 1. The origin of this source code must not be misrepresented. * - * 2. Altered versions must be plainly marked as such and must not - * be misrepresented as being the original source. + * 2. Altered versions must be plainly marked as such and must not + * be misrepresented as being the original source. * - * 3. This Copyright notice may not be removed or altered from any - * source or altered source distribution. + * 3. This Copyright notice may not be removed or altered from any + * source or altered source distribution. * - * The Contributing Authors and Group 42, Inc. specifically permit, without - * fee, and encourage the use of this source code as a component to - * supporting the PNG file format in commercial products. If you use this - * source code in a product, acknowledgment is not required but would be - * appreciated. + * The Contributing Authors and Group 42, Inc. specifically permit, + * without fee, and encourage the use of this source code as a component + * to supporting the PNG file format in commercial products. If you use + * this source code in a product, acknowledgment is not required but would + * be appreciated. * * END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE. * - * TRADEMARK: + * TRADEMARK + * ========= * - * The name "libpng" has not been registered by the Copyright owner + * The name "libpng" has not been registered by the Copyright owners * as a trademark in any jurisdiction. However, because libpng has * been distributed and maintained world-wide, continually since 1995, - * the Copyright owner claims "common-law trademark protection" in any + * the Copyright owners claim "common-law trademark protection" in any * jurisdiction where common-law trademark is recognized. - * - * OSI CERTIFICATION: - * - * Libpng is OSI Certified Open Source Software. OSI Certified Open Source is - * a certification mark of the Open Source Initiative. OSI has not addressed - * the additional disclaimers inserted at version 1.0.7. - * - * EXPORT CONTROL: - * - * The Copyright owner believes that the Export Control Classification - * Number (ECCN) for libpng is EAR99, which means not subject to export - * controls or International Traffic in Arms Regulations (ITAR) because - * it is open source, publicly available software, that does not contain - * any encryption software. See the EAR, paragraphs 734.3(b)(3) and - * 734.7(b). */ /* @@ -207,23 +230,25 @@ * 1.0.7rc1-2 1 10007 2.1.0.7rc1-2 (binary compatible) * 1.0.7 1 10007 (still compatible) * ... - * 1.0.19 10 10019 10.so.0.19[.0] + * 1.0.69 10 10069 10.so.0.69[.0] * ... - * 1.2.59 13 10257 12.so.0.59[.0] + * 1.2.59 13 10259 12.so.0.59[.0] * ... - * 1.5.30 15 10527 15.so.15.30[.0] + * 1.4.20 14 10420 14.so.0.20[.0] * ... - * 1.6.35 16 10635 16.so.16.35[.0] - * - * Henceforth the source version will match the shared-library major - * and minor numbers; the shared-library major version number will be - * used for changes in backward compatibility, as it is intended. The - * PNG_LIBPNG_VER macro, which is not used within libpng but is available - * for applications, is an unsigned integer of the form xyyzz corresponding - * to the source version x.y.z (leading zeros in y and z). Beta versions - * were given the previous public release number plus a letter, until - * version 1.0.6j; from then on they were given the upcoming public - * release number plus "betaNN" or "rcNN". + * 1.5.30 15 10530 15.so.15.30[.0] + * ... + * 1.6.36 16 10636 16.so.16.36[.0] + * + * Henceforth the source version will match the shared-library major and + * minor numbers; the shared-library major version number will be used for + * changes in backward compatibility, as it is intended. + * The PNG_LIBPNG_VER macro, which is not used within libpng but is + * available for applications, is an unsigned integer of the form XYYZZ + * corresponding to the source version X.Y.Z (leading zeros in Y and Z). + * Beta versions were given the previous public release number plus a + * letter, until version 1.0.6j; from then on they were given the upcoming + * public release number plus "betaNN" or "rcNN". * * Binary incompatibility exists only when applications make direct access * to the info_ptr or png_ptr members through png.h, and the compiled @@ -233,65 +258,8 @@ * in binary compatibility (e.g., when a new feature is added). * * See libpng.txt or libpng.3 for more information. The PNG specification - * is available as a W3C Recommendation and as an ISO Specification, - * <https://www.w3.org/TR/2003/REC-PNG-20031110/ - */ - -/* - * Y2K compliance in libpng: - * ========================= - * - * July 15, 2018 - * - * Since the PNG Development group is an ad-hoc body, we can't make - * an official declaration. - * - * This is your unofficial assurance that libpng from version 0.71 and - * upward through 1.6.35 are Y2K compliant. It is my belief that - * earlier versions were also Y2K compliant. - * - * Libpng only has two year fields. One is a 2-byte unsigned integer - * that will hold years up to 65535. The other, which is deprecated, - * holds the date in text format, and will hold years up to 9999. - * - * The integer is - * "png_uint_16 year" in png_time_struct. - * - * The string is - * "char time_buffer[29]" in png_struct. This is no longer used - * in libpng-1.6.x and will be removed from libpng-1.7.0. - * - * There are seven time-related functions: - * png.c: png_convert_to_rfc_1123_buffer() in png.c - * (formerly png_convert_to_rfc_1123() prior to libpng-1.5.x and - * png_convert_to_rfc_1152() in error prior to libpng-0.98) - * png_convert_from_struct_tm() in pngwrite.c, called in pngwrite.c - * png_convert_from_time_t() in pngwrite.c - * png_get_tIME() in pngget.c - * png_handle_tIME() in pngrutil.c, called in pngread.c - * png_set_tIME() in pngset.c - * png_write_tIME() in pngwutil.c, called in pngwrite.c - * - * All handle dates properly in a Y2K environment. The - * png_convert_from_time_t() function calls gmtime() to convert from system - * clock time, which returns (year - 1900), which we properly convert to - * the full 4-digit year. There is a possibility that libpng applications - * are not passing 4-digit years into the png_convert_to_rfc_1123_buffer() - * function, or that they are incorrectly passing only a 2-digit year - * instead of "year - 1900" into the png_convert_from_struct_tm() function, - * but this is not under our control. The libpng documentation has always - * stated that it works with 4-digit years, and the APIs have been - * documented as such. - * - * The tIME chunk itself is also Y2K compliant. It uses a 2-byte unsigned - * integer to hold the year, and can hold years as large as 65535. - * - * zlib, upon which libpng depends, is also Y2K compliant. It contains - * no date-related code. - * - * Glenn Randers-Pehrson - * libpng maintainer - * PNG Development Group + * is available as a W3C Recommendation and as an ISO/IEC Standard; see + * <https://www.w3.org/TR/2003/REC-PNG-20031110/> */ #ifndef PNG_H @@ -309,8 +277,8 @@ */ /* Version information for png.h - this should match the version in png.c */ -#define PNG_LIBPNG_VER_STRING "1.6.35" -#define PNG_HEADER_VERSION_STRING " libpng version 1.6.35 - July 15, 2018\n" +#define PNG_LIBPNG_VER_STRING "1.6.36" +#define PNG_HEADER_VERSION_STRING " libpng version 1.6.36 - December 1, 2018\n" #define PNG_LIBPNG_VER_SONUM 16 #define PNG_LIBPNG_VER_DLLNUM 16 @@ -318,13 +286,13 @@ /* These should match the first 3 components of PNG_LIBPNG_VER_STRING: */ #define PNG_LIBPNG_VER_MAJOR 1 #define PNG_LIBPNG_VER_MINOR 6 -#define PNG_LIBPNG_VER_RELEASE 35 +#define PNG_LIBPNG_VER_RELEASE 36 /* This should match the numeric part of the final component of * PNG_LIBPNG_VER_STRING, omitting any leading zero: */ -#define PNG_LIBPNG_VER_BUILD 02 +#define PNG_LIBPNG_VER_BUILD 0 /* Release Status */ #define PNG_LIBPNG_BUILD_ALPHA 1 @@ -341,15 +309,16 @@ #define PNG_LIBPNG_BUILD_SPECIAL 32 /* Cannot be OR'ed with PNG_LIBPNG_BUILD_PRIVATE */ -#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_BETA +#define PNG_LIBPNG_BUILD_BASE_TYPE PNG_LIBPNG_BUILD_STABLE -/* Careful here. At one time, Guy wanted to use 082, but that would be octal. - * We must not include leading zeros. - * Versions 0.7 through 1.0.0 were in the range 0 to 100 here (only - * version 1.0.0 was mis-numbered 100 instead of 10000). From - * version 1.0.1 it's xxyyzz, where x=major, y=minor, z=release +/* Careful here. At one time, Guy wanted to use 082, but that + * would be octal. We must not include leading zeros. + * Versions 0.7 through 1.0.0 were in the range 0 to 100 here + * (only version 1.0.0 was mis-numbered 100 instead of 10000). + * From version 1.0.1 it is: + * XXYYZZ, where XX=major, YY=minor, ZZ=release */ -#define PNG_LIBPNG_VER 10635 /* 1.6.35 */ +#define PNG_LIBPNG_VER 10636 /* 1.6.36 */ /* Library configuration: these options cannot be changed after * the library has been built. @@ -459,7 +428,7 @@ extern "C" { /* This triggers a compiler error in png.c, if png.c and png.h * do not agree upon the version number. */ -typedef char* png_libpng_version_1_6_35; +typedef char* png_libpng_version_1_6_36; /* Basic control structions. Read libpng-manual.txt or libpng.3 for more info. * @@ -2013,12 +1982,12 @@ PNG_FIXED_EXPORT(233, void, png_set_cHRM_XYZ_fixed, (png_const_structrp png_ptr, PNG_EXPORT(246, png_uint_32, png_get_eXIf, (png_const_structrp png_ptr, png_inforp info_ptr, png_bytep *exif)); PNG_EXPORT(247, void, png_set_eXIf, (png_const_structrp png_ptr, - png_inforp info_ptr, const png_bytep exif)); + png_inforp info_ptr, png_bytep exif)); PNG_EXPORT(248, png_uint_32, png_get_eXIf_1, (png_const_structrp png_ptr, png_const_inforp info_ptr, png_uint_32 *num_exif, png_bytep *exif)); PNG_EXPORT(249, void, png_set_eXIf_1, (png_const_structrp png_ptr, - png_inforp info_ptr, const png_uint_32 num_exif, const png_bytep exif)); + png_inforp info_ptr, png_uint_32 num_exif, png_bytep exif)); #endif #ifdef PNG_gAMA_SUPPORTED @@ -2764,7 +2733,7 @@ typedef struct * * When the simplified API needs to convert between sRGB and linear colorspaces, * the actual sRGB transfer curve defined in the sRGB specification (see the - * article at https://en.wikipedia.org/wiki/SRGB) is used, not the gamma=1/2.2 + * article at <https://en.wikipedia.org/wiki/SRGB>) is used, not the gamma=1/2.2 * approximation used elsewhere in libpng. * * When an alpha channel is present it is expected to denote pixel coverage @@ -2967,7 +2936,7 @@ typedef struct * 'flags' field of png_image. */ #define PNG_IMAGE_FLAG_COLORSPACE_NOT_sRGB 0x01 - /* This indicates the the RGB values of the in-memory bitmap do not + /* This indicates that the RGB values of the in-memory bitmap do not * correspond to the red, green and blue end-points defined by sRGB. */ diff --git a/thirdparty/libpng/pngconf.h b/thirdparty/libpng/pngconf.h index a4646bab85..5e641b2509 100644 --- a/thirdparty/libpng/pngconf.h +++ b/thirdparty/libpng/pngconf.h @@ -1,11 +1,12 @@ /* pngconf.h - machine configurable file for libpng * - * libpng version 1.6.35, July 15, 2018 + * libpng version 1.6.36 * + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -57,14 +58,13 @@ #endif /* PNG_BUILDING_SYMBOL_TABLE */ -/* Prior to 1.6.0 it was possible to turn off 'const' in declarations using - * PNG_NO_CONST; this is no longer supported except for data declarations which - * apparently still cause problems in 2011 on some compilers. +/* Prior to 1.6.0, it was possible to turn off 'const' in declarations, + * using PNG_NO_CONST. This is no longer supported. */ #define PNG_CONST const /* backward compatibility only */ -/* This controls optimization of the reading of 16-bit and 32-bit values - * from PNG files. It can be set on a per-app-file basis - it +/* This controls optimization of the reading of 16-bit and 32-bit + * values from PNG files. It can be set on a per-app-file basis: it * just changes whether a macro is used when the function is called. * The library builder sets the default; if read functions are not * built into the library the macro implementation is forced on. diff --git a/thirdparty/libpng/pngdebug.h b/thirdparty/libpng/pngdebug.h index 15a7ed0c95..00d5a4569e 100644 --- a/thirdparty/libpng/pngdebug.h +++ b/thirdparty/libpng/pngdebug.h @@ -1,10 +1,10 @@ /* pngdebug.h - Debugging macros for libpng, also used in pngtest.c * - * Last changed in libpng 1.6.8 [December 19, 2013] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2013 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pngerror.c b/thirdparty/libpng/pngerror.c index ad48bfb986..ec3a709b9d 100644 --- a/thirdparty/libpng/pngerror.c +++ b/thirdparty/libpng/pngerror.c @@ -1,10 +1,10 @@ /* pngerror.c - stub functions for i/o and memory allocation * - * Last changed in libpng 1.6.31 [July 27, 2017] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2017 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -425,7 +425,7 @@ png_app_error(png_const_structrp png_ptr, png_const_charp error_message) * if the character is invalid. */ #define isnonalpha(c) ((c) < 65 || (c) > 122 || ((c) > 90 && (c) < 97)) -static PNG_CONST char png_digit[16] = { +static const char png_digit[16] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' }; @@ -885,7 +885,7 @@ PNG_FUNCTION(void /* PRIVATE */, (PNGCBAPI png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message), PNG_NORETURN) { - const png_const_structrp png_ptr = png_nonconst_ptr; + png_const_structrp png_ptr = png_nonconst_ptr; png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr); /* An error is always logged here, overwriting anything (typically a warning) @@ -920,7 +920,7 @@ png_safe_error),(png_structp png_nonconst_ptr, png_const_charp error_message), void /* PRIVATE */ PNGCBAPI png_safe_warning(png_structp png_nonconst_ptr, png_const_charp warning_message) { - const png_const_structrp png_ptr = png_nonconst_ptr; + png_const_structrp png_ptr = png_nonconst_ptr; png_imagep image = png_voidcast(png_imagep, png_ptr->error_ptr); /* A warning is only logged if there is no prior warning or error. */ diff --git a/thirdparty/libpng/pngget.c b/thirdparty/libpng/pngget.c index 2325508f1d..5abf1efd9f 100644 --- a/thirdparty/libpng/pngget.c +++ b/thirdparty/libpng/pngget.c @@ -1,10 +1,10 @@ /* pngget.c - retrieval of values from info struct * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pnginfo.h b/thirdparty/libpng/pnginfo.h index 2fcf868dac..1f98dedc42 100644 --- a/thirdparty/libpng/pnginfo.h +++ b/thirdparty/libpng/pnginfo.h @@ -1,10 +1,10 @@ /* pnginfo.h - header file for PNG reference library * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2013,2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pnglibconf.h b/thirdparty/libpng/pnglibconf.h index 00acecc69b..00340c678b 100644 --- a/thirdparty/libpng/pnglibconf.h +++ b/thirdparty/libpng/pnglibconf.h @@ -1,10 +1,9 @@ -/* libpng 1.6.35 STANDARD API DEFINITION */ - /* pnglibconf.h - library build configuration */ -/* Libpng version 1.6.35 - July 15, 2018 */ +/* libpng version 1.6.36 */ -/* Copyright (c) 1998-2018 Glenn Randers-Pehrson */ +/* Copyright (c) 2018 Cosmin Truta */ +/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */ /* This code is released under the libpng license. */ /* For conditions of distribution and use, see the disclaimer */ @@ -20,8 +19,6 @@ #define PNG_ALIGNED_MEMORY_SUPPORTED /*#undef PNG_ARM_NEON_API_SUPPORTED*/ /*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/ -/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ -/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ #define PNG_BENIGN_ERRORS_SUPPORTED #define PNG_BENIGN_READ_ERRORS_SUPPORTED /*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/ @@ -46,6 +43,8 @@ #define PNG_IO_STATE_SUPPORTED #define PNG_MNG_FEATURES_SUPPORTED #define PNG_POINTER_INDEXING_SUPPORTED +/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/ +/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/ #define PNG_PROGRESSIVE_READ_SUPPORTED #define PNG_READ_16BIT_SUPPORTED #define PNG_READ_ALPHA_MODE_SUPPORTED diff --git a/thirdparty/libpng/pngmem.c b/thirdparty/libpng/pngmem.c index ff3ef7e88c..09ed9c1c99 100644 --- a/thirdparty/libpng/pngmem.c +++ b/thirdparty/libpng/pngmem.c @@ -1,10 +1,10 @@ /* pngmem.c - stub functions for memory allocation * - * Last changed in libpng 1.6.26 [October 20, 2016] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2014,2016 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pngpread.c b/thirdparty/libpng/pngpread.c index c4ba51c4d4..e283627b77 100644 --- a/thirdparty/libpng/pngpread.c +++ b/thirdparty/libpng/pngpread.c @@ -1,10 +1,10 @@ /* pngpread.c - read a png file in push mode * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -972,20 +972,20 @@ png_read_push_finish_row(png_structrp png_ptr) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[] = {8, 8, 4, 4, 2, 2, 1}; /* Start of interlace block in the y direction */ - static PNG_CONST png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; + static const png_byte png_pass_ystart[] = {0, 0, 4, 0, 2, 0, 1}; /* Offset to next interlace block in the y direction */ - static PNG_CONST png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; + static const png_byte png_pass_yinc[] = {8, 8, 8, 4, 4, 2, 2}; /* Height of interlace block. This is not currently used - if you need * it, uncomment it here and in png.h - static PNG_CONST png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_height[] = {8, 8, 4, 4, 2, 2, 1}; */ #endif diff --git a/thirdparty/libpng/pngpriv.h b/thirdparty/libpng/pngpriv.h index 3581f67919..973c3eac1f 100644 --- a/thirdparty/libpng/pngpriv.h +++ b/thirdparty/libpng/pngpriv.h @@ -1,10 +1,10 @@ /* pngpriv.h - private declarations for use inside libpng * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -174,7 +174,10 @@ # else /* !defined __ARM_NEON__ */ /* The 'intrinsics' code simply won't compile without this -mfpu=neon: */ -# define PNG_ARM_NEON_IMPLEMENTATION 2 +# if !defined(__aarch64__) + /* The assembler code currently does not work on ARM64 */ +# define PNG_ARM_NEON_IMPLEMENTATION 2 +# endif /* __aarch64__ */ # endif /* __ARM_NEON__ */ # endif /* !PNG_ARM_NEON_IMPLEMENTATION */ @@ -1534,10 +1537,10 @@ PNG_INTERNAL_FUNCTION(void,png_handle_zTXt,(png_structrp png_ptr, #endif PNG_INTERNAL_FUNCTION(void,png_check_chunk_name,(png_const_structrp png_ptr, - const png_uint_32 chunk_name),PNG_EMPTY); + png_uint_32 chunk_name),PNG_EMPTY); PNG_INTERNAL_FUNCTION(void,png_check_chunk_length,(png_const_structrp png_ptr, - const png_uint_32 chunk_length),PNG_EMPTY); + png_uint_32 chunk_length),PNG_EMPTY); PNG_INTERNAL_FUNCTION(void,png_handle_unknown,(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length, int keep),PNG_EMPTY); @@ -2114,6 +2117,29 @@ PNG_INTERNAL_FUNCTION(void, png_init_filter_functions_sse2, PNG_INTERNAL_FUNCTION(png_uint_32, png_check_keyword, (png_structrp png_ptr, png_const_charp key, png_bytep new_key), PNG_EMPTY); +#if PNG_ARM_NEON_IMPLEMENTATION == 1 +PNG_INTERNAL_FUNCTION(void, + png_riffle_palette_rgba, + (png_structrp, png_row_infop), + PNG_EMPTY); +PNG_INTERNAL_FUNCTION(int, + png_do_expand_palette_neon_rgba, + (png_structrp, + png_row_infop, + png_const_bytep, + const png_bytepp, + const png_bytepp), + PNG_EMPTY); +PNG_INTERNAL_FUNCTION(int, + png_do_expand_palette_neon_rgb, + (png_structrp, + png_row_infop, + png_const_bytep, + const png_bytepp, + const png_bytepp), + PNG_EMPTY); +#endif + /* Maintainer: Put new private prototypes here ^ */ #include "pngdebug.h" diff --git a/thirdparty/libpng/pngread.c b/thirdparty/libpng/pngread.c index bff7503ee3..f8e762196e 100644 --- a/thirdparty/libpng/pngread.c +++ b/thirdparty/libpng/pngread.c @@ -1,10 +1,10 @@ /* pngread.c - read a PNG file * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -1621,7 +1621,7 @@ png_image_skip_unused_chunks(png_structrp png_ptr) * errors (which are unfortunately quite common.) */ { - static PNG_CONST png_byte chunks_to_process[] = { + static const png_byte chunks_to_process[] = { 98, 75, 71, 68, '\0', /* bKGD */ 99, 72, 82, 77, '\0', /* cHRM */ 103, 65, 77, 65, '\0', /* gAMA */ @@ -1758,9 +1758,9 @@ png_create_colormap_entry(png_image_read_control *display, png_uint_32 alpha, int encoding) { png_imagep image = display->image; - const int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ? + int output_encoding = (image->format & PNG_FORMAT_FLAG_LINEAR) != 0 ? P_LINEAR : P_sRGB; - const int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 && + int convert_to_Y = (image->format & PNG_FORMAT_FLAG_COLOR) == 0 && (red != green || green != blue); if (ip > 255) @@ -1869,13 +1869,13 @@ png_create_colormap_entry(png_image_read_control *display, /* Store the value. */ { # ifdef PNG_FORMAT_AFIRST_SUPPORTED - const int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 && + int afirst = (image->format & PNG_FORMAT_FLAG_AFIRST) != 0 && (image->format & PNG_FORMAT_FLAG_ALPHA) != 0; # else # define afirst 0 # endif # ifdef PNG_FORMAT_BGR_SUPPORTED - const int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; + int bgr = (image->format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; # else # define bgr 0 # endif @@ -2085,11 +2085,11 @@ png_image_read_colormap(png_voidp argument) { png_image_read_control *display = png_voidcast(png_image_read_control*, argument); - const png_imagep image = display->image; + png_imagep image = display->image; - const png_structrp png_ptr = image->opaque->png_ptr; - const png_uint_32 output_format = image->format; - const int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ? + png_structrp png_ptr = image->opaque->png_ptr; + png_uint_32 output_format = image->format; + int output_encoding = (output_format & PNG_FORMAT_FLAG_LINEAR) != 0 ? P_LINEAR : P_sRGB; unsigned int cmap_entries; @@ -2802,7 +2802,7 @@ png_image_read_colormap(png_voidp argument) unsigned int num_trans = png_ptr->num_trans; png_const_bytep trans = num_trans > 0 ? png_ptr->trans_alpha : NULL; png_const_colorp colormap = png_ptr->palette; - const int do_background = trans != NULL && + int do_background = trans != NULL && (output_format & PNG_FORMAT_FLAG_ALPHA) == 0; unsigned int i; @@ -3946,7 +3946,7 @@ png_image_read_direct(png_voidp argument) */ if (linear != 0) { - PNG_CONST png_uint_16 le = 0x0001; + png_uint_16 le = 0x0001; if ((*(png_const_bytep) & le) != 0) png_set_swap(png_ptr); @@ -4108,7 +4108,7 @@ png_image_finish_read(png_imagep image, png_const_colorp background, * original PNG format because it may not occur in the output PNG format * and libpng deals with the issues of reading the original. */ - const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format); + unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format); /* The following checks just the 'row_stride' calculation to ensure it * fits in a signed 32-bit value. Because channels/components can be @@ -4119,7 +4119,7 @@ png_image_finish_read(png_imagep image, png_const_colorp background, if (image->width <= 0x7fffffffU/channels) /* no overflow */ { png_uint_32 check; - const png_uint_32 png_row_stride = image->width * channels; + png_uint_32 png_row_stride = image->width * channels; if (row_stride == 0) row_stride = (png_int_32)/*SAFE*/png_row_stride; diff --git a/thirdparty/libpng/pngrio.c b/thirdparty/libpng/pngrio.c index 372221483f..7946358101 100644 --- a/thirdparty/libpng/pngrio.c +++ b/thirdparty/libpng/pngrio.c @@ -1,10 +1,10 @@ /* pngrio.c - functions for data input * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pngrtran.c b/thirdparty/libpng/pngrtran.c index 67d1f249a6..ccc58ce6f1 100644 --- a/thirdparty/libpng/pngrtran.c +++ b/thirdparty/libpng/pngrtran.c @@ -1,10 +1,10 @@ /* pngrtran.c - transforms the data in a row for PNG readers * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -18,6 +18,17 @@ #include "pngpriv.h" +#ifdef PNG_ARM_NEON_IMPLEMENTATION +# if PNG_ARM_NEON_IMPLEMENTATION == 1 +# define PNG_ARM_NEON_INTRINSICS_AVAILABLE +# if defined(_MSC_VER) && defined(_M_ARM64) +# include <arm64_neon.h> +# else +# include <arm_neon.h> +# endif +# endif +#endif + #ifdef PNG_READ_SUPPORTED /* Set the action on getting a CRC error for an ancillary or critical chunk. */ @@ -2986,7 +2997,6 @@ png_do_gray_to_rgb(png_row_infop row_info, png_bytep row) */ static int png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) - { int rgb_error = 0; @@ -2995,12 +3005,11 @@ png_do_rgb_to_gray(png_structrp png_ptr, png_row_infop row_info, png_bytep row) if ((row_info->color_type & PNG_COLOR_MASK_PALETTE) == 0 && (row_info->color_type & PNG_COLOR_MASK_COLOR) != 0) { - PNG_CONST png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; - PNG_CONST png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; - PNG_CONST png_uint_32 bc = 32768 - rc - gc; - PNG_CONST png_uint_32 row_width = row_info->width; - PNG_CONST int have_alpha = - (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0; + png_uint_32 rc = png_ptr->rgb_to_gray_red_coeff; + png_uint_32 gc = png_ptr->rgb_to_gray_green_coeff; + png_uint_32 bc = 32768 - rc - gc; + png_uint_32 row_width = row_info->width; + int have_alpha = (row_info->color_type & PNG_COLOR_MASK_ALPHA) != 0; if (row_info->bit_depth == 8) { @@ -4143,12 +4152,11 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) { if (row_info->bit_depth == 8) { - PNG_CONST png_bytep table = png_ptr->gamma_from_1; + png_bytep table = png_ptr->gamma_from_1; if (table != NULL) { - PNG_CONST int step = - (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2; + int step = (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 4 : 2; /* The alpha channel is the last component: */ row += step - 1; @@ -4162,13 +4170,12 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) else if (row_info->bit_depth == 16) { - PNG_CONST png_uint_16pp table = png_ptr->gamma_16_from_1; - PNG_CONST int gamma_shift = png_ptr->gamma_shift; + png_uint_16pp table = png_ptr->gamma_16_from_1; + int gamma_shift = png_ptr->gamma_shift; if (table != NULL) { - PNG_CONST int step = - (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4; + int step = (row_info->color_type & PNG_COLOR_MASK_COLOR) ? 8 : 4; /* The alpha channel is the last component: */ row += step - 2; @@ -4199,8 +4206,9 @@ png_do_encode_alpha(png_row_infop row_info, png_bytep row, png_structrp png_ptr) * upon whether you supply trans and num_trans. */ static void -png_do_expand_palette(png_row_infop row_info, png_bytep row, - png_const_colorp palette, png_const_bytep trans_alpha, int num_trans) +png_do_expand_palette(png_structrp png_ptr, png_row_infop row_info, + png_bytep row, png_const_colorp palette, png_const_bytep trans_alpha, + int num_trans) { int shift, value; png_bytep sp, dp; @@ -4304,14 +4312,25 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row, sp = row + (size_t)row_width - 1; dp = row + ((size_t)row_width << 2) - 1; - for (i = 0; i < row_width; i++) + i = 0; +#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE + if (png_ptr->riffled_palette != NULL) + { + /* The RGBA optimization works with png_ptr->bit_depth == 8 + * but sometimes row_info->bit_depth has been changed to 8. + * In these cases, the palette hasn't been riffled. + */ + i = png_do_expand_palette_neon_rgba(png_ptr, row_info, row, + &sp, &dp); + } +#endif + + for (; i < row_width; i++) { if ((int)(*sp) >= num_trans) *dp-- = 0xff; - else *dp-- = trans_alpha[*sp]; - *dp-- = palette[*sp].blue; *dp-- = palette[*sp].green; *dp-- = palette[*sp].red; @@ -4328,8 +4347,13 @@ png_do_expand_palette(png_row_infop row_info, png_bytep row, { sp = row + (size_t)row_width - 1; dp = row + (size_t)(row_width * 3) - 1; + i = 0; +#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE + i = png_do_expand_palette_neon_rgb(png_ptr, row_info, row, + &sp, &dp); +#endif - for (i = 0; i < row_width; i++) + for (; i < row_width; i++) { *dp-- = palette[*sp].blue; *dp-- = palette[*sp].green; @@ -4743,8 +4767,22 @@ png_do_read_transformations(png_structrp png_ptr, png_row_infop row_info) { if (row_info->color_type == PNG_COLOR_TYPE_PALETTE) { - png_do_expand_palette(row_info, png_ptr->row_buf + 1, - png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); +#ifdef PNG_ARM_NEON_INTRINSICS_AVAILABLE + if ((png_ptr->num_trans > 0) && (png_ptr->bit_depth == 8)) + { + /* Allocate space for the decompressed full palette. */ + if (png_ptr->riffled_palette == NULL) + { + png_ptr->riffled_palette = png_malloc(png_ptr, 256*4); + if (png_ptr->riffled_palette == NULL) + png_error(png_ptr, "NULL row buffer"); + /* Build the RGBA palette. */ + png_riffle_palette_rgba(png_ptr, row_info); + } + } +#endif + png_do_expand_palette(png_ptr, row_info, png_ptr->row_buf + 1, + png_ptr->palette, png_ptr->trans_alpha, png_ptr->num_trans); } else diff --git a/thirdparty/libpng/pngrutil.c b/thirdparty/libpng/pngrutil.c index 7001f1976e..d5fa08c397 100644 --- a/thirdparty/libpng/pngrutil.c +++ b/thirdparty/libpng/pngrutil.c @@ -1,10 +1,10 @@ /* pngrutil.c - utilities to read a PNG file * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -1461,8 +1461,7 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) { /* We have the ICC profile header; do the basic header checks. */ - const png_uint_32 profile_length = - png_get_uint_32(profile_header); + png_uint_32 profile_length = png_get_uint_32(profile_header); if (png_icc_check_length(png_ptr, &png_ptr->colorspace, keyword, profile_length) != 0) @@ -1479,8 +1478,8 @@ png_handle_iCCP(png_structrp png_ptr, png_inforp info_ptr, png_uint_32 length) * profile. The header check has already validated * that none of this stuff will overflow. */ - const png_uint_32 tag_count = png_get_uint_32( - profile_header+128); + png_uint_32 tag_count = + png_get_uint_32(profile_header + 128); png_bytep profile = png_read_buffer(png_ptr, profile_length, 2/*silent*/); @@ -3132,7 +3131,7 @@ png_handle_unknown(png_structrp png_ptr, png_inforp info_ptr, */ void /* PRIVATE */ -png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name) +png_check_chunk_name(png_const_structrp png_ptr, png_uint_32 chunk_name) { int i; png_uint_32 cn=chunk_name; @@ -3151,7 +3150,7 @@ png_check_chunk_name(png_const_structrp png_ptr, const png_uint_32 chunk_name) } void /* PRIVATE */ -png_check_chunk_length(png_const_structrp png_ptr, const png_uint_32 length) +png_check_chunk_length(png_const_structrp png_ptr, png_uint_32 length) { png_alloc_size_t limit = PNG_UINT_31_MAX; @@ -3363,7 +3362,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) /* Hence the pre-compiled masks indexed by PACKSWAP (or not), depth and * then pass: */ - static PNG_CONST png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] = + static const png_uint_32 row_mask[2/*PACKSWAP*/][3/*depth*/][6] = { /* Little-endian byte masks for PACKSWAP */ { S_MASKS(1,0), S_MASKS(2,0), S_MASKS(4,0) }, @@ -3374,7 +3373,7 @@ png_combine_row(png_const_structrp png_ptr, png_bytep dp, int display) /* display_mask has only three entries for the odd passes, so index by * pass>>1. */ - static PNG_CONST png_uint_32 display_mask[2][3][3] = + static const png_uint_32 display_mask[2][3][3] = { /* Little-endian byte masks for PACKSWAP */ { B_MASKS(1,0), B_MASKS(2,0), B_MASKS(4,0) }, @@ -3687,7 +3686,7 @@ png_do_read_interlace(png_row_infop row_info, png_bytep row, int pass, { /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Offset to next interlace block */ - static PNG_CONST unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const unsigned int png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; png_debug(1, "in png_do_read_interlace"); if (row != NULL && row_info != NULL) @@ -4329,16 +4328,16 @@ png_read_finish_row(png_structrp png_ptr) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; /* Start of interlace block in the y direction */ - static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; + static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; /* Offset to next interlace block in the y direction */ - static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; + static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; png_debug(1, "in png_read_finish_row"); png_ptr->row_number++; @@ -4394,16 +4393,16 @@ png_read_start_row(png_structrp png_ptr) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; /* Start of interlace block in the y direction */ - static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; + static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; /* Offset to next interlace block in the y direction */ - static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; + static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; unsigned int max_pixel_depth; size_t row_bytes; diff --git a/thirdparty/libpng/pngset.c b/thirdparty/libpng/pngset.c index 7cf54d9248..ec75dbe369 100644 --- a/thirdparty/libpng/pngset.c +++ b/thirdparty/libpng/pngset.c @@ -1,10 +1,10 @@ /* pngset.c - storage of image information into info struct * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -137,7 +137,7 @@ png_set_cHRM_XYZ(png_const_structrp png_ptr, png_inforp info_ptr, double red_X, #ifdef PNG_eXIf_SUPPORTED void PNGAPI png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr, - const png_bytep eXIf_buf) + png_bytep eXIf_buf) { png_warning(png_ptr, "png_set_eXIf does not work; use png_set_eXIf_1"); PNG_UNUSED(info_ptr) @@ -146,7 +146,7 @@ png_set_eXIf(png_const_structrp png_ptr, png_inforp info_ptr, void PNGAPI png_set_eXIf_1(png_const_structrp png_ptr, png_inforp info_ptr, - const png_uint_32 num_exif, const png_bytep eXIf_buf) + png_uint_32 num_exif, png_bytep eXIf_buf) { int i; @@ -1399,7 +1399,7 @@ png_set_keep_unknown_chunks(png_structrp png_ptr, int keep, /* Ignore all unknown chunks and all chunks recognized by * libpng except for IHDR, PLTE, tRNS, IDAT, and IEND */ - static PNG_CONST png_byte chunks_to_ignore[] = { + static const png_byte chunks_to_ignore[] = { 98, 75, 71, 68, '\0', /* bKGD */ 99, 72, 82, 77, '\0', /* cHRM */ 101, 88, 73, 102, '\0', /* eXIf */ diff --git a/thirdparty/libpng/pngstruct.h b/thirdparty/libpng/pngstruct.h index 699e8ac68a..94a6d041ff 100644 --- a/thirdparty/libpng/pngstruct.h +++ b/thirdparty/libpng/pngstruct.h @@ -1,10 +1,10 @@ /* pngstruct.h - header file for PNG reference library * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -228,6 +228,10 @@ struct png_struct_def * big_row_buf; while writing it is separately * allocated. */ +#ifdef PNG_READ_EXPAND_SUPPORTED + /* Buffer to accelerate palette transformations. */ + png_bytep riffled_palette; +#endif #ifdef PNG_WRITE_FILTER_SUPPORTED png_bytep try_row; /* buffer to save trial row when filtering */ png_bytep tst_row; /* buffer to save best trial row when filtering */ diff --git a/thirdparty/libpng/pngtrans.c b/thirdparty/libpng/pngtrans.c index de84aa6d6b..1100f46ebe 100644 --- a/thirdparty/libpng/pngtrans.c +++ b/thirdparty/libpng/pngtrans.c @@ -1,10 +1,10 @@ /* pngtrans.c - transforms the data in a row (used by both readers and writers) * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -345,7 +345,7 @@ png_do_swap(png_row_infop row_info, png_bytep row) #endif #if defined(PNG_READ_PACKSWAP_SUPPORTED)||defined(PNG_WRITE_PACKSWAP_SUPPORTED) -static PNG_CONST png_byte onebppswaptable[256] = { +static const png_byte onebppswaptable[256] = { 0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0, 0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0, 0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8, @@ -380,7 +380,7 @@ static PNG_CONST png_byte onebppswaptable[256] = { 0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF }; -static PNG_CONST png_byte twobppswaptable[256] = { +static const png_byte twobppswaptable[256] = { 0x00, 0x40, 0x80, 0xC0, 0x10, 0x50, 0x90, 0xD0, 0x20, 0x60, 0xA0, 0xE0, 0x30, 0x70, 0xB0, 0xF0, 0x04, 0x44, 0x84, 0xC4, 0x14, 0x54, 0x94, 0xD4, @@ -415,7 +415,7 @@ static PNG_CONST png_byte twobppswaptable[256] = { 0x2F, 0x6F, 0xAF, 0xEF, 0x3F, 0x7F, 0xBF, 0xFF }; -static PNG_CONST png_byte fourbppswaptable[256] = { +static const png_byte fourbppswaptable[256] = { 0x00, 0x10, 0x20, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90, 0xA0, 0xB0, 0xC0, 0xD0, 0xE0, 0xF0, 0x01, 0x11, 0x21, 0x31, 0x41, 0x51, 0x61, 0x71, diff --git a/thirdparty/libpng/pngwio.c b/thirdparty/libpng/pngwio.c index e5391687a2..10e919dd03 100644 --- a/thirdparty/libpng/pngwio.c +++ b/thirdparty/libpng/pngwio.c @@ -1,10 +1,10 @@ /* pngwio.c - functions for data output * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2014,2016,2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer diff --git a/thirdparty/libpng/pngwrite.c b/thirdparty/libpng/pngwrite.c index 5bd87f373e..160c877d38 100644 --- a/thirdparty/libpng/pngwrite.c +++ b/thirdparty/libpng/pngwrite.c @@ -1,10 +1,10 @@ /* pngwrite.c - general routines to write a PNG file * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -469,7 +469,7 @@ png_write_end(png_structrp png_ptr, png_inforp info_ptr) #ifdef PNG_CONVERT_tIME_SUPPORTED void PNGAPI -png_convert_from_struct_tm(png_timep ptime, PNG_CONST struct tm * ttime) +png_convert_from_struct_tm(png_timep ptime, const struct tm * ttime) { png_debug(1, "in png_convert_from_struct_tm"); @@ -948,6 +948,10 @@ png_write_destroy(png_structrp png_ptr) png_free_buffer_list(png_ptr, &png_ptr->zbuffer_list); png_free(png_ptr, png_ptr->row_buf); png_ptr->row_buf = NULL; +#ifdef PNG_READ_EXPANDED_SUPPORTED + png_free(png_ptr, png_ptr->riffled_palette); + png_ptr->riffled_palette = NULL; +#endif #ifdef PNG_WRITE_FILTER_SUPPORTED png_free(png_ptr, png_ptr->prev_row); png_free(png_ptr, png_ptr->try_row); @@ -1536,7 +1540,7 @@ png_write_image_16bit(png_voidp argument) display->first_row); png_uint_16p output_row = png_voidcast(png_uint_16p, display->local_row); png_uint_16p row_end; - const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? + unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1; int aindex = 0; png_uint_32 y = image->height; @@ -1573,7 +1577,7 @@ png_write_image_16bit(png_voidp argument) while (out_ptr < row_end) { - const png_uint_16 alpha = in_ptr[aindex]; + png_uint_16 alpha = in_ptr[aindex]; png_uint_32 reciprocal = 0; int c; @@ -1695,7 +1699,7 @@ png_write_image_8bit(png_voidp argument) display->first_row); png_bytep output_row = png_voidcast(png_bytep, display->local_row); png_uint_32 y = image->height; - const unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? + unsigned int channels = (image->format & PNG_FORMAT_FLAG_COLOR) != 0 ? 3 : 1; if ((image->format & PNG_FORMAT_FLAG_ALPHA) != 0) @@ -1783,25 +1787,25 @@ png_write_image_8bit(png_voidp argument) static void png_image_set_PLTE(png_image_write_control *display) { - const png_imagep image = display->image; + png_imagep image = display->image; const void *cmap = display->colormap; - const int entries = image->colormap_entries > 256 ? 256 : + int entries = image->colormap_entries > 256 ? 256 : (int)image->colormap_entries; /* NOTE: the caller must check for cmap != NULL and entries != 0 */ - const png_uint_32 format = image->format; - const unsigned int channels = PNG_IMAGE_SAMPLE_CHANNELS(format); + png_uint_32 format = image->format; + unsigned int channels = PNG_IMAGE_SAMPLE_CHANNELS(format); # if defined(PNG_FORMAT_BGR_SUPPORTED) &&\ defined(PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED) - const int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 && + int afirst = (format & PNG_FORMAT_FLAG_AFIRST) != 0 && (format & PNG_FORMAT_FLAG_ALPHA) != 0; # else # define afirst 0 # endif # ifdef PNG_FORMAT_BGR_SUPPORTED - const int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; + int bgr = (format & PNG_FORMAT_FLAG_BGR) != 0 ? 2 : 0; # else # define bgr 0 # endif @@ -1951,12 +1955,12 @@ png_image_write_main(png_voidp argument) * and total image size to ensure that they are within the system limits. */ { - const unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format); + unsigned int channels = PNG_IMAGE_PIXEL_CHANNELS(image->format); if (image->width <= 0x7fffffffU/channels) /* no overflow */ { png_uint_32 check; - const png_uint_32 png_row_stride = image->width * channels; + png_uint_32 png_row_stride = image->width * channels; if (display->row_stride == 0) display->row_stride = (png_int_32)/*SAFE*/png_row_stride; @@ -2052,7 +2056,7 @@ png_image_write_main(png_voidp argument) */ if (write_16bit != 0) { - PNG_CONST png_uint_16 le = 0x0001; + png_uint_16 le = 0x0001; if ((*(png_const_bytep) & le) != 0) png_set_swap(png_ptr); @@ -2166,7 +2170,7 @@ image_memory_write)(png_structp png_ptr, png_bytep/*const*/ data, size_t size) { png_image_write_control *display = png_voidcast(png_image_write_control*, png_ptr->io_ptr/*backdoor: png_get_io_ptr(png_ptr)*/); - const png_alloc_size_t ob = display->output_bytes; + png_alloc_size_t ob = display->output_bytes; /* Check for overflow; this should never happen: */ if (size <= ((png_alloc_size_t)-1) - ob) diff --git a/thirdparty/libpng/pngwtran.c b/thirdparty/libpng/pngwtran.c index 3a1e0a21d2..49a13c1e98 100644 --- a/thirdparty/libpng/pngwtran.c +++ b/thirdparty/libpng/pngwtran.c @@ -1,10 +1,10 @@ /* pngwtran.c - transforms the data in a row for PNG writers * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2016,2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -254,8 +254,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, for (i = 0; i < istop; i++, bp++) { - - const unsigned int c = i%channels; + unsigned int c = i%channels; int j; unsigned int v, out; @@ -283,7 +282,7 @@ png_do_shift(png_row_infop row_info, png_bytep row, for (bp = row, i = 0; i < istop; i++) { - const unsigned int c = i%channels; + unsigned int c = i%channels; int j; unsigned int value, v; diff --git a/thirdparty/libpng/pngwutil.c b/thirdparty/libpng/pngwutil.c index ab431e712c..16345e4c0b 100644 --- a/thirdparty/libpng/pngwutil.c +++ b/thirdparty/libpng/pngwutil.c @@ -1,10 +1,10 @@ /* pngwutil.c - utilities to write a PNG file * - * Last changed in libpng 1.6.35 [July 15, 2018] + * Copyright (c) 2018 Cosmin Truta * Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson - * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger) - * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.) + * Copyright (c) 1996-1997 Andreas Dilger + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. * * This code is released under the libpng license. * For conditions of distribution and use, see the disclaimer @@ -1893,16 +1893,16 @@ png_write_start_row(png_structrp png_ptr) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; /* Start of interlace block in the y direction */ - static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; + static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; /* Offset to next interlace block in the y direction */ - static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; + static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; #endif png_alloc_size_t buf_size; @@ -2008,16 +2008,16 @@ png_write_finish_row(png_structrp png_ptr) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; /* Start of interlace block in the y direction */ - static PNG_CONST png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; + static const png_byte png_pass_ystart[7] = {0, 0, 4, 0, 2, 0, 1}; /* Offset to next interlace block in the y direction */ - static PNG_CONST png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; + static const png_byte png_pass_yinc[7] = {8, 8, 8, 4, 4, 2, 2}; #endif png_debug(1, "in png_write_finish_row"); @@ -2098,10 +2098,10 @@ png_do_write_interlace(png_row_infop row_info, png_bytep row, int pass) /* Arrays to facilitate easy interlacing - use pass (0 - 6) as index */ /* Start of interlace block */ - static PNG_CONST png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; + static const png_byte png_pass_start[7] = {0, 4, 0, 2, 0, 1, 0}; /* Offset to next interlace block */ - static PNG_CONST png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; + static const png_byte png_pass_inc[7] = {8, 8, 4, 4, 2, 2, 1}; png_debug(1, "in png_do_write_interlace"); @@ -2276,7 +2276,7 @@ png_write_filtered_row(png_structrp png_ptr, png_bytep filtered_row, #ifdef PNG_WRITE_FILTER_SUPPORTED static size_t /* PRIVATE */ -png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_sub_row(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes, size_t lmins) { png_bytep rp, dp, lp; @@ -2315,7 +2315,7 @@ png_setup_sub_row(png_structrp png_ptr, const png_uint_32 bpp, } static void /* PRIVATE */ -png_setup_sub_row_only(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_sub_row_only(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes) { png_bytep rp, dp, lp; @@ -2380,7 +2380,7 @@ png_setup_up_row_only(png_structrp png_ptr, size_t row_bytes) } static size_t /* PRIVATE */ -png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_avg_row(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes, size_t lmins) { png_bytep rp, dp, pp, lp; @@ -2420,7 +2420,7 @@ png_setup_avg_row(png_structrp png_ptr, const png_uint_32 bpp, return (sum); } static void /* PRIVATE */ -png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_avg_row_only(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes) { png_bytep rp, dp, pp, lp; @@ -2442,7 +2442,7 @@ png_setup_avg_row_only(png_structrp png_ptr, const png_uint_32 bpp, } static size_t /* PRIVATE */ -png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_paeth_row(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes, size_t lmins) { png_bytep rp, dp, pp, cp, lp; @@ -2503,7 +2503,7 @@ png_setup_paeth_row(png_structrp png_ptr, const png_uint_32 bpp, return (sum); } static void /* PRIVATE */ -png_setup_paeth_row_only(png_structrp png_ptr, const png_uint_32 bpp, +png_setup_paeth_row_only(png_structrp png_ptr, png_uint_32 bpp, size_t row_bytes) { png_bytep rp, dp, pp, cp, lp; diff --git a/thirdparty/libwebp/AUTHORS b/thirdparty/libwebp/AUTHORS index 83c7b9c5eb..0d70b7fb2a 100644 --- a/thirdparty/libwebp/AUTHORS +++ b/thirdparty/libwebp/AUTHORS @@ -1,4 +1,5 @@ Contributors: +- Alan Browning (browning at google dot com) - Charles Munger (clm at google dot com) - Christian Duvivier (cduvivier at google dot com) - Djordje Pesut (djordje dot pesut at imgtec dot com) @@ -6,9 +7,10 @@ Contributors: - James Zern (jzern at google dot com) - Jan Engelhardt (jengelh at medozas dot de) - Jehan (jehan at girinstud dot io) -- Johann (johann dot koenig at duck dot com) +- Johann Koenig (johann dot koenig at duck dot com) - Jovan Zelincevic (jovan dot zelincevic at imgtec dot com) - Jyrki Alakuijala (jyrki at google dot com) +- Konstantin Ivlev (tomskside at gmail dot com) - Lode Vandevenne (lode at google dot com) - Lou Quillio (louquillio at google dot com) - Mans Rullgard (mans at mansr dot com) @@ -37,3 +39,4 @@ Contributors: - Vincent Rabaud (vrabaud at google dot com) - Vlad Tsyrklevich (vtsyrklevich at chromium dot org) - Yang Zhang (yang dot zhang at arm dot com) +- Yannis Guyon (yguyon at google dot com) diff --git a/thirdparty/libwebp/src/dec/vp8i_dec.h b/thirdparty/libwebp/src/dec/vp8i_dec.h index e5e89df57d..2d7900aae1 100644 --- a/thirdparty/libwebp/src/dec/vp8i_dec.h +++ b/thirdparty/libwebp/src/dec/vp8i_dec.h @@ -32,7 +32,7 @@ extern "C" { // version numbers #define DEC_MAJ_VERSION 1 #define DEC_MIN_VERSION 0 -#define DEC_REV_VERSION 1 +#define DEC_REV_VERSION 2 // YUV-cache parameters. Cache is 32-bytes wide (= one cacheline). // Constraints are: We need to store one 16x16 block of luma samples (y), diff --git a/thirdparty/libwebp/src/demux/demux.c b/thirdparty/libwebp/src/demux/demux.c index a69c65b7cf..d8f7a40a56 100644 --- a/thirdparty/libwebp/src/demux/demux.c +++ b/thirdparty/libwebp/src/demux/demux.c @@ -25,7 +25,7 @@ #define DMUX_MAJ_VERSION 1 #define DMUX_MIN_VERSION 0 -#define DMUX_REV_VERSION 1 +#define DMUX_REV_VERSION 2 typedef struct { size_t start_; // start location of the data diff --git a/thirdparty/libwebp/src/dsp/cost.c b/thirdparty/libwebp/src/dsp/cost.c index 634ccc2085..cc681cdd4b 100644 --- a/thirdparty/libwebp/src/dsp/cost.c +++ b/thirdparty/libwebp/src/dsp/cost.c @@ -377,6 +377,7 @@ VP8SetResidualCoeffsFunc VP8SetResidualCoeffs; extern void VP8EncDspCostInitMIPS32(void); extern void VP8EncDspCostInitMIPSdspR2(void); extern void VP8EncDspCostInitSSE2(void); +extern void VP8EncDspCostInitNEON(void); WEBP_DSP_INIT_FUNC(VP8EncDspCostInit) { VP8GetResidualCost = GetResidualCost_C; @@ -399,6 +400,11 @@ WEBP_DSP_INIT_FUNC(VP8EncDspCostInit) { VP8EncDspCostInitSSE2(); } #endif +#if defined(WEBP_USE_NEON) + if (VP8GetCPUInfo(kNEON)) { + VP8EncDspCostInitNEON(); + } +#endif } } diff --git a/thirdparty/libwebp/src/dsp/cost_neon.c b/thirdparty/libwebp/src/dsp/cost_neon.c new file mode 100644 index 0000000000..8cc8ce58aa --- /dev/null +++ b/thirdparty/libwebp/src/dsp/cost_neon.c @@ -0,0 +1,122 @@ +// Copyright 2018 Google Inc. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the COPYING file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. +// ----------------------------------------------------------------------------- +// +// ARM NEON version of cost functions + +#include "src/dsp/dsp.h" + +#if defined(WEBP_USE_NEON) + +#include "src/dsp/neon.h" +#include "src/enc/cost_enc.h" + +static const uint8_t position[16] = { 1, 2, 3, 4, 5, 6, 7, 8, + 9, 10, 11, 12, 13, 14, 15, 16 }; + +static void SetResidualCoeffs_NEON(const int16_t* const coeffs, + VP8Residual* const res) { + const int16x8_t minus_one = vdupq_n_s16(-1); + const int16x8_t coeffs_0 = vld1q_s16(coeffs); + const int16x8_t coeffs_1 = vld1q_s16(coeffs + 8); + const uint16x8_t eob_0 = vtstq_s16(coeffs_0, minus_one); + const uint16x8_t eob_1 = vtstq_s16(coeffs_1, minus_one); + const uint8x16_t eob = vcombine_u8(vqmovn_u16(eob_0), vqmovn_u16(eob_1)); + const uint8x16_t masked = vandq_u8(eob, vld1q_u8(position)); + +#ifdef __aarch64__ + res->last = vmaxvq_u8(masked) - 1; +#else + const uint8x8_t eob_8x8 = vmax_u8(vget_low_u8(masked), vget_high_u8(masked)); + const uint16x8_t eob_16x8 = vmovl_u8(eob_8x8); + const uint16x4_t eob_16x4 = + vmax_u16(vget_low_u16(eob_16x8), vget_high_u16(eob_16x8)); + const uint32x4_t eob_32x4 = vmovl_u16(eob_16x4); + uint32x2_t eob_32x2 = + vmax_u32(vget_low_u32(eob_32x4), vget_high_u32(eob_32x4)); + eob_32x2 = vpmax_u32(eob_32x2, eob_32x2); + + vst1_lane_s32(&res->last, vreinterpret_s32_u32(eob_32x2), 0); + --res->last; +#endif // __aarch64__ + + res->coeffs = coeffs; +} + +static int GetResidualCost_NEON(int ctx0, const VP8Residual* const res) { + uint8_t levels[16], ctxs[16]; + uint16_t abs_levels[16]; + int n = res->first; + // should be prob[VP8EncBands[n]], but it's equivalent for n=0 or 1 + const int p0 = res->prob[n][ctx0][0]; + CostArrayPtr const costs = res->costs; + const uint16_t* t = costs[n][ctx0]; + // bit_cost(1, p0) is already incorporated in t[] tables, but only if ctx != 0 + // (as required by the syntax). For ctx0 == 0, we need to add it here or it'll + // be missing during the loop. + int cost = (ctx0 == 0) ? VP8BitCost(1, p0) : 0; + + if (res->last < 0) { + return VP8BitCost(0, p0); + } + + { // precompute clamped levels and contexts, packed to 8b. + const uint8x16_t kCst2 = vdupq_n_u8(2); + const uint8x16_t kCst67 = vdupq_n_u8(MAX_VARIABLE_LEVEL); + const int16x8_t c0 = vld1q_s16(res->coeffs); + const int16x8_t c1 = vld1q_s16(res->coeffs + 8); + const uint16x8_t E0 = vreinterpretq_u16_s16(vabsq_s16(c0)); + const uint16x8_t E1 = vreinterpretq_u16_s16(vabsq_s16(c1)); + const uint8x16_t F = vcombine_u8(vqmovn_u16(E0), vqmovn_u16(E1)); + const uint8x16_t G = vminq_u8(F, kCst2); // context = 0,1,2 + const uint8x16_t H = vminq_u8(F, kCst67); // clamp_level in [0..67] + + vst1q_u8(ctxs, G); + vst1q_u8(levels, H); + + vst1q_u16(abs_levels, E0); + vst1q_u16(abs_levels + 8, E1); + } + for (; n < res->last; ++n) { + const int ctx = ctxs[n]; + const int level = levels[n]; + const int flevel = abs_levels[n]; // full level + cost += VP8LevelFixedCosts[flevel] + t[level]; // simplified VP8LevelCost() + t = costs[n + 1][ctx]; + } + // Last coefficient is always non-zero + { + const int level = levels[n]; + const int flevel = abs_levels[n]; + assert(flevel != 0); + cost += VP8LevelFixedCosts[flevel] + t[level]; + if (n < 15) { + const int b = VP8EncBands[n + 1]; + const int ctx = ctxs[n]; + const int last_p0 = res->prob[b][ctx][0]; + cost += VP8BitCost(0, last_p0); + } + } + return cost; +} + +//------------------------------------------------------------------------------ +// Entry point + +extern void VP8EncDspCostInitNEON(void); + +WEBP_TSAN_IGNORE_FUNCTION void VP8EncDspCostInitNEON(void) { + VP8SetResidualCoeffs = SetResidualCoeffs_NEON; + VP8GetResidualCost = GetResidualCost_NEON; +} + +#else // !WEBP_USE_NEON + +WEBP_DSP_INIT_STUB(VP8EncDspCostInitNEON) + +#endif // WEBP_USE_NEON diff --git a/thirdparty/libwebp/src/dsp/quant.h b/thirdparty/libwebp/src/dsp/quant.h new file mode 100644 index 0000000000..5ba6f9c377 --- /dev/null +++ b/thirdparty/libwebp/src/dsp/quant.h @@ -0,0 +1,70 @@ +// Copyright 2018 Google Inc. All Rights Reserved. +// +// Use of this source code is governed by a BSD-style license +// that can be found in the COPYING file in the root of the source +// tree. An additional intellectual property rights grant can be found +// in the file PATENTS. All contributing project authors may +// be found in the AUTHORS file in the root of the source tree. +// ----------------------------------------------------------------------------- + +#ifndef WEBP_DSP_QUANT_H_ +#define WEBP_DSP_QUANT_H_ + +#include "src/dsp/dsp.h" +#include "src/webp/types.h" + +#if defined(WEBP_USE_NEON) && !defined(WEBP_ANDROID_NEON) && \ + !defined(WEBP_HAVE_NEON_RTCD) +#include <arm_neon.h> + +#define IsFlat IsFlat_NEON + +static uint32x2_t horizontal_add_uint32x4(const uint32x4_t a) { + const uint64x2_t b = vpaddlq_u32(a); + return vadd_u32(vreinterpret_u32_u64(vget_low_u64(b)), + vreinterpret_u32_u64(vget_high_u64(b))); +} + +static WEBP_INLINE int IsFlat(const int16_t* levels, int num_blocks, + int thresh) { + const int16x8_t tst_ones = vdupq_n_s16(-1); + uint32x4_t sum = vdupq_n_u32(0); + + for (int i = 0; i < num_blocks; ++i) { + // Set DC to zero. + const int16x8_t a_0 = vsetq_lane_s16(0, vld1q_s16(levels), 0); + const int16x8_t a_1 = vld1q_s16(levels + 8); + + const uint16x8_t b_0 = vshrq_n_u16(vtstq_s16(a_0, tst_ones), 15); + const uint16x8_t b_1 = vshrq_n_u16(vtstq_s16(a_1, tst_ones), 15); + + sum = vpadalq_u16(sum, b_0); + sum = vpadalq_u16(sum, b_1); + + levels += 16; + } + return thresh >= (int32_t)vget_lane_u32(horizontal_add_uint32x4(sum), 0); +} + +#else + +#define IsFlat IsFlat_C + +static WEBP_INLINE int IsFlat(const int16_t* levels, int num_blocks, + int thresh) { + int score = 0; + while (num_blocks-- > 0) { // TODO(skal): refine positional scoring? + int i; + for (i = 1; i < 16; ++i) { // omit DC, we're only interested in AC + score += (levels[i] != 0); + if (score > thresh) return 0; + } + levels += 16; + } + return 1; +} + +#endif // defined(WEBP_USE_NEON) && !defined(WEBP_ANDROID_NEON) && + // !defined(WEBP_HAVE_NEON_RTCD) + +#endif // WEBP_DSP_QUANT_H_ diff --git a/thirdparty/libwebp/src/enc/histogram_enc.c b/thirdparty/libwebp/src/enc/histogram_enc.c index 4e49e0a201..8ac6fa8e02 100644 --- a/thirdparty/libwebp/src/enc/histogram_enc.c +++ b/thirdparty/libwebp/src/enc/histogram_enc.c @@ -165,7 +165,7 @@ VP8LHistogramSet* VP8LAllocateHistogramSet(int size, int cache_bits) { void VP8LHistogramSetClear(VP8LHistogramSet* const set) { int i; const int cache_bits = set->histograms[0]->palette_code_bits_; - const int size = set->size; + const int size = set->max_size; const size_t total_size = HistogramSetTotalSize(size, cache_bits); uint8_t* memory = (uint8_t*)set; @@ -180,6 +180,20 @@ void VP8LHistogramSetClear(VP8LHistogramSet* const set) { } } +// Removes the histogram 'i' from 'set' by setting it to NULL. +static void HistogramSetRemoveHistogram(VP8LHistogramSet* const set, int i, + int* const num_used) { + assert(set->histograms[i] != NULL); + set->histograms[i] = NULL; + --*num_used; + // If we remove the last valid one, shrink until the next valid one. + if (i == set->size - 1) { + while (set->size >= 1 && set->histograms[set->size - 1] == NULL) { + --set->size; + } + } +} + // ----------------------------------------------------------------------------- void VP8LHistogramAddSinglePixOrCopy(VP8LHistogram* const histo, @@ -447,7 +461,9 @@ static double HistogramAddEval(const VP8LHistogram* const a, static double HistogramAddThresh(const VP8LHistogram* const a, const VP8LHistogram* const b, double cost_threshold) { - double cost = -a->bit_cost_; + double cost; + assert(a != NULL && b != NULL); + cost = -a->bit_cost_; GetCombinedHistogramEntropy(a, b, cost_threshold, &cost); return cost; } @@ -561,14 +577,17 @@ static void HistogramBuild( } // Copies the histograms and computes its bit_cost. -static void HistogramCopyAndAnalyze( - VP8LHistogramSet* const orig_histo, VP8LHistogramSet* const image_histo) { - int i; - const int histo_size = orig_histo->size; +static const uint16_t kInvalidHistogramSymbol = (uint16_t)(-1); +static void HistogramCopyAndAnalyze(VP8LHistogramSet* const orig_histo, + VP8LHistogramSet* const image_histo, + int* const num_used, + uint16_t* const histogram_symbols) { + int i, cluster_id; + int num_used_orig = *num_used; VP8LHistogram** const orig_histograms = orig_histo->histograms; VP8LHistogram** const histograms = image_histo->histograms; - image_histo->size = 0; - for (i = 0; i < histo_size; ++i) { + assert(image_histo->max_size == orig_histo->max_size); + for (cluster_id = 0, i = 0; i < orig_histo->max_size; ++i) { VP8LHistogram* const histo = orig_histograms[i]; UpdateHistogramCost(histo); @@ -576,10 +595,19 @@ static void HistogramCopyAndAnalyze( // with no information (when they are skipped because of LZ77). if (!histo->is_used_[0] && !histo->is_used_[1] && !histo->is_used_[2] && !histo->is_used_[3] && !histo->is_used_[4]) { - continue; + // The first histogram is always used. If an histogram is empty, we set + // its id to be the same as the previous one: this will improve + // compressibility for later LZ77. + assert(i > 0); + HistogramSetRemoveHistogram(image_histo, i, num_used); + HistogramSetRemoveHistogram(orig_histo, i, &num_used_orig); + histogram_symbols[i] = kInvalidHistogramSymbol; + } else { + // Copy histograms from orig_histo[] to image_histo[]. + HistogramCopy(histo, histograms[i]); + histogram_symbols[i] = cluster_id++; + assert(cluster_id <= image_histo->max_size); } - // Copy histograms from orig_histo[] to image_histo[]. - HistogramCopy(histo, histograms[image_histo->size++]); } } @@ -596,29 +624,33 @@ static void HistogramAnalyzeEntropyBin(VP8LHistogramSet* const image_histo, // Analyze the dominant (literal, red and blue) entropy costs. for (i = 0; i < histo_size; ++i) { + if (histograms[i] == NULL) continue; UpdateDominantCostRange(histograms[i], &cost_range); } // bin-hash histograms on three of the dominant (literal, red and blue) // symbol costs and store the resulting bin_id for each histogram. for (i = 0; i < histo_size; ++i) { + // bin_map[i] is not set to a special value as its use will later be guarded + // by another (histograms[i] == NULL). + if (histograms[i] == NULL) continue; bin_map[i] = GetHistoBinIndex(histograms[i], &cost_range, low_effort); } } -// Compact image_histo[] by merging some histograms with same bin_id together if -// it's advantageous. +// Merges some histograms with same bin_id together if it's advantageous. +// Sets the remaining histograms to NULL. static void HistogramCombineEntropyBin(VP8LHistogramSet* const image_histo, + int *num_used, + const uint16_t* const clusters, + uint16_t* const cluster_mappings, VP8LHistogram* cur_combo, const uint16_t* const bin_map, - int bin_map_size, int num_bins, + int num_bins, double combine_cost_factor, int low_effort) { VP8LHistogram** const histograms = image_histo->histograms; int idx; - // Work in-place: processed histograms are put at the beginning of - // image_histo[]. At the end, we just have to truncate the array. - int size = 0; struct { int16_t first; // position of the histogram that accumulates all // histograms with the same bin_id @@ -631,16 +663,19 @@ static void HistogramCombineEntropyBin(VP8LHistogramSet* const image_histo, bin_info[idx].num_combine_failures = 0; } - for (idx = 0; idx < bin_map_size; ++idx) { - const int bin_id = bin_map[idx]; - const int first = bin_info[bin_id].first; - assert(size <= idx); + // By default, a cluster matches itself. + for (idx = 0; idx < *num_used; ++idx) cluster_mappings[idx] = idx; + for (idx = 0; idx < image_histo->size; ++idx) { + int bin_id, first; + if (histograms[idx] == NULL) continue; + bin_id = bin_map[idx]; + first = bin_info[bin_id].first; if (first == -1) { - // just move histogram #idx to its final position - histograms[size] = histograms[idx]; - bin_info[bin_id].first = size++; + bin_info[bin_id].first = idx; } else if (low_effort) { HistogramAdd(histograms[idx], histograms[first], histograms[first]); + HistogramSetRemoveHistogram(image_histo, idx, num_used); + cluster_mappings[clusters[idx]] = clusters[first]; } else { // try to merge #idx into #first (both share the same bin_id) const double bit_cost = histograms[idx]->bit_cost_; @@ -663,19 +698,18 @@ static void HistogramCombineEntropyBin(VP8LHistogramSet* const image_histo, bin_info[bin_id].num_combine_failures >= max_combine_failures) { // move the (better) merged histogram to its final slot HistogramSwap(&cur_combo, &histograms[first]); + HistogramSetRemoveHistogram(image_histo, idx, num_used); + cluster_mappings[clusters[idx]] = clusters[first]; } else { - histograms[size++] = histograms[idx]; ++bin_info[bin_id].num_combine_failures; } - } else { - histograms[size++] = histograms[idx]; } } } - image_histo->size = size; if (low_effort) { // for low_effort case, update the final cost when everything is merged - for (idx = 0; idx < size; ++idx) { + for (idx = 0; idx < image_histo->size; ++idx) { + if (histograms[idx] == NULL) continue; UpdateHistogramCost(histograms[idx]); } } @@ -706,16 +740,9 @@ typedef struct { int max_size; } HistoQueue; -static int HistoQueueInit(HistoQueue* const histo_queue, const int max_index) { +static int HistoQueueInit(HistoQueue* const histo_queue, const int max_size) { histo_queue->size = 0; - // max_index^2 for the queue size is safe. If you look at - // HistogramCombineGreedy, and imagine that UpdateQueueFront always pushes - // data to the queue, you insert at most: - // - max_index*(max_index-1)/2 (the first two for loops) - // - max_index - 1 in the last for loop at the first iteration of the while - // loop, max_index - 2 at the second iteration ... therefore - // max_index*(max_index-1)/2 overall too - histo_queue->max_size = max_index * max_index; + histo_queue->max_size = max_size; // We allocate max_size + 1 because the last element at index "size" is // used as temporary data (and it could be up to max_size). histo_queue->queue = (HistogramPair*)WebPSafeMalloc( @@ -778,6 +805,8 @@ static double HistoQueuePush(HistoQueue* const histo_queue, const VP8LHistogram* h2; HistogramPair pair; + // Stop here if the queue is full. + if (histo_queue->size == histo_queue->max_size) return 0.; assert(threshold <= 0.); if (idx1 > idx2) { const int tmp = idx2; @@ -794,8 +823,6 @@ static double HistoQueuePush(HistoQueue* const histo_queue, // Do not even consider the pair if it does not improve the entropy. if (pair.cost_diff >= threshold) return 0.; - // We cannot add more elements than the capacity. - assert(histo_queue->size < histo_queue->max_size); histo_queue->queue[histo_queue->size++] = pair; HistoQueueUpdateHead(histo_queue, &histo_queue->queue[histo_queue->size - 1]); @@ -806,42 +833,43 @@ static double HistoQueuePush(HistoQueue* const histo_queue, // Combines histograms by continuously choosing the one with the highest cost // reduction. -static int HistogramCombineGreedy(VP8LHistogramSet* const image_histo) { +static int HistogramCombineGreedy(VP8LHistogramSet* const image_histo, + int* const num_used) { int ok = 0; - int image_histo_size = image_histo->size; + const int image_histo_size = image_histo->size; int i, j; VP8LHistogram** const histograms = image_histo->histograms; - // Indexes of remaining histograms. - int* const clusters = - (int*)WebPSafeMalloc(image_histo_size, sizeof(*clusters)); // Priority queue of histogram pairs. HistoQueue histo_queue; - if (!HistoQueueInit(&histo_queue, image_histo_size) || clusters == NULL) { + // image_histo_size^2 for the queue size is safe. If you look at + // HistogramCombineGreedy, and imagine that UpdateQueueFront always pushes + // data to the queue, you insert at most: + // - image_histo_size*(image_histo_size-1)/2 (the first two for loops) + // - image_histo_size - 1 in the last for loop at the first iteration of + // the while loop, image_histo_size - 2 at the second iteration ... + // therefore image_histo_size*(image_histo_size-1)/2 overall too + if (!HistoQueueInit(&histo_queue, image_histo_size * image_histo_size)) { goto End; } for (i = 0; i < image_histo_size; ++i) { - // Initialize clusters indexes. - clusters[i] = i; + if (image_histo->histograms[i] == NULL) continue; for (j = i + 1; j < image_histo_size; ++j) { - // Initialize positions array. + // Initialize queue. + if (image_histo->histograms[j] == NULL) continue; HistoQueuePush(&histo_queue, histograms, i, j, 0.); } } - while (image_histo_size > 1 && histo_queue.size > 0) { + while (histo_queue.size > 0) { const int idx1 = histo_queue.queue[0].idx1; const int idx2 = histo_queue.queue[0].idx2; HistogramAdd(histograms[idx2], histograms[idx1], histograms[idx1]); histograms[idx1]->bit_cost_ = histo_queue.queue[0].cost_combo; + // Remove merged histogram. - for (i = 0; i + 1 < image_histo_size; ++i) { - if (clusters[i] >= idx2) { - clusters[i] = clusters[i + 1]; - } - } - --image_histo_size; + HistogramSetRemoveHistogram(image_histo, idx2, num_used); // Remove pairs intersecting the just combined best pair. for (i = 0; i < histo_queue.size;) { @@ -856,24 +884,15 @@ static int HistogramCombineGreedy(VP8LHistogramSet* const image_histo) { } // Push new pairs formed with combined histogram to the queue. - for (i = 0; i < image_histo_size; ++i) { - if (clusters[i] != idx1) { - HistoQueuePush(&histo_queue, histograms, idx1, clusters[i], 0.); - } - } - } - // Move remaining histograms to the beginning of the array. - for (i = 0; i < image_histo_size; ++i) { - if (i != clusters[i]) { // swap the two histograms - HistogramSwap(&histograms[i], &histograms[clusters[i]]); + for (i = 0; i < image_histo->size; ++i) { + if (i == idx1 || image_histo->histograms[i] == NULL) continue; + HistoQueuePush(&histo_queue, image_histo->histograms, idx1, i, 0.); } } - image_histo->size = image_histo_size; ok = 1; End: - WebPSafeFree(clusters); HistoQueueClear(&histo_queue); return ok; } @@ -881,47 +900,69 @@ static int HistogramCombineGreedy(VP8LHistogramSet* const image_histo) { // Perform histogram aggregation using a stochastic approach. // 'do_greedy' is set to 1 if a greedy approach needs to be performed // afterwards, 0 otherwise. +static int PairComparison(const void* idx1, const void* idx2) { + // To be used with bsearch: <0 when *idx1<*idx2, >0 if >, 0 when ==. + return (*(int*) idx1 - *(int*) idx2); +} static int HistogramCombineStochastic(VP8LHistogramSet* const image_histo, - int min_cluster_size, + int* const num_used, int min_cluster_size, int* const do_greedy) { - int iter; + int j, iter; uint32_t seed = 1; int tries_with_no_success = 0; - int image_histo_size = image_histo->size; - const int outer_iters = image_histo_size; + const int outer_iters = *num_used; const int num_tries_no_success = outer_iters / 2; VP8LHistogram** const histograms = image_histo->histograms; - // Priority queue of histogram pairs. Its size of "kCostHeapSizeSqrt"^2 + // Priority queue of histogram pairs. Its size of 'kHistoQueueSize' // impacts the quality of the compression and the speed: the smaller the // faster but the worse for the compression. HistoQueue histo_queue; - const int kHistoQueueSizeSqrt = 3; + const int kHistoQueueSize = 9; int ok = 0; + // mapping from an index in image_histo with no NULL histogram to the full + // blown image_histo. + int* mappings; - if (!HistoQueueInit(&histo_queue, kHistoQueueSizeSqrt)) { + if (*num_used < min_cluster_size) { + *do_greedy = 1; + return 1; + } + + mappings = (int*) WebPSafeMalloc(*num_used, sizeof(*mappings)); + if (mappings == NULL || !HistoQueueInit(&histo_queue, kHistoQueueSize)) { goto End; } + // Fill the initial mapping. + for (j = 0, iter = 0; iter < image_histo->size; ++iter) { + if (histograms[iter] == NULL) continue; + mappings[j++] = iter; + } + assert(j == *num_used); + // Collapse similar histograms in 'image_histo'. - ++min_cluster_size; - for (iter = 0; iter < outer_iters && image_histo_size >= min_cluster_size && - ++tries_with_no_success < num_tries_no_success; + for (iter = 0; + iter < outer_iters && *num_used >= min_cluster_size && + ++tries_with_no_success < num_tries_no_success; ++iter) { + int* mapping_index; double best_cost = (histo_queue.size == 0) ? 0. : histo_queue.queue[0].cost_diff; int best_idx1 = -1, best_idx2 = 1; - int j; - const uint32_t rand_range = (image_histo_size - 1) * image_histo_size; - // image_histo_size / 2 was chosen empirically. Less means faster but worse + const uint32_t rand_range = (*num_used - 1) * (*num_used); + // (*num_used) / 2 was chosen empirically. Less means faster but worse // compression. - const int num_tries = image_histo_size / 2; + const int num_tries = (*num_used) / 2; - for (j = 0; j < num_tries; ++j) { + // Pick random samples. + for (j = 0; *num_used >= 2 && j < num_tries; ++j) { double curr_cost; // Choose two different histograms at random and try to combine them. const uint32_t tmp = MyRand(&seed) % rand_range; - const uint32_t idx1 = tmp / (image_histo_size - 1); - uint32_t idx2 = tmp % (image_histo_size - 1); + uint32_t idx1 = tmp / (*num_used - 1); + uint32_t idx2 = tmp % (*num_used - 1); if (idx2 >= idx1) ++idx2; + idx1 = mappings[idx1]; + idx2 = mappings[idx2]; // Calculate cost reduction on combination. curr_cost = @@ -934,18 +975,21 @@ static int HistogramCombineStochastic(VP8LHistogramSet* const image_histo, } if (histo_queue.size == 0) continue; - // Merge the two best histograms. + // Get the best histograms. best_idx1 = histo_queue.queue[0].idx1; best_idx2 = histo_queue.queue[0].idx2; assert(best_idx1 < best_idx2); - HistogramAddEval(histograms[best_idx1], histograms[best_idx2], - histograms[best_idx1], 0); - // Swap the best_idx2 histogram with the last one (which is now unused). - --image_histo_size; - if (best_idx2 != image_histo_size) { - HistogramSwap(&histograms[image_histo_size], &histograms[best_idx2]); - } - histograms[image_histo_size] = NULL; + // Pop best_idx2 from mappings. + mapping_index = (int*) bsearch(&best_idx2, mappings, *num_used, + sizeof(best_idx2), &PairComparison); + assert(mapping_index != NULL); + memmove(mapping_index, mapping_index + 1, sizeof(*mapping_index) * + ((*num_used) - (mapping_index - mappings) - 1)); + // Merge the histograms and remove best_idx2 from the queue. + HistogramAdd(histograms[best_idx2], histograms[best_idx1], + histograms[best_idx1]); + histograms[best_idx1]->bit_cost_ = histo_queue.queue[0].cost_combo; + HistogramSetRemoveHistogram(image_histo, best_idx2, num_used); // Parse the queue and update each pair that deals with best_idx1, // best_idx2 or image_histo_size. for (j = 0; j < histo_queue.size;) { @@ -968,12 +1012,6 @@ static int HistogramCombineStochastic(VP8LHistogramSet* const image_histo, p->idx2 = best_idx1; do_eval = 1; } - if (p->idx2 == image_histo_size) { - // No need to re-evaluate here as it does not involve a pair - // containing best_idx1 or best_idx2. - p->idx2 = best_idx2; - } - assert(p->idx2 < image_histo_size); // Make sure the index order is respected. if (p->idx1 > p->idx2) { const int tmp = p->idx2; @@ -991,15 +1029,14 @@ static int HistogramCombineStochastic(VP8LHistogramSet* const image_histo, HistoQueueUpdateHead(&histo_queue, p); ++j; } - tries_with_no_success = 0; } - image_histo->size = image_histo_size; - *do_greedy = (image_histo->size <= min_cluster_size); + *do_greedy = (*num_used <= min_cluster_size); ok = 1; End: HistoQueueClear(&histo_queue); + WebPSafeFree(mappings); return ok; } @@ -1007,23 +1044,29 @@ End: // Histogram refinement // Find the best 'out' histogram for each of the 'in' histograms. +// At call-time, 'out' contains the histograms of the clusters. // Note: we assume that out[]->bit_cost_ is already up-to-date. static void HistogramRemap(const VP8LHistogramSet* const in, - const VP8LHistogramSet* const out, + VP8LHistogramSet* const out, uint16_t* const symbols) { int i; VP8LHistogram** const in_histo = in->histograms; VP8LHistogram** const out_histo = out->histograms; - const int in_size = in->size; + const int in_size = out->max_size; const int out_size = out->size; if (out_size > 1) { for (i = 0; i < in_size; ++i) { int best_out = 0; double best_bits = MAX_COST; int k; + if (in_histo[i] == NULL) { + // Arbitrarily set to the previous value if unused to help future LZ77. + symbols[i] = symbols[i - 1]; + continue; + } for (k = 0; k < out_size; ++k) { - const double cur_bits = - HistogramAddThresh(out_histo[k], in_histo[i], best_bits); + double cur_bits; + cur_bits = HistogramAddThresh(out_histo[k], in_histo[i], best_bits); if (k == 0 || cur_bits < best_bits) { best_bits = cur_bits; best_out = k; @@ -1039,12 +1082,13 @@ static void HistogramRemap(const VP8LHistogramSet* const in, } // Recompute each out based on raw and symbols. - for (i = 0; i < out_size; ++i) { - HistogramClear(out_histo[i]); - } + VP8LHistogramSetClear(out); + out->size = out_size; for (i = 0; i < in_size; ++i) { - const int idx = symbols[i]; + int idx; + if (in_histo[i] == NULL) continue; + idx = symbols[i]; HistogramAdd(in_histo[i], out_histo[idx], out_histo[idx]); } } @@ -1060,6 +1104,70 @@ static double GetCombineCostFactor(int histo_size, int quality) { return combine_cost_factor; } +// Given a HistogramSet 'set', the mapping of clusters 'cluster_mapping' and the +// current assignment of the cells in 'symbols', merge the clusters and +// assign the smallest possible clusters values. +static void OptimizeHistogramSymbols(const VP8LHistogramSet* const set, + uint16_t* const cluster_mappings, + int num_clusters, + uint16_t* const cluster_mappings_tmp, + uint16_t* const symbols) { + int i, cluster_max; + int do_continue = 1; + // First, assign the lowest cluster to each pixel. + while (do_continue) { + do_continue = 0; + for (i = 0; i < num_clusters; ++i) { + int k; + k = cluster_mappings[i]; + while (k != cluster_mappings[k]) { + cluster_mappings[k] = cluster_mappings[cluster_mappings[k]]; + k = cluster_mappings[k]; + } + if (k != cluster_mappings[i]) { + do_continue = 1; + cluster_mappings[i] = k; + } + } + } + // Create a mapping from a cluster id to its minimal version. + cluster_max = 0; + memset(cluster_mappings_tmp, 0, + set->max_size * sizeof(*cluster_mappings_tmp)); + assert(cluster_mappings[0] == 0); + // Re-map the ids. + for (i = 0; i < set->max_size; ++i) { + int cluster; + if (symbols[i] == kInvalidHistogramSymbol) continue; + cluster = cluster_mappings[symbols[i]]; + assert(symbols[i] < num_clusters); + if (cluster > 0 && cluster_mappings_tmp[cluster] == 0) { + ++cluster_max; + cluster_mappings_tmp[cluster] = cluster_max; + } + symbols[i] = cluster_mappings_tmp[cluster]; + } + + // Make sure all cluster values are used. + cluster_max = 0; + for (i = 0; i < set->max_size; ++i) { + if (symbols[i] == kInvalidHistogramSymbol) continue; + if (symbols[i] <= cluster_max) continue; + ++cluster_max; + assert(symbols[i] == cluster_max); + } +} + +static void RemoveEmptyHistograms(VP8LHistogramSet* const image_histo) { + uint32_t size; + int i; + for (i = 0, size = 0; i < image_histo->size; ++i) { + if (image_histo->histograms[i] == NULL) continue; + image_histo->histograms[size++] = image_histo->histograms[i]; + } + image_histo->size = size; +} + int VP8LGetHistoImageSymbols(int xsize, int ysize, const VP8LBackwardRefs* const refs, int quality, int low_effort, @@ -1078,27 +1186,36 @@ int VP8LGetHistoImageSymbols(int xsize, int ysize, // maximum quality q==100 (to preserve the compression gains at that level). const int entropy_combine_num_bins = low_effort ? NUM_PARTITIONS : BIN_SIZE; int entropy_combine; - - if (orig_histo == NULL) goto Error; + uint16_t* const map_tmp = + WebPSafeMalloc(2 * image_histo_raw_size, sizeof(map_tmp)); + uint16_t* const cluster_mappings = map_tmp + image_histo_raw_size; + int num_used = image_histo_raw_size; + if (orig_histo == NULL || map_tmp == NULL) goto Error; // Construct the histograms from backward references. HistogramBuild(xsize, histo_bits, refs, orig_histo); // Copies the histograms and computes its bit_cost. - HistogramCopyAndAnalyze(orig_histo, image_histo); + // histogram_symbols is optimized + HistogramCopyAndAnalyze(orig_histo, image_histo, &num_used, + histogram_symbols); + entropy_combine = - (image_histo->size > entropy_combine_num_bins * 2) && (quality < 100); + (num_used > entropy_combine_num_bins * 2) && (quality < 100); + if (entropy_combine) { - const int bin_map_size = image_histo->size; - // Reuse histogram_symbols storage. By definition, it's guaranteed to be ok. - uint16_t* const bin_map = histogram_symbols; + uint16_t* const bin_map = map_tmp; const double combine_cost_factor = GetCombineCostFactor(image_histo_raw_size, quality); + const uint32_t num_clusters = num_used; HistogramAnalyzeEntropyBin(image_histo, bin_map, low_effort); // Collapse histograms with similar entropy. - HistogramCombineEntropyBin(image_histo, tmp_histo, bin_map, bin_map_size, + HistogramCombineEntropyBin(image_histo, &num_used, histogram_symbols, + cluster_mappings, tmp_histo, bin_map, entropy_combine_num_bins, combine_cost_factor, low_effort); + OptimizeHistogramSymbols(image_histo, cluster_mappings, num_clusters, + map_tmp, histogram_symbols); } // Don't combine the histograms using stochastic and greedy heuristics for @@ -1108,21 +1225,26 @@ int VP8LGetHistoImageSymbols(int xsize, int ysize, // cubic ramp between 1 and MAX_HISTO_GREEDY: const int threshold_size = (int)(1 + (x * x * x) * (MAX_HISTO_GREEDY - 1)); int do_greedy; - if (!HistogramCombineStochastic(image_histo, threshold_size, &do_greedy)) { + if (!HistogramCombineStochastic(image_histo, &num_used, threshold_size, + &do_greedy)) { goto Error; } - if (do_greedy && !HistogramCombineGreedy(image_histo)) { - goto Error; + if (do_greedy) { + RemoveEmptyHistograms(image_histo); + if (!HistogramCombineGreedy(image_histo, &num_used)) { + goto Error; + } } } - // TODO(vrabaud): Optimize HistogramRemap for low-effort compression mode. // Find the optimal map from original histograms to the final ones. + RemoveEmptyHistograms(image_histo); HistogramRemap(orig_histo, image_histo, histogram_symbols); ok = 1; Error: VP8LFreeHistogramSet(orig_histo); + WebPSafeFree(map_tmp); return ok; } diff --git a/thirdparty/libwebp/src/enc/predictor_enc.c b/thirdparty/libwebp/src/enc/predictor_enc.c index f3715f515e..802e89693e 100644 --- a/thirdparty/libwebp/src/enc/predictor_enc.c +++ b/thirdparty/libwebp/src/enc/predictor_enc.c @@ -177,12 +177,15 @@ static uint8_t NearLosslessComponent(uint8_t value, uint8_t predict, } } +static WEBP_INLINE uint8_t NearLosslessDiff(uint8_t a, uint8_t b) { + return (uint8_t)((((int)(a) - (int)(b))) & 0xff); +} + // Quantize every component of the difference between the actual pixel value and // its prediction to a multiple of a quantization (a power of 2, not larger than // max_quantization which is a power of 2, smaller than max_diff). Take care if // value and predict have undergone subtract green, which means that red and // blue are represented as offsets from green. -#define NEAR_LOSSLESS_DIFF(a, b) (uint8_t)((((int)(a) - (int)(b))) & 0xff) static uint32_t NearLossless(uint32_t value, uint32_t predict, int max_quantization, int max_diff, int used_subtract_green) { @@ -199,7 +202,7 @@ static uint32_t NearLossless(uint32_t value, uint32_t predict, } if ((value >> 24) == 0 || (value >> 24) == 0xff) { // Preserve transparency of fully transparent or fully opaque pixels. - a = NEAR_LOSSLESS_DIFF(value >> 24, predict >> 24); + a = NearLosslessDiff(value >> 24, predict >> 24); } else { a = NearLosslessComponent(value >> 24, predict >> 24, 0xff, quantization); } @@ -212,16 +215,15 @@ static uint32_t NearLossless(uint32_t value, uint32_t predict, // The amount by which green has been adjusted during quantization. It is // subtracted from red and blue for compensation, to avoid accumulating two // quantization errors in them. - green_diff = NEAR_LOSSLESS_DIFF(new_green, value >> 8); + green_diff = NearLosslessDiff(new_green, value >> 8); } - r = NearLosslessComponent(NEAR_LOSSLESS_DIFF(value >> 16, green_diff), + r = NearLosslessComponent(NearLosslessDiff(value >> 16, green_diff), (predict >> 16) & 0xff, 0xff - new_green, quantization); - b = NearLosslessComponent(NEAR_LOSSLESS_DIFF(value, green_diff), + b = NearLosslessComponent(NearLosslessDiff(value, green_diff), predict & 0xff, 0xff - new_green, quantization); return ((uint32_t)a << 24) | ((uint32_t)r << 16) | ((uint32_t)g << 8) | b; } -#undef NEAR_LOSSLESS_DIFF #endif // (WEBP_NEAR_LOSSLESS == 1) // Stores the difference between the pixel and its prediction in "out". diff --git a/thirdparty/libwebp/src/enc/quant_enc.c b/thirdparty/libwebp/src/enc/quant_enc.c index 35bfaf21ef..03c682e3ae 100644 --- a/thirdparty/libwebp/src/enc/quant_enc.c +++ b/thirdparty/libwebp/src/enc/quant_enc.c @@ -15,6 +15,7 @@ #include <math.h> #include <stdlib.h> // for abs() +#include "src/dsp/quant.h" #include "src/enc/vp8i_enc.h" #include "src/enc/cost_enc.h" @@ -977,19 +978,6 @@ static void SwapOut(VP8EncIterator* const it) { SwapPtr(&it->yuv_out_, &it->yuv_out2_); } -static score_t IsFlat(const int16_t* levels, int num_blocks, score_t thresh) { - score_t score = 0; - while (num_blocks-- > 0) { // TODO(skal): refine positional scoring? - int i; - for (i = 1; i < 16; ++i) { // omit DC, we're only interested in AC - score += (levels[i] != 0); - if (score > thresh) return 0; - } - levels += 16; - } - return 1; -} - static void PickBestIntra16(VP8EncIterator* const it, VP8ModeScore* rd) { const int kNumBlocks = 16; VP8SegmentInfo* const dqm = &it->enc_->dqm_[it->mb_->segment_]; diff --git a/thirdparty/libwebp/src/enc/vp8i_enc.h b/thirdparty/libwebp/src/enc/vp8i_enc.h index 92439febb8..3a1967da88 100644 --- a/thirdparty/libwebp/src/enc/vp8i_enc.h +++ b/thirdparty/libwebp/src/enc/vp8i_enc.h @@ -32,7 +32,7 @@ extern "C" { // version numbers #define ENC_MAJ_VERSION 1 #define ENC_MIN_VERSION 0 -#define ENC_REV_VERSION 1 +#define ENC_REV_VERSION 2 enum { MAX_LF_LEVELS = 64, // Maximum loop filter level MAX_VARIABLE_LEVEL = 67, // last (inclusive) level with variable cost diff --git a/thirdparty/libwebp/src/enc/vp8l_enc.c b/thirdparty/libwebp/src/enc/vp8l_enc.c index 2713edcd95..2efd403f77 100644 --- a/thirdparty/libwebp/src/enc/vp8l_enc.c +++ b/thirdparty/libwebp/src/enc/vp8l_enc.c @@ -462,6 +462,7 @@ static int GetHuffBitLengthsAndCodes( for (i = 0; i < histogram_image_size; ++i) { const VP8LHistogram* const histo = histogram_image->histograms[i]; HuffmanTreeCode* const codes = &huffman_codes[5 * i]; + assert(histo != NULL); for (k = 0; k < 5; ++k) { const int num_symbols = (k == 0) ? VP8LHistogramNumCodes(histo->palette_code_bits_) : diff --git a/thirdparty/libwebp/src/mux/muxi.h b/thirdparty/libwebp/src/mux/muxi.h index df9f74c63c..3e9d8c48d8 100644 --- a/thirdparty/libwebp/src/mux/muxi.h +++ b/thirdparty/libwebp/src/mux/muxi.h @@ -29,7 +29,7 @@ extern "C" { #define MUX_MAJ_VERSION 1 #define MUX_MIN_VERSION 0 -#define MUX_REV_VERSION 1 +#define MUX_REV_VERSION 2 // Chunk object. typedef struct WebPChunk WebPChunk; diff --git a/thirdparty/libwebp/src/utils/bit_writer_utils.c b/thirdparty/libwebp/src/utils/bit_writer_utils.c index f4f476ce3f..7f83b4c8a2 100644 --- a/thirdparty/libwebp/src/utils/bit_writer_utils.c +++ b/thirdparty/libwebp/src/utils/bit_writer_utils.c @@ -248,6 +248,7 @@ int VP8LBitWriterClone(const VP8LBitWriter* const src, dst->bits_ = src->bits_; dst->used_ = src->used_; dst->error_ = src->error_; + dst->cur_ = dst->buf_ + current_size; return 1; } diff --git a/thirdparty/libwebp/src/utils/utils.h b/thirdparty/libwebp/src/utils/utils.h index da97b5d38f..c7620f91ec 100644 --- a/thirdparty/libwebp/src/utils/utils.h +++ b/thirdparty/libwebp/src/utils/utils.h @@ -107,19 +107,6 @@ static WEBP_INLINE void PutLE32(uint8_t* const data, uint32_t val) { PutLE16(data + 2, (int)(val >> 16)); } -// Returns 31 ^ clz(n) = log2(n). This is the default C-implementation, either -// based on table or not. Can be used as fallback if clz() is not available. -#define WEBP_NEED_LOG_TABLE_8BIT -extern const uint8_t WebPLogTable8bit[256]; -static WEBP_INLINE int WebPLog2FloorC(uint32_t n) { - int log_value = 0; - while (n >= 256) { - log_value += 8; - n >>= 8; - } - return log_value + WebPLogTable8bit[n]; -} - // Returns (int)floor(log2(n)). n must be > 0. // use GNU builtins where available. #if defined(__GNUC__) && \ @@ -138,6 +125,19 @@ static WEBP_INLINE int BitsLog2Floor(uint32_t n) { return first_set_bit; } #else // default: use the C-version. +// Returns 31 ^ clz(n) = log2(n). This is the default C-implementation, either +// based on table or not. Can be used as fallback if clz() is not available. +#define WEBP_NEED_LOG_TABLE_8BIT +extern const uint8_t WebPLogTable8bit[256]; +static WEBP_INLINE int WebPLog2FloorC(uint32_t n) { + int log_value = 0; + while (n >= 256) { + log_value += 8; + n >>= 8; + } + return log_value + WebPLogTable8bit[n]; +} + static WEBP_INLINE int BitsLog2Floor(uint32_t n) { return WebPLog2FloorC(n); } #endif diff --git a/thirdparty/libwebp/src/webp/decode.h b/thirdparty/libwebp/src/webp/decode.h index 95d31e7619..ae8bfe840e 100644 --- a/thirdparty/libwebp/src/webp/decode.h +++ b/thirdparty/libwebp/src/webp/decode.h @@ -42,6 +42,12 @@ WEBP_EXTERN int WebPGetDecoderVersion(void); // This function will also validate the header, returning true on success, // false otherwise. '*width' and '*height' are only valid on successful return. // Pointers 'width' and 'height' can be passed NULL if deemed irrelevant. +// Note: The following chunk sequences (before the raw VP8/VP8L data) are +// considered valid by this function: +// RIFF + VP8(L) +// RIFF + VP8X + (optional chunks) + VP8(L) +// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose. +// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose. WEBP_EXTERN int WebPGetInfo(const uint8_t* data, size_t data_size, int* width, int* height); @@ -425,6 +431,12 @@ WEBP_EXTERN VP8StatusCode WebPGetFeaturesInternal( // Returns VP8_STATUS_OK when the features are successfully retrieved. Returns // VP8_STATUS_NOT_ENOUGH_DATA when more data is needed to retrieve the // features from headers. Returns error in other cases. +// Note: The following chunk sequences (before the raw VP8/VP8L data) are +// considered valid by this function: +// RIFF + VP8(L) +// RIFF + VP8X + (optional chunks) + VP8(L) +// ALPH + VP8 <-- Not a valid WebP format: only allowed for internal purpose. +// VP8(L) <-- Not a valid WebP format: only allowed for internal purpose. static WEBP_INLINE VP8StatusCode WebPGetFeatures( const uint8_t* data, size_t data_size, WebPBitstreamFeatures* features) { diff --git a/thirdparty/misc/stb_truetype.h b/thirdparty/misc/stb_truetype.h index e2efae2285..72299ea86d 100644 --- a/thirdparty/misc/stb_truetype.h +++ b/thirdparty/misc/stb_truetype.h @@ -1,4 +1,4 @@ -// stb_truetype.h - v1.19 - public domain +// stb_truetype.h - v1.21 - public domain // authored from 2009-2016 by Sean Barrett / RAD Game Tools // // This library processes TrueType files: @@ -49,6 +49,8 @@ // // VERSION HISTORY // +// 1.21 (2019-02-25) fix warning +// 1.20 (2019-02-07) PackFontRange skips missing codepoints; GetScaleFontVMetrics() // 1.19 (2018-02-11) GPOS kerning, STBTT_fmod // 1.18 (2018-01-29) add missing function // 1.17 (2017-07-23) make more arguments const; doc fix @@ -75,7 +77,7 @@ // // USAGE // -// Include this file in whatever places neeed to refer to it. In ONE C/C++ +// Include this file in whatever places need to refer to it. In ONE C/C++ // file, write: // #define STB_TRUETYPE_IMPLEMENTATION // before the #include of this file. This expands out the actual @@ -242,19 +244,6 @@ // recommend it. // // -// SOURCE STATISTICS (based on v0.6c, 2050 LOC) -// -// Documentation & header file 520 LOC \___ 660 LOC documentation -// Sample code 140 LOC / -// Truetype parsing 620 LOC ---- 620 LOC TrueType -// Software rasterization 240 LOC \ . -// Curve tesselation 120 LOC \__ 550 LOC Bitmap creation -// Bitmap management 100 LOC / -// Baked bitmap interface 70 LOC / -// Font name matching & access 150 LOC ---- 150 -// C runtime library abstraction 60 LOC ---- 60 -// -// // PERFORMANCE MEASUREMENTS FOR 1.06: // // 32-bit 64-bit @@ -556,6 +545,8 @@ STBTT_DEF void stbtt_GetBakedQuad(const stbtt_bakedchar *chardata, int pw, int p // // It's inefficient; you might want to c&p it and optimize it. +STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap); +// Query the font vertical metrics without having to create a font first. ////////////////////////////////////////////////////////////////////////////// @@ -641,6 +632,12 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h // To use with PackFontRangesGather etc., you must set it before calls // call to PackFontRangesGatherRects. +STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip); +// If skip != 0, this tells stb_truetype to skip any codepoints for which +// there is no corresponding glyph. If skip=0, which is the default, then +// codepoints without a glyph recived the font's "missing character" glyph, +// typically an empty box by convention. + STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, // same data as above int char_index, // character to display float *xpos, float *ypos, // pointers to current position in screen pixel space @@ -669,6 +666,7 @@ struct stbtt_pack_context { int height; int stride_in_bytes; int padding; + int skip_missing; unsigned int h_oversample, v_oversample; unsigned char *pixels; void *nodes; @@ -694,7 +692,7 @@ STBTT_DEF int stbtt_GetFontOffsetForIndex(const unsigned char *data, int index); // file will only define one font and it always be at offset 0, so it will // return '0' for index 0, and -1 for all other indices. -// The following structure is defined publically so you can declare one on +// The following structure is defined publicly so you can declare one on // the stack or as a global or etc, but you should treat it as opaque. struct stbtt_fontinfo { @@ -733,6 +731,7 @@ STBTT_DEF int stbtt_FindGlyphIndex(const stbtt_fontinfo *info, int unicode_codep // and you want a speed-up, call this function with the character you're // going to process, then use glyph-based functions instead of the // codepoint-based functions. +// Returns 0 if the character codepoint is not defined in the font. ////////////////////////////////////////////////////////////////////////////// @@ -820,7 +819,7 @@ STBTT_DEF int stbtt_GetGlyphShape(const stbtt_fontinfo *info, int glyph_index, s // returns # of vertices and fills *vertices with the pointer to them // these are expressed in "unscaled" coordinates // -// The shape is a series of countours. Each one starts with +// The shape is a series of contours. Each one starts with // a STBTT_moveto, then consists of a series of mixed // STBTT_lineto and STBTT_curveto segments. A lineto // draws a line from previous endpoint to its x,y; a curveto @@ -916,7 +915,7 @@ STBTT_DEF unsigned char * stbtt_GetGlyphSDF(const stbtt_fontinfo *info, float sc STBTT_DEF unsigned char * stbtt_GetCodepointSDF(const stbtt_fontinfo *info, float scale, int codepoint, int padding, unsigned char onedge_value, float pixel_dist_scale, int *width, int *height, int *xoff, int *yoff); // These functions compute a discretized SDF field for a single character, suitable for storing // in a single-channel texture, sampling with bilinear filtering, and testing against -// larger than some threshhold to produce scalable fonts. +// larger than some threshold to produce scalable fonts. // info -- the font // scale -- controls the size of the resulting SDF bitmap, same as it would be creating a regular bitmap // glyph/codepoint -- the character to generate the SDF for @@ -2463,6 +2462,7 @@ static stbtt_int32 stbtt__GetGlyphGPOSInfoAdvance(const stbtt_fontinfo *info, i if (valueFormat2 != 0) return 0; STBTT_assert(coverageIndex < pairSetCount); + STBTT__NOTUSED(pairSetCount); needle=glyph2; r=pairValueCount-1; @@ -3160,7 +3160,13 @@ static void stbtt__rasterize_sorted_edges(stbtt__bitmap *result, stbtt__edge *e, if (e->y0 != e->y1) { stbtt__active_edge *z = stbtt__new_active(&hh, e, off_x, scan_y_top, userdata); if (z != NULL) { - STBTT_assert(z->ey >= scan_y_top); + if (j == 0 && off_y != 0) { + if (z->ey < scan_y_top) { + // this can happen due to subpixel positioning and some kind of fp rounding error i think + z->ey = scan_y_top; + } + } + STBTT_assert(z->ey >= scan_y_top); // if we get really unlucky a tiny bit of an edge can be out of bounds // insert at front z->next = active; active = z; @@ -3229,7 +3235,7 @@ static void stbtt__sort_edges_ins_sort(stbtt__edge *p, int n) static void stbtt__sort_edges_quicksort(stbtt__edge *p, int n) { - /* threshhold for transitioning to insertion sort */ + /* threshold for transitioning to insertion sort */ while (n > 12) { stbtt__edge t; int c01,c12,c,m,i,j; @@ -3364,7 +3370,7 @@ static void stbtt__add_point(stbtt__point *points, int n, float x, float y) points[n].y = y; } -// tesselate until threshhold p is happy... @TODO warped to compensate for non-linear stretching +// tessellate until threshold p is happy... @TODO warped to compensate for non-linear stretching static int stbtt__tesselate_curve(stbtt__point *points, int *num_points, float x0, float y0, float x1, float y1, float x2, float y2, float objspace_flatness_squared, int n) { // midpoint @@ -3789,6 +3795,7 @@ STBTT_DEF int stbtt_PackBegin(stbtt_pack_context *spc, unsigned char *pixels, in spc->stride_in_bytes = stride_in_bytes != 0 ? stride_in_bytes : pw; spc->h_oversample = 1; spc->v_oversample = 1; + spc->skip_missing = 0; stbrp_init_target(context, pw-padding, ph-padding, nodes, num_nodes); @@ -3814,6 +3821,11 @@ STBTT_DEF void stbtt_PackSetOversampling(stbtt_pack_context *spc, unsigned int h spc->v_oversample = v_oversample; } +STBTT_DEF void stbtt_PackSetSkipMissingCodepoints(stbtt_pack_context *spc, int skip) +{ + spc->skip_missing = skip; +} + #define STBTT__OVER_MASK (STBTT_MAX_OVERSAMPLE-1) static void stbtt__h_prefilter(unsigned char *pixels, int w, int h, int stride_in_bytes, unsigned int kernel_width) @@ -3967,13 +3979,17 @@ STBTT_DEF int stbtt_PackFontRangesGatherRects(stbtt_pack_context *spc, const stb int x0,y0,x1,y1; int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j]; int glyph = stbtt_FindGlyphIndex(info, codepoint); - stbtt_GetGlyphBitmapBoxSubpixel(info,glyph, - scale * spc->h_oversample, - scale * spc->v_oversample, - 0,0, - &x0,&y0,&x1,&y1); - rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1); - rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1); + if (glyph == 0 && spc->skip_missing) { + rects[k].w = rects[k].h = 0; + } else { + stbtt_GetGlyphBitmapBoxSubpixel(info,glyph, + scale * spc->h_oversample, + scale * spc->v_oversample, + 0,0, + &x0,&y0,&x1,&y1); + rects[k].w = (stbrp_coord) (x1-x0 + spc->padding + spc->h_oversample-1); + rects[k].h = (stbrp_coord) (y1-y0 + spc->padding + spc->v_oversample-1); + } ++k; } } @@ -4026,7 +4042,7 @@ STBTT_DEF int stbtt_PackFontRangesRenderIntoRects(stbtt_pack_context *spc, const sub_y = stbtt__oversample_shift(spc->v_oversample); for (j=0; j < ranges[i].num_chars; ++j) { stbrp_rect *r = &rects[k]; - if (r->was_packed) { + if (r->was_packed && r->w != 0 && r->h != 0) { stbtt_packedchar *bc = &ranges[i].chardata_for_range[j]; int advance, lsb, x0,y0,x1,y1; int codepoint = ranges[i].array_of_unicode_codepoints == NULL ? ranges[i].first_unicode_codepoint_in_range + j : ranges[i].array_of_unicode_codepoints[j]; @@ -4140,6 +4156,19 @@ STBTT_DEF int stbtt_PackFontRange(stbtt_pack_context *spc, const unsigned char * return stbtt_PackFontRanges(spc, fontdata, font_index, &range, 1); } +STBTT_DEF void stbtt_GetScaledFontVMetrics(const unsigned char *fontdata, int index, float size, float *ascent, float *descent, float *lineGap) +{ + int i_ascent, i_descent, i_lineGap; + float scale; + stbtt_fontinfo info; + stbtt_InitFont(&info, fontdata, stbtt_GetFontOffsetForIndex(fontdata, index)); + scale = size > 0 ? stbtt_ScaleForPixelHeight(&info, size) : stbtt_ScaleForMappingEmToPixels(&info, -size); + stbtt_GetFontVMetrics(&info, &i_ascent, &i_descent, &i_lineGap); + *ascent = (float) i_ascent * scale; + *descent = (float) i_descent * scale; + *lineGap = (float) i_lineGap * scale; +} + STBTT_DEF void stbtt_GetPackedQuad(const stbtt_packedchar *chardata, int pw, int ph, int char_index, float *xpos, float *ypos, stbtt_aligned_quad *q, int align_to_integer) { float ipw = 1.0f / pw, iph = 1.0f / ph; diff --git a/thirdparty/misc/stb_vorbis.c b/thirdparty/misc/stb_vorbis.c index 8edcf0f38a..88276026ef 100644 --- a/thirdparty/misc/stb_vorbis.c +++ b/thirdparty/misc/stb_vorbis.c @@ -1,4 +1,4 @@ -// Ogg Vorbis audio decoder - v1.14 - public domain +// Ogg Vorbis audio decoder - v1.15 - public domain // http://nothings.org/stb_vorbis/ // // Original version written by Sean Barrett in 2007. @@ -33,6 +33,7 @@ // Timur Gagiev // // Partial history: +// 1.15 - 2019-02-07 - explicit failure if Ogg Skeleton data is found // 1.14 - 2018-02-11 - delete bogus dealloca usage // 1.13 - 2018-01-29 - fix truncation of last frame (hopefully) // 1.12 - 2017-11-21 - limit residue begin/end to blocksize/2 to avoid large temp allocs in bad/corrupt files @@ -253,7 +254,7 @@ extern stb_vorbis * stb_vorbis_open_file(FILE *f, int close_handle_on_close, // create an ogg vorbis decoder from an open FILE *, looking for a stream at // the _current_ seek point (ftell). on failure, returns NULL and sets *error. // note that stb_vorbis must "own" this stream; if you seek it in between -// calls to stb_vorbis, it will become confused. Morever, if you attempt to +// calls to stb_vorbis, it will become confused. Moreover, if you attempt to // perform stb_vorbis_seek_*() operations on this file, it will assume it // owns the _entire_ rest of the file after the start point. Use the next // function, stb_vorbis_open_file_section(), to limit it. @@ -374,7 +375,8 @@ enum STBVorbisError VORBIS_invalid_first_page, VORBIS_bad_packet_type, VORBIS_cant_find_last_page, - VORBIS_seek_failed + VORBIS_seek_failed, + VORBIS_ogg_skeleton_not_supported }; @@ -1073,7 +1075,7 @@ static int compute_codewords(Codebook *c, uint8 *len, int n, uint32 *values) assert(z >= 0 && z < 32); available[z] = 0; add_entry(c, bit_reverse(res), i, m++, len[i], values); - // propogate availability up the tree + // propagate availability up the tree if (z != len[i]) { assert(len[i] >= 0 && len[i] < 32); for (y=len[i]; y > z; --y) { @@ -2637,7 +2639,7 @@ static void inverse_mdct(float *buffer, int n, vorb *f, int blocktype) // once I combined the passes. // so there's a missing 'times 2' here (for adding X to itself). - // this propogates through linearly to the end, where the numbers + // this propagates through linearly to the end, where the numbers // are 1/2 too small, and need to be compensated for. { @@ -3578,7 +3580,22 @@ static int start_decoder(vorb *f) if (f->page_flag & PAGEFLAG_continued_packet) return error(f, VORBIS_invalid_first_page); // check for expected packet length if (f->segment_count != 1) return error(f, VORBIS_invalid_first_page); - if (f->segments[0] != 30) return error(f, VORBIS_invalid_first_page); + if (f->segments[0] != 30) { + // check for the Ogg skeleton fishead identifying header to refine our error + if (f->segments[0] == 64 && + getn(f, header, 6) && + header[0] == 'f' && + header[1] == 'i' && + header[2] == 's' && + header[3] == 'h' && + header[4] == 'e' && + header[5] == 'a' && + get8(f) == 'd' && + get8(f) == '\0') return error(f, VORBIS_ogg_skeleton_not_supported); + else + return error(f, VORBIS_invalid_first_page); + } + // read packet // check packet header if (get8(f) != VORBIS_packet_id) return error(f, VORBIS_invalid_first_page); @@ -4566,7 +4583,7 @@ static int get_seek_page_info(stb_vorbis *f, ProbedPage *z) return 1; } -// rarely used function to seek back to the preceeding page while finding the +// rarely used function to seek back to the preceding page while finding the // start of a packet static int go_to_page_before(stb_vorbis *f, unsigned int limit_offset) { diff --git a/thirdparty/nanosvg/nanosvg.h b/thirdparty/nanosvg/nanosvg.h index 2321c56fd2..8c8b061cd1 100644 --- a/thirdparty/nanosvg/nanosvg.h +++ b/thirdparty/nanosvg/nanosvg.h @@ -29,9 +29,11 @@ #ifndef NANOSVG_H #define NANOSVG_H +#ifndef NANOSVG_CPLUSPLUS #ifdef __cplusplus extern "C" { #endif +#endif // NanoSVG is a simple stupid single-header-file SVG parse. The output of the parser is a list of cubic bezier shapes. // @@ -45,15 +47,15 @@ extern "C" { // NanoSVG can return the paths in few different units. For example if you want to render an image, you may choose // to get the paths in pixels, or if you are feeding the data into a CNC-cutter, you may want to use millimeters. // -// The units passed to NanoVG should be one of: 'px', 'pt', 'pc' 'mm', 'cm', or 'in'. +// The units passed to NanoSVG should be one of: 'px', 'pt', 'pc' 'mm', 'cm', or 'in'. // DPI (dots-per-inch) controls how the unit conversion is done. // // If you don't know or care about the units stuff, "px" and 96 should get you going. /* Example Usage: - // Load - NSVGImage* image; + // Load SVG + NSVGimage* image; image = nsvgParseFromFile("test.svg", "px", 96); printf("size: %f x %f\n", image->width, image->height); // Use... @@ -167,12 +169,17 @@ NSVGimage* nsvgParseFromFile(const char* filename, const char* units, float dpi) // Important note: changes the string. NSVGimage* nsvgParse(char* input, const char* units, float dpi); -// Deletes list of paths. +// Duplicates a path. +NSVGpath* nsvgDuplicatePath(NSVGpath* p); + +// Deletes an image. void nsvgDelete(NSVGimage* image); +#ifndef NANOSVG_CPLUSPLUS #ifdef __cplusplus } #endif +#endif #endif // NANOSVG_H @@ -1415,8 +1422,7 @@ static unsigned int nsvg__parseColor(const char* str) static float nsvg__parseOpacity(const char* str) { - float val = 0; - sscanf(str, "%f", &val); + float val = nsvg__atof(str); if (val < 0.0f) val = 0.0f; if (val > 1.0f) val = 1.0f; return val; @@ -1424,8 +1430,7 @@ static float nsvg__parseOpacity(const char* str) static float nsvg__parseMiterLimit(const char* str) { - float val = 0; - sscanf(str, "%f", &val); + float val = nsvg__atof(str); if (val < 0.0f) val = 0.0f; return val; } @@ -1456,9 +1461,9 @@ static int nsvg__parseUnits(const char* units) static NSVGcoordinate nsvg__parseCoordinateRaw(const char* str) { NSVGcoordinate coord = {0, NSVG_UNITS_USER}; - char units[32]=""; - sscanf(str, "%f%31s", &coord.value, units); - coord.units = nsvg__parseUnits(units); + char buf[64]; + coord.units = nsvg__parseUnits(nsvg__parseNumber(str, buf, 64)); + coord.value = nsvg__atof(buf); return coord; } @@ -1650,7 +1655,7 @@ static char nsvg__parseLineJoin(const char* str) else if (strcmp(str, "bevel") == 0) return NSVG_JOIN_BEVEL; // TODO: handle inherit. - return NSVG_CAP_BUTT; + return NSVG_JOIN_MITER; } static char nsvg__parseFillRule(const char* str) @@ -2494,11 +2499,26 @@ static void nsvg__parseSVG(NSVGparser* p, const char** attr) for (i = 0; attr[i]; i += 2) { if (!nsvg__parseAttr(p, attr[i], attr[i + 1])) { if (strcmp(attr[i], "width") == 0) { - p->image->width = nsvg__parseCoordinate(p, attr[i + 1], 0.0f, 1.0f); + p->image->width = nsvg__parseCoordinate(p, attr[i + 1], 0.0f, 0.0f); } else if (strcmp(attr[i], "height") == 0) { - p->image->height = nsvg__parseCoordinate(p, attr[i + 1], 0.0f, 1.0f); + p->image->height = nsvg__parseCoordinate(p, attr[i + 1], 0.0f, 0.0f); } else if (strcmp(attr[i], "viewBox") == 0) { - sscanf(attr[i + 1], "%f%*[%%, \t]%f%*[%%, \t]%f%*[%%, \t]%f", &p->viewMinx, &p->viewMiny, &p->viewWidth, &p->viewHeight); + const char *s = attr[i + 1]; + char buf[64]; + s = nsvg__parseNumber(s, buf, 64); + p->viewMinx = nsvg__atof(buf); + while (*s && (nsvg__isspace(*s) || *s == '%' || *s == ',')) s++; + if (!*s) return; + s = nsvg__parseNumber(s, buf, 64); + p->viewMiny = nsvg__atof(buf); + while (*s && (nsvg__isspace(*s) || *s == '%' || *s == ',')) s++; + if (!*s) return; + s = nsvg__parseNumber(s, buf, 64); + p->viewWidth = nsvg__atof(buf); + while (*s && (nsvg__isspace(*s) || *s == '%' || *s == ',')) s++; + if (!*s) return; + s = nsvg__parseNumber(s, buf, 64); + p->viewHeight = nsvg__atof(buf); } else if (strcmp(attr[i], "preserveAspectRatio") == 0) { if (strstr(attr[i + 1], "none") != 0) { // No uniform scaling @@ -2906,6 +2926,36 @@ error: return NULL; } +NSVGpath* nsvgDuplicatePath(NSVGpath* p) +{ + NSVGpath* res = NULL; + + if (p == NULL) + return NULL; + + res = (NSVGpath*)malloc(sizeof(NSVGpath)); + if (res == NULL) goto error; + memset(res, 0, sizeof(NSVGpath)); + + res->pts = (float*)malloc(p->npts*2*sizeof(float)); + if (res->pts == NULL) goto error; + memcpy(res->pts, p->pts, p->npts * sizeof(float) * 2); + res->npts = p->npts; + + memcpy(res->bounds, p->bounds, sizeof(p->bounds)); + + res->closed = p->closed; + + return res; + +error: + if (res != NULL) { + free(res->pts); + free(res); + } + return NULL; +} + void nsvgDelete(NSVGimage* image) { NSVGshape *snext, *shape; diff --git a/thirdparty/nanosvg/nanosvgrast.h b/thirdparty/nanosvg/nanosvgrast.h index 2940c1f916..b740c316ca 100644 --- a/thirdparty/nanosvg/nanosvgrast.h +++ b/thirdparty/nanosvg/nanosvgrast.h @@ -25,15 +25,18 @@ #ifndef NANOSVGRAST_H #define NANOSVGRAST_H +#ifndef NANOSVGRAST_CPLUSPLUS #ifdef __cplusplus extern "C" { #endif +#endif typedef struct NSVGrasterizer NSVGrasterizer; /* Example Usage: // Load SVG - struct SNVGImage* image = nsvgParseFromFile("test.svg."); + NSVGimage* image; + image = nsvgParseFromFile("test.svg", "px", 96); // Create rasterizer (can be used to render multiple images). struct NSVGrasterizer* rast = nsvgCreateRasterizer(); @@ -63,9 +66,11 @@ void nsvgRasterize(NSVGrasterizer* r, void nsvgDeleteRasterizer(NSVGrasterizer*); +#ifndef NANOSVGRAST_CPLUSPLUS #ifdef __cplusplus } #endif +#endif #endif // NANOSVGRAST_H diff --git a/thirdparty/pcre2/LICENCE b/thirdparty/pcre2/LICENCE index bfe3c8d528..b0f8804fff 100644 --- a/thirdparty/pcre2/LICENCE +++ b/thirdparty/pcre2/LICENCE @@ -4,11 +4,11 @@ PCRE2 LICENCE PCRE2 is a library of functions to support regular expressions whose syntax and semantics are as close as possible to those of the Perl 5 language. -Release 10 of PCRE2 is distributed under the terms of the "BSD" licence, as -specified below, with one exemption for certain binary redistributions. The -documentation for PCRE2, supplied in the "doc" directory, is distributed under -the same terms as the software itself. The data in the testdata directory is -not copyrighted and is in the public domain. +Releases 10.00 and above of PCRE2 are distributed under the terms of the "BSD" +licence, as specified below, with one exemption for certain binary +redistributions. The documentation for PCRE2, supplied in the "doc" directory, +is distributed under the same terms as the software itself. The data in the +testdata directory is not copyrighted and is in the public domain. The basic library functions are written in C and are freestanding. Also included in the distribution is a just-in-time compiler that can be used to @@ -35,7 +35,7 @@ PCRE2 JUST-IN-TIME COMPILATION SUPPORT Written by: Zoltan Herczeg Email local part: hzmester -Emain domain: freemail.hu +Email domain: freemail.hu Copyright(c) 2010-2018 Zoltan Herczeg All rights reserved. @@ -46,7 +46,7 @@ STACK-LESS JUST-IN-TIME COMPILER Written by: Zoltan Herczeg Email local part: hzmester -Emain domain: freemail.hu +Email domain: freemail.hu Copyright(c) 2009-2018 Zoltan Herczeg All rights reserved. diff --git a/thirdparty/pcre2/src/config.h b/thirdparty/pcre2/src/config.h index f738616714..89a52ef848 100644 --- a/thirdparty/pcre2/src/config.h +++ b/thirdparty/pcre2/src/config.h @@ -18,10 +18,10 @@ to set the macro values. In this case, you do not have to set -DHAVE_CONFIG_H, but if you do, default values will be taken from config.h for non-boolean macros that are not defined on the command line. -Boolean macros such as HAVE_STDLIB_H and SUPPORT_PCRE2_8 should either be defined -(conventionally to 1) for TRUE, and not defined at all for FALSE. All such -macros are listed as a commented #undef in config.h.generic. Macros such as -MATCH_LIMIT, whose actual value is relevant, have defaults defined, but are +Boolean macros such as HAVE_STDLIB_H and SUPPORT_PCRE2_8 should either be +defined (conventionally to 1) for TRUE, and not defined at all for FALSE. All +such macros are listed as a commented #undef in config.h.generic. Macros such +as MATCH_LIMIT, whose actual value is relevant, have defaults defined, but are surrounded by #ifndef/#endif lines so that the value can be overridden by -D. PCRE2 uses memmove() if HAVE_MEMMOVE is defined; otherwise it uses bcopy() if @@ -132,17 +132,18 @@ sure both macros are undefined; an emulation function will then be used. */ /* Define to 1 if you have the <zlib.h> header file. */ /* #undef HAVE_ZLIB_H */ -/* This limits the amount of memory that pcre2_match() may use while matching - a pattern. The value is in kilobytes. */ +/* This limits the amount of memory that may be used while matching a pattern. + It applies to both pcre2_match() and pcre2_dfa_match(). It does not apply + to JIT matching. The value is in kibibytes (units of 1024 bytes). */ #ifndef HEAP_LIMIT #define HEAP_LIMIT 20000000 #endif /* The value of LINK_SIZE determines the number of bytes used to store links as offsets within the compiled regex. The default is 2, which allows for - compiled patterns up to 64K long. This covers the vast majority of cases. - However, PCRE2 can also be compiled to use 3 or 4 bytes instead. This - allows for longer patterns in extreme cases. */ + compiled patterns up to 65535 code units long. This covers the vast + majority of cases. However, PCRE2 can also be compiled to use 3 or 4 bytes + instead. This allows for longer patterns in extreme cases. */ #ifndef LINK_SIZE #define LINK_SIZE 2 #endif @@ -155,7 +156,8 @@ sure both macros are undefined; an emulation function will then be used. */ /* The value of MATCH_LIMIT determines the default number of times the pcre2_match() function can record a backtrack position during a single - matching attempt. There is a runtime interface for setting a different + matching attempt. The value is also used to limit a loop counter in + pcre2_dfa_match(). There is a runtime interface for setting a different limit. The limit exists in order to catch runaway regular expressions that take for ever to determine that they do not match. The default is set very large so that it does not accidentally catch legitimate cases. */ @@ -170,7 +172,9 @@ sure both macros are undefined; an emulation function will then be used. */ MATCH_LIMIT_DEPTH provides this facility. To have any useful effect, it must be less than the value of MATCH_LIMIT. The default is to use the same value as MATCH_LIMIT. There is a runtime method for setting a different - limit. */ + limit. In the case of pcre2_dfa_match(), this limit controls the depth of + the internal nested function calls that are used for pattern recursions, + lookarounds, and atomic groups. */ #ifndef MATCH_LIMIT_DEPTH #define MATCH_LIMIT_DEPTH MATCH_LIMIT #endif @@ -210,7 +214,7 @@ sure both macros are undefined; an emulation function will then be used. */ #define PACKAGE_NAME "PCRE2" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "PCRE2 10.31" +#define PACKAGE_STRING "PCRE2 10.32" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "pcre2" @@ -219,7 +223,7 @@ sure both macros are undefined; an emulation function will then be used. */ #define PACKAGE_URL "" /* Define to the version of this package. */ -#define PACKAGE_VERSION "10.31" +#define PACKAGE_VERSION "10.32" /* The value of PARENS_NEST_LIMIT specifies the maximum depth of nested parentheses (of any kind) in a pattern. This limits the amount of system @@ -339,7 +343,7 @@ sure both macros are undefined; an emulation function will then be used. */ #endif /* Version number of package */ -#define VERSION "10.31" +#define VERSION "10.32" /* Define to 1 if on MINIX. */ /* #undef _MINIX */ diff --git a/thirdparty/pcre2/src/pcre2.h b/thirdparty/pcre2/src/pcre2.h index fffcc307d0..3d2feb7a6b 100644 --- a/thirdparty/pcre2/src/pcre2.h +++ b/thirdparty/pcre2/src/pcre2.h @@ -5,7 +5,7 @@ /* This is the public header file for the PCRE library, second API, to be #included by applications that call PCRE2 functions. - Copyright (c) 2016-2017 University of Cambridge + Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -41,10 +41,16 @@ POSSIBILITY OF SUCH DAMAGE. /* The current PCRE version information. */ -#define PCRE2_MAJOR 10 -#define PCRE2_MINOR 31 -#define PCRE2_PRERELEASE -#define PCRE2_DATE 2018-02-12 +#define PCRE2_MAJOR 10 +#define PCRE2_MINOR 32 +#define PCRE2_PRERELEASE +#define PCRE2_DATE 2018-09-10 + +/* For the benefit of systems without stdint.h, an alternative is to use +inttypes.h. The existence of these headers is checked by configure or CMake. */ + +#define PCRE2_HAVE_STDINT_H 1 +#define PCRE2_HAVE_INTTYPES_H 1 /* When an application links to a PCRE DLL in Windows, the symbols that are imported have to be identified as such. When building PCRE2, the appropriate @@ -81,12 +87,18 @@ set, we ensure here that it has no effect. */ #define PCRE2_CALL_CONVENTION #endif -/* Have to include limits.h, stdlib.h and stdint.h to ensure that size_t and -uint8_t, UCHAR_MAX, etc are defined. */ +/* Have to include limits.h, stdlib.h and stdint.h (or inttypes.h) to ensure +that size_t and uint8_t, UCHAR_MAX, etc are defined. If the system has neither +header, the relevant values must be provided by some other means. */ #include <limits.h> #include <stdlib.h> + +#if PCRE2_HAVE_STDINT_H #include <stdint.h> +#elif PCRE2_HAVE_INTTYPES_H +#include <inttypes.h> +#endif /* Allow for C++ users compiling this directly. */ @@ -269,6 +281,7 @@ pcre2_pattern_convert(). */ #define PCRE2_ERROR_INTERNAL_UNKNOWN_NEWLINE 156 #define PCRE2_ERROR_BACKSLASH_G_SYNTAX 157 #define PCRE2_ERROR_PARENS_QUERY_R_MISSING_CLOSING 158 +/* Error 159 is obsolete and should now never occur */ #define PCRE2_ERROR_VERB_ARGUMENT_NOT_ALLOWED 159 #define PCRE2_ERROR_VERB_UNKNOWN 160 #define PCRE2_ERROR_SUBPATTERN_NUMBER_TOO_BIG 161 @@ -303,6 +316,8 @@ pcre2_pattern_convert(). */ #define PCRE2_ERROR_INTERNAL_BAD_CODE_IN_SKIP 190 #define PCRE2_ERROR_NO_SURROGATES_IN_UTF16 191 #define PCRE2_ERROR_BAD_LITERAL_OPTIONS 192 +#define PCRE2_ERROR_SUPPORTED_ONLY_IN_UNICODE 193 +#define PCRE2_ERROR_INVALID_HYPHEN_IN_OPTIONS 194 /* "Expected" matching error codes: no match and partial match. */ @@ -387,6 +402,7 @@ released, the numbers must not be changed. */ #define PCRE2_ERROR_BADSERIALIZEDDATA (-62) #define PCRE2_ERROR_HEAPLIMIT (-63) #define PCRE2_ERROR_CONVERT_SYNTAX (-64) +#define PCRE2_ERROR_INTERNAL_DUPMATCH (-65) /* Request types for pcre2_pattern_info() */ diff --git a/thirdparty/pcre2/src/pcre2_auto_possess.c b/thirdparty/pcre2/src/pcre2_auto_possess.c index 23275a2e39..2ce152e952 100644 --- a/thirdparty/pcre2/src/pcre2_auto_possess.c +++ b/thirdparty/pcre2/src/pcre2_auto_possess.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -505,7 +505,7 @@ Arguments: utf TRUE in UTF mode cb compile data block base_list the data list of the base opcode - base_end the end of the data list + base_end the end of the base opcode rec_limit points to recursion depth counter Returns: TRUE if the auto-possessification is possible @@ -730,7 +730,7 @@ for(;;) if ((*xclass_flags & XCL_MAP) == 0) { /* No bits are set for characters < 256. */ - if (list[1] == 0) return TRUE; + if (list[1] == 0) return (*xclass_flags & XCL_NOT) == 0; /* Might be an empty repeat. */ continue; } @@ -1235,6 +1235,7 @@ for (;;) #endif case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: diff --git a/thirdparty/pcre2/src/pcre2_chartables.c b/thirdparty/pcre2/src/pcre2_chartables.c index 203cb1a4ab..4046500c00 100644 --- a/thirdparty/pcre2/src/pcre2_chartables.c +++ b/thirdparty/pcre2/src/pcre2_chartables.c @@ -2,23 +2,24 @@ * Perl-Compatible Regular Expressions * *************************************************/ -/* This file contains character tables that are used when no external tables -are passed to PCRE2 by the application that calls it. The tables are used only -for characters whose code values are less than 256. - -This is a default version of the tables that assumes ASCII encoding. A program -called dftables (which is distributed with PCRE2) can be used to build -alternative versions of this file. This is necessary if you are running in an -EBCDIC environment, or if you want to default to a different encoding, for -example ISO-8859-1. When dftables is run, it creates these tables in the -current locale. If PCRE2 is configured with --enable-rebuild-chartables, this -happens automatically. - -The following #includes are present because without them gcc 4.x may remove the -array definition from the final binary if PCRE2 is built into a static library -and dead code stripping is activated. This leads to link errors. Pulling in the -header ensures that the array gets flagged as "someone outside this compilation -unit might reference this" and so it will always be supplied to the linker. */ +/* This file was automatically written by the dftables auxiliary +program. It contains character tables that are used when no external +tables are passed to PCRE2 by the application that calls it. The tables +are used only for characters whose code values are less than 256. */ + +/*The dftables program (which is distributed with PCRE2) can be used to +build alternative versions of this file. This is necessary if you are +running in an EBCDIC environment, or if you want to default to a different +encoding, for example ISO-8859-1. When dftables is run, it creates these +tables in the current locale. This happens automatically if PCRE2 is +configured with --enable-rebuild-chartables. */ + +/* The following #include is present because without it gcc 4.x may remove +the array definition from the final binary if PCRE2 is built into a static +library and dead code stripping is activated. This leads to link errors. +Pulling in the header ensures that the array gets flagged as "someone +outside this compilation unit might reference this" and so it will always +be supplied to the linker. */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -101,7 +102,7 @@ const uint8_t PRIV(default_tables)[] = { /* This table contains bit maps for various character classes. Each map is 32 bytes long and the bits run from the least significant end of each byte. The classes that have their own maps are: space, xdigit, digit, upper, lower, word, -graph, print, punct, and cntrl. Other classes are built from combinations. */ +graph print, punct, and cntrl. Other classes are built from combinations. */ 0x00,0x3e,0x00,0x00,0x01,0x00,0x00,0x00, 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, @@ -159,25 +160,24 @@ graph, print, punct, and cntrl. Other classes are built from combinations. */ 0x04 decimal digit 0x08 hexadecimal digit 0x10 alphanumeric or '_' - 0x80 regular expression metacharacter or binary zero */ - 0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0- 7 */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 0- 7 */ 0x00,0x01,0x01,0x01,0x01,0x01,0x00,0x00, /* 8- 15 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 16- 23 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 24- 31 */ - 0x01,0x00,0x00,0x00,0x80,0x00,0x00,0x00, /* - ' */ - 0x80,0x80,0x80,0x80,0x00,0x00,0x80,0x00, /* ( - / */ + 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* - ' */ + 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* ( - / */ 0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c,0x1c, /* 0 - 7 */ - 0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x80, /* 8 - ? */ + 0x1c,0x1c,0x00,0x00,0x00,0x00,0x00,0x00, /* 8 - ? */ 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* @ - G */ 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* H - O */ 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* P - W */ - 0x12,0x12,0x12,0x80,0x80,0x00,0x80,0x10, /* X - _ */ + 0x12,0x12,0x12,0x00,0x00,0x00,0x00,0x10, /* X - _ */ 0x00,0x1a,0x1a,0x1a,0x1a,0x1a,0x1a,0x12, /* ` - g */ 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* h - o */ 0x12,0x12,0x12,0x12,0x12,0x12,0x12,0x12, /* p - w */ - 0x12,0x12,0x12,0x80,0x80,0x00,0x00,0x00, /* x -127 */ + 0x12,0x12,0x12,0x00,0x00,0x00,0x00,0x00, /* x -127 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 128-135 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 136-143 */ 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, /* 144-151 */ diff --git a/thirdparty/pcre2/src/pcre2_compile.c b/thirdparty/pcre2/src/pcre2_compile.c index 87530fb584..6bb1de3610 100644 --- a/thirdparty/pcre2/src/pcre2_compile.c +++ b/thirdparty/pcre2/src/pcre2_compile.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -63,8 +63,8 @@ POSSIBILITY OF SUCH DAMAGE. /* Other debugging code can be enabled by these defines. */ -// #define DEBUG_SHOW_CAPTURES -// #define DEBUG_SHOW_PARSED +/* #define DEBUG_SHOW_CAPTURES */ +/* #define DEBUG_SHOW_PARSED */ /* There are a few things that vary with different code unit sizes. Handle them by defining macros in order to minimize #if usage. */ @@ -250,34 +250,35 @@ is present where expected in a conditional group. */ #define META_LOOKBEHINDNOT 0x80250000u /* (?<! */ /* These must be kept in this order, with consecutive values, and the _ARG -versions of PRUNE, SKIP, and THEN immediately after their non-argument +versions of COMMIT, PRUNE, SKIP, and THEN immediately after their non-argument versions. */ #define META_MARK 0x80260000u /* (*MARK) */ #define META_ACCEPT 0x80270000u /* (*ACCEPT) */ -#define META_COMMIT 0x80280000u /* (*COMMIT) */ -#define META_FAIL 0x80290000u /* (*FAIL) */ -#define META_PRUNE 0x802a0000u /* These pairs must */ -#define META_PRUNE_ARG 0x802b0000u /* be */ -#define META_SKIP 0x802c0000u /* kept */ -#define META_SKIP_ARG 0x802d0000u /* in */ -#define META_THEN 0x802e0000u /* this */ -#define META_THEN_ARG 0x802f0000u /* order */ +#define META_FAIL 0x80280000u /* (*FAIL) */ +#define META_COMMIT 0x80290000u /* These */ +#define META_COMMIT_ARG 0x802a0000u /* pairs */ +#define META_PRUNE 0x802b0000u /* must */ +#define META_PRUNE_ARG 0x802c0000u /* be */ +#define META_SKIP 0x802d0000u /* kept */ +#define META_SKIP_ARG 0x802e0000u /* in */ +#define META_THEN 0x802f0000u /* this */ +#define META_THEN_ARG 0x80300000u /* order */ /* These must be kept in groups of adjacent 3 values, and all together. */ -#define META_ASTERISK 0x80300000u /* * */ -#define META_ASTERISK_PLUS 0x80310000u /* *+ */ -#define META_ASTERISK_QUERY 0x80320000u /* *? */ -#define META_PLUS 0x80330000u /* + */ -#define META_PLUS_PLUS 0x80340000u /* ++ */ -#define META_PLUS_QUERY 0x80350000u /* +? */ -#define META_QUERY 0x80360000u /* ? */ -#define META_QUERY_PLUS 0x80370000u /* ?+ */ -#define META_QUERY_QUERY 0x80380000u /* ?? */ -#define META_MINMAX 0x80390000u /* {n,m} repeat */ -#define META_MINMAX_PLUS 0x803a0000u /* {n,m}+ repeat */ -#define META_MINMAX_QUERY 0x803b0000u /* {n,m}? repeat */ +#define META_ASTERISK 0x80310000u /* * */ +#define META_ASTERISK_PLUS 0x80320000u /* *+ */ +#define META_ASTERISK_QUERY 0x80330000u /* *? */ +#define META_PLUS 0x80340000u /* + */ +#define META_PLUS_PLUS 0x80350000u /* ++ */ +#define META_PLUS_QUERY 0x80360000u /* +? */ +#define META_QUERY 0x80370000u /* ? */ +#define META_QUERY_PLUS 0x80380000u /* ?+ */ +#define META_QUERY_QUERY 0x80390000u /* ?? */ +#define META_MINMAX 0x803a0000u /* {n,m} repeat */ +#define META_MINMAX_PLUS 0x803b0000u /* {n,m}+ repeat */ +#define META_MINMAX_QUERY 0x803c0000u /* {n,m}? repeat */ #define META_FIRST_QUANTIFIER META_ASTERISK #define META_LAST_QUANTIFIER META_MINMAX_QUERY @@ -327,8 +328,9 @@ static unsigned char meta_extra_lengths[] = { SIZEOFFSET, /* META_LOOKBEHINDNOT */ 1, /* META_MARK - plus the string length */ 0, /* META_ACCEPT */ - 0, /* META_COMMIT */ 0, /* META_FAIL */ + 0, /* META_COMMIT */ + 1, /* META_COMMIT_ARG - plus the string length */ 0, /* META_PRUNE */ 1, /* META_PRUNE_ARG - plus the string length */ 0, /* META_SKIP */ @@ -510,17 +512,17 @@ static const short int escapes[] = { -ESC_Z, CHAR_LEFT_SQUARE_BRACKET, CHAR_BACKSLASH, CHAR_RIGHT_SQUARE_BRACKET, CHAR_CIRCUMFLEX_ACCENT, CHAR_UNDERSCORE, - CHAR_GRAVE_ACCENT, ESC_a, + CHAR_GRAVE_ACCENT, CHAR_BEL, -ESC_b, 0, - -ESC_d, ESC_e, - ESC_f, 0, + -ESC_d, CHAR_ESC, + CHAR_FF, 0, -ESC_h, 0, 0, -ESC_k, 0, 0, - ESC_n, 0, + CHAR_LF, 0, -ESC_p, 0, - ESC_r, -ESC_s, - ESC_tee, 0, + CHAR_CR, -ESC_s, + CHAR_HT, 0, -ESC_v, -ESC_w, 0, 0, -ESC_z @@ -544,22 +546,22 @@ because it is defined as 'a', which of course picks up the ASCII value. */ #endif static const short int escapes[] = { -/* 80 */ ESC_a, -ESC_b, 0, -ESC_d, ESC_e, ESC_f, 0, -/* 88 */-ESC_h, 0, 0, '{', 0, 0, 0, 0, -/* 90 */ 0, 0, -ESC_k, 0, 0, ESC_n, 0, -ESC_p, -/* 98 */ 0, ESC_r, 0, '}', 0, 0, 0, 0, -/* A0 */ 0, '~', -ESC_s, ESC_tee, 0,-ESC_v, -ESC_w, 0, -/* A8 */ 0,-ESC_z, 0, 0, 0, '[', 0, 0, -/* B0 */ 0, 0, 0, 0, 0, 0, 0, 0, -/* B8 */ 0, 0, 0, 0, 0, ']', '=', '-', -/* C0 */ '{',-ESC_A, -ESC_B, -ESC_C, -ESC_D,-ESC_E, 0, -ESC_G, -/* C8 */-ESC_H, 0, 0, 0, 0, 0, 0, 0, -/* D0 */ '}', 0, -ESC_K, 0, 0,-ESC_N, 0, -ESC_P, -/* D8 */-ESC_Q,-ESC_R, 0, 0, 0, 0, 0, 0, -/* E0 */ '\\', 0, -ESC_S, 0, 0,-ESC_V, -ESC_W, -ESC_X, -/* E8 */ 0,-ESC_Z, 0, 0, 0, 0, 0, 0, -/* F0 */ 0, 0, 0, 0, 0, 0, 0, 0, -/* F8 */ 0, 0 +/* 80 */ CHAR_BEL, -ESC_b, 0, -ESC_d, CHAR_ESC, CHAR_FF, 0, +/* 88 */ -ESC_h, 0, 0, '{', 0, 0, 0, 0, +/* 90 */ 0, 0, -ESC_k, 0, 0, CHAR_LF, 0, -ESC_p, +/* 98 */ 0, CHAR_CR, 0, '}', 0, 0, 0, 0, +/* A0 */ 0, '~', -ESC_s, CHAR_HT, 0, -ESC_v, -ESC_w, 0, +/* A8 */ 0, -ESC_z, 0, 0, 0, '[', 0, 0, +/* B0 */ 0, 0, 0, 0, 0, 0, 0, 0, +/* B8 */ 0, 0, 0, 0, 0, ']', '=', '-', +/* C0 */ '{', -ESC_A, -ESC_B, -ESC_C, -ESC_D, -ESC_E, 0, -ESC_G, +/* C8 */ -ESC_H, 0, 0, 0, 0, 0, 0, 0, +/* D0 */ '}', 0, -ESC_K, 0, 0, -ESC_N, 0, -ESC_P, +/* D8 */ -ESC_Q, -ESC_R, 0, 0, 0, 0, 0, 0, +/* E0 */ '\\', 0, -ESC_S, 0, 0, -ESC_V, -ESC_W, -ESC_X, +/* E8 */ 0, -ESC_Z, 0, 0, 0, 0, 0, 0, +/* F0 */ 0, 0, 0, 0, 0, 0, 0, 0, +/* F8 */ 0, 0 }; /* We also need a table of characters that may follow \c in an EBCDIC @@ -586,9 +588,9 @@ static const char verbnames[] = "\0" /* Empty name is a shorthand for MARK */ STRING_MARK0 STRING_ACCEPT0 - STRING_COMMIT0 STRING_F0 STRING_FAIL0 + STRING_COMMIT0 STRING_PRUNE0 STRING_SKIP0 STRING_THEN; @@ -596,11 +598,11 @@ static const char verbnames[] = static const verbitem verbs[] = { { 0, META_MARK, +1 }, /* > 0 => must have an argument */ { 4, META_MARK, +1 }, - { 6, META_ACCEPT, -1 }, /* < 0 => must not have an argument */ - { 6, META_COMMIT, -1 }, + { 6, META_ACCEPT, -1 }, /* < 0 => Optional argument, convert to pre-MARK */ { 1, META_FAIL, -1 }, { 4, META_FAIL, -1 }, - { 5, META_PRUNE, 0 }, /* Argument is optional; bump META code if found */ + { 6, META_COMMIT, 0 }, + { 5, META_PRUNE, 0 }, /* Optional argument; bump META code if found */ { 4, META_SKIP, 0 }, { 4, META_THEN, 0 } }; @@ -610,8 +612,8 @@ static const int verbcount = sizeof(verbs)/sizeof(verbitem); /* Verb opcodes, indexed by their META code offset from META_MARK. */ static const uint32_t verbops[] = { - OP_MARK, OP_ACCEPT, OP_COMMIT, OP_FAIL, OP_PRUNE, OP_PRUNE_ARG, OP_SKIP, - OP_SKIP_ARG, OP_THEN, OP_THEN_ARG }; + OP_MARK, OP_ACCEPT, OP_FAIL, OP_COMMIT, OP_COMMIT_ARG, OP_PRUNE, + OP_PRUNE_ARG, OP_SKIP, OP_SKIP_ARG, OP_THEN, OP_THEN_ARG }; /* Offsets from OP_STAR for case-independent and negative repeat opcodes. */ @@ -729,7 +731,7 @@ enum { ERR0 = COMPILE_ERROR_BASE, ERR61, ERR62, ERR63, ERR64, ERR65, ERR66, ERR67, ERR68, ERR69, ERR70, ERR71, ERR72, ERR73, ERR74, ERR75, ERR76, ERR77, ERR78, ERR79, ERR80, ERR81, ERR82, ERR83, ERR84, ERR85, ERR86, ERR87, ERR88, ERR89, ERR90, - ERR91, ERR92}; + ERR91, ERR92, ERR93, ERR94 }; /* This is a table of start-of-pattern options such as (*UTF) and settings such as (*LIMIT_MATCH=nnnn) and (*CRLF). For completeness and backward @@ -976,8 +978,8 @@ for (;;) case META_POSIX_NEG: fprintf(stderr, "META_POSIX_NEG %d", *pptr++); break; case META_ACCEPT: fprintf(stderr, "META (*ACCEPT)"); break; - case META_COMMIT: fprintf(stderr, "META (*COMMIT)"); break; case META_FAIL: fprintf(stderr, "META (*FAIL)"); break; + case META_COMMIT: fprintf(stderr, "META (*COMMIT)"); break; case META_PRUNE: fprintf(stderr, "META (*PRUNE)"); break; case META_SKIP: fprintf(stderr, "META (*SKIP)"); break; case META_THEN: fprintf(stderr, "META (*THEN)"); break; @@ -1067,6 +1069,10 @@ for (;;) fprintf(stderr, "META (*MARK:"); goto SHOWARG; + case META_COMMIT_ARG: + fprintf(stderr, "META (*COMMIT:"); + goto SHOWARG; + case META_PRUNE_ARG: fprintf(stderr, "META (*PRUNE:"); goto SHOWARG; @@ -1435,6 +1441,48 @@ else if ((i = escapes[c - ESCAPES_FIRST]) != 0) escape = -i; /* Else return a special escape */ if (cb != NULL && (escape == ESC_P || escape == ESC_p || escape == ESC_X)) cb->external_flags |= PCRE2_HASBKPORX; /* Note \P, \p, or \X */ + + /* Perl supports \N{name} for character names and \N{U+dddd} for numerical + Unicode code points, as well as plain \N for "not newline". PCRE does not + support \N{name}. However, it does support quantification such as \N{2,3}, + so if \N{ is not followed by U+dddd we check for a quantifier. */ + + if (escape == ESC_N && ptr < ptrend && *ptr == CHAR_LEFT_CURLY_BRACKET) + { + PCRE2_SPTR p = ptr + 1; + + /* \N{U+ can be handled by the \x{ code. However, this construction is + not valid in EBCDIC environments because it specifies a Unicode + character, not a codepoint in the local code. For example \N{U+0041} + must be "A" in all environments. Also, in Perl, \N{U+ forces Unicode + casing semantics for the entire pattern, so allow it only in UTF (i.e. + Unicode) mode. */ + + if (ptrend - p > 1 && *p == CHAR_U && p[1] == CHAR_PLUS) + { +#ifdef EBCDIC + *errorcodeptr = ERR93; +#else + if (utf) + { + ptr = p + 1; + escape = 0; /* Not a fancy escape after all */ + goto COME_FROM_NU; + } + else *errorcodeptr = ERR93; +#endif + } + + /* Give an error if what follows is not a quantifier, but don't override + an error set by the quantifier reader (e.g. number overflow). */ + + else + { + if (!read_repeat_counts(&p, ptrend, NULL, NULL, errorcodeptr) && + *errorcodeptr == 0) + *errorcodeptr = ERR37; + } + } } } @@ -1462,6 +1510,7 @@ else /* A number of Perl escapes are not handled by PCRE. We give an explicit error. */ + case CHAR_F: case CHAR_l: case CHAR_L: *errorcodeptr = ERR37; @@ -1719,6 +1768,9 @@ else { if (ptr < ptrend && *ptr == CHAR_LEFT_CURLY_BRACKET) { +#ifndef EBCDIC + COME_FROM_NU: +#endif if (++ptr >= ptrend || *ptr == CHAR_RIGHT_CURLY_BRACKET) { *errorcodeptr = ERR78; @@ -1852,19 +1904,6 @@ else } } -/* Perl supports \N{name} for character names, as well as plain \N for "not -newline". PCRE does not support \N{name}. However, it does support -quantification such as \N{2,3}. */ - -if (escape == ESC_N && ptr < ptrend && *ptr == CHAR_LEFT_CURLY_BRACKET && - ptrend - ptr > 2) - { - PCRE2_SPTR p = ptr + 1; - if (!read_repeat_counts(&p, ptrend, NULL, NULL, errorcodeptr) && - *errorcodeptr == 0) - *errorcodeptr = ERR37; - } - /* Set the pointer to the next character before returning. */ *ptrptr = ptr; @@ -2251,11 +2290,14 @@ typedef struct nest_save { #define NSF_RESET 0x0001u #define NSF_CONDASSERT 0x0002u -/* Of the options that are changeable within the pattern, these are tracked -during parsing. The rest are used from META_OPTIONS items when compiling. */ +/* Options that are changeable within the pattern must be tracked during +parsing. Some (e.g. PCRE2_EXTENDED) are implemented entirely during parsing, +but all must be tracked so that META_OPTIONS items set the correct values for +the main compiling phase. */ -#define PARSE_TRACKED_OPTIONS \ - (PCRE2_DUPNAMES|PCRE2_EXTENDED|PCRE2_EXTENDED_MORE|PCRE2_NO_AUTO_CAPTURE) +#define PARSE_TRACKED_OPTIONS (PCRE2_CASELESS|PCRE2_DOTALL|PCRE2_DUPNAMES| \ + PCRE2_EXTENDED|PCRE2_EXTENDED_MORE|PCRE2_MULTILINE|PCRE2_NO_AUTO_CAPTURE| \ + PCRE2_UNGREEDY) /* States used for analyzing ranges in character classes. The two OK values must be last. */ @@ -2290,6 +2332,7 @@ uint32_t *previous_callout = NULL; uint32_t *parsed_pattern = cb->parsed_pattern; uint32_t *parsed_pattern_end = cb->parsed_pattern_end; uint32_t meta_quantifier = 0; +uint32_t add_after_mark = 0; uint16_t nest_depth = 0; int after_manual_callout = 0; int expect_cond_assert = 0; @@ -2434,11 +2477,17 @@ while (ptr < ptrend) /* EITHER: not both options set */ ((options & (PCRE2_EXTENDED | PCRE2_ALT_VERBNAMES)) != (PCRE2_EXTENDED | PCRE2_ALT_VERBNAMES)) || - /* OR: character > 255 */ - c > 255 || - /* OR: not a # comment or white space */ - (c != CHAR_NUMBER_SIGN && (cb->ctypes[c] & ctype_space) == 0) - )) +#ifdef SUPPORT_UNICODE + /* OR: character > 255 AND not Unicode Pattern White Space */ + (c > 255 && (c|1) != 0x200f && (c|1) != 0x2029) || +#endif + /* OR: not a # comment or isspace() white space */ + (c < 256 && c != CHAR_NUMBER_SIGN && (cb->ctypes[c] & ctype_space) == 0 +#ifdef SUPPORT_UNICODE + /* and not CHAR_NEL when Unicode is supported */ + && c != CHAR_NEL +#endif + ))) { PCRE2_SIZE verbnamelength; @@ -2461,6 +2510,16 @@ while (ptr < ptrend) goto FAILED; } *verblengthptr = (uint32_t)verbnamelength; + + /* If this name was on a verb such as (*ACCEPT) which does not continue, + a (*MARK) was generated for the name. We now add the original verb as the + next item. */ + + if (add_after_mark != 0) + { + *parsed_pattern++ = add_after_mark; + add_after_mark = 0; + } break; case CHAR_BACKSLASH: @@ -2510,11 +2569,18 @@ while (ptr < ptrend) /* Skip over whitespace and # comments in extended mode. Note that c is a character, not a code unit, so we must not use MAX_255 to test its size - because MAX_255 tests code units and is assumed TRUE in 8-bit mode. */ + because MAX_255 tests code units and is assumed TRUE in 8-bit mode. The + whitespace characters are those designated as "Pattern White Space" by + Unicode, which are the isspace() characters plus CHAR_NEL (newline), which is + U+0085 in Unicode, plus U+200E, U+200F, U+2028, and U+2029. These are a + subset of space characters that match \h and \v. */ if ((options & PCRE2_EXTENDED) != 0) { if (c < 256 && (cb->ctypes[c] & ctype_space) != 0) continue; +#ifdef SUPPORT_UNICODE + if (c == CHAR_NEL || (c|1) == 0x200f || (c|1) == 0x2029) continue; +#endif if (c == CHAR_NUMBER_SIGN) { while (ptr < ptrend) @@ -3206,7 +3272,6 @@ while (ptr < ptrend) tempptr = ptr; escape = PRIV(check_escape)(&ptr, ptrend, &c, &errorcode, options, TRUE, cb); - if (errorcode != 0) { CLASS_ESCAPE_FAILED: @@ -3454,13 +3519,25 @@ while (ptr < ptrend) if (*ptr++ == CHAR_COLON) /* Skip past : or ) */ { - if (verbs[i].has_arg < 0) /* Argument is forbidden */ + /* Some optional arguments can be treated as a preceding (*MARK) */ + + if (verbs[i].has_arg < 0) { - errorcode = ERR59; - goto FAILED; + add_after_mark = verbs[i].meta; + *parsed_pattern++ = META_MARK; } - *parsed_pattern++ = verbs[i].meta + - ((verbs[i].meta != META_MARK)? 0x00010000u:0); + + /* The remaining verbs with arguments (except *MARK) need a different + opcode. */ + + else + { + *parsed_pattern++ = verbs[i].meta + + ((verbs[i].meta != META_MARK)? 0x00010000u:0); + } + + /* Set up for reading the name in the main loop. */ + verblengthptr = parsed_pattern++; verbnamestart = ptr; inverbname = TRUE; @@ -3521,17 +3598,39 @@ while (ptr < ptrend) else { + BOOL hyphenok = TRUE; + uint32_t oldoptions = options; + top_nest->reset_group = 0; top_nest->max_group = 0; set = unset = 0; optset = &set; + /* ^ at the start unsets imnsx and disables the subsequent use of - */ + + if (ptr < ptrend && *ptr == CHAR_CIRCUMFLEX_ACCENT) + { + options &= ~(PCRE2_CASELESS|PCRE2_MULTILINE|PCRE2_NO_AUTO_CAPTURE| + PCRE2_DOTALL|PCRE2_EXTENDED|PCRE2_EXTENDED_MORE); + hyphenok = FALSE; + ptr++; + } + while (ptr < ptrend && *ptr != CHAR_RIGHT_PARENTHESIS && *ptr != CHAR_COLON) { switch (*ptr++) { - case CHAR_MINUS: optset = &unset; break; + case CHAR_MINUS: + if (!hyphenok) + { + errorcode = ERR94; + ptr--; /* Correct the offset */ + goto FAILED; + } + optset = &unset; + hyphenok = FALSE; + break; case CHAR_J: /* Record that it changed in the external options */ *optset |= PCRE2_DUPNAMES; @@ -3591,7 +3690,7 @@ while (ptr < ptrend) /* If nothing changed, no need to record. */ - if (set != 0 || unset != 0) + if (options != oldoptions) { *parsed_pattern++ = META_OPTIONS; *parsed_pattern++ = options; @@ -3896,9 +3995,8 @@ while (ptr < ptrend) if (*ptr == CHAR_DOT) { if (++ptr >= ptrend || !IS_DIGIT(*ptr)) goto BAD_VERSION_CONDITION; - if (!read_number(&ptr, ptrend, -1, 99 , ERR79, &minor, &errorcode)) - goto FAILED; - if (minor < 10) minor *= 10; + minor = (*ptr++ - CHAR_0) * 10; + if (IS_DIGIT(*ptr)) minor += *ptr++ - CHAR_0; if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS) goto BAD_VERSION_CONDITION; } @@ -4261,11 +4359,11 @@ goto FAILED; /************************************************* -* Find first significant op code * +* Find first significant opcode * *************************************************/ /* This is called by several functions that scan a compiled expression looking -for a fixed first character, or an anchoring op code etc. It skips over things +for a fixed first character, or an anchoring opcode etc. It skips over things that do not influence this. For some calls, it makes sense to skip negative forward and all backward assertions, and also the \b assertion; for others it does not. @@ -5472,7 +5570,7 @@ for (;; pptr++) set xclass = TRUE. Then, in the pre-compile phase, accumulate the length of the extra data and reset the pointer. This is so that very large classes that contain a zillion wide characters or Unicode property tests - do not overwrite the work space (which is on the stack). */ + do not overwrite the workspace (which is on the stack). */ if (class_uchardata > class_uchardata_base) { @@ -5563,7 +5661,7 @@ for (;; pptr++) if (class_has_8bitchar > 0) { *code++ |= XCL_MAP; - memmove(code + (32 / sizeof(PCRE2_UCHAR)), code, + (void)memmove(code + (32 / sizeof(PCRE2_UCHAR)), code, CU2BYTES(class_uchardata - code)); if (negate_class && !xclass_has_prop) for (i = 0; i < 32; i++) classbits[i] = ~classbits[i]; @@ -5655,6 +5753,7 @@ for (;; pptr++) cb->had_pruneorskip = TRUE; /* Fall through */ case META_MARK: + case META_COMMIT_ARG: VERB_ARG: *code++ = verbops[(meta - META_MARK) >> 16]; /* The length is in characters. */ @@ -6509,7 +6608,7 @@ for (;; pptr++) /* Wrap the recursion call in OP_BRA brackets. */ - memmove(previous + 1 + LINK_SIZE, previous, CU2BYTES(1 + LINK_SIZE)); + (void)memmove(previous + 1 + LINK_SIZE, previous, CU2BYTES(1 + LINK_SIZE)); op_previous = *previous = OP_BRA; PUT(previous, 1, 2 + 2*LINK_SIZE); previous[2 + 2*LINK_SIZE] = OP_KET; @@ -6589,7 +6688,7 @@ for (;; pptr++) if (repeat_max <= 1 || repeat_max == REPEAT_UNLIMITED) { - memmove(previous + 1, previous, CU2BYTES(len)); + (void)memmove(previous + 1, previous, CU2BYTES(len)); code++; if (repeat_max == 0) { @@ -6610,7 +6709,7 @@ for (;; pptr++) else { int linkoffset; - memmove(previous + 2 + LINK_SIZE, previous, CU2BYTES(len)); + (void)memmove(previous + 2 + LINK_SIZE, previous, CU2BYTES(len)); code += 2 + LINK_SIZE; *previous++ = OP_BRAZERO + repeat_type; *previous++ = OP_BRA; @@ -6811,7 +6910,7 @@ for (;; pptr++) if (*bracode == OP_COND || *bracode == OP_SCOND) { int nlen = (int)(code - bracode); - memmove(bracode + 1 + LINK_SIZE, bracode, CU2BYTES(nlen)); + (void)memmove(bracode + 1 + LINK_SIZE, bracode, CU2BYTES(nlen)); code += 1 + LINK_SIZE; nlen += 1 + LINK_SIZE; *bracode = (*bracode == OP_COND)? OP_BRAPOS : OP_SBRAPOS; @@ -7082,7 +7181,7 @@ for (;; pptr++) else { - memmove(tempcode + 1 + LINK_SIZE, tempcode, CU2BYTES(len)); + (void)memmove(tempcode + 1 + LINK_SIZE, tempcode, CU2BYTES(len)); code += 1 + LINK_SIZE; len += 1 + LINK_SIZE; tempcode[0] = OP_ONCE; @@ -7460,7 +7559,7 @@ length of the BRA and KET and any extra code units that are required at the beginning. We accumulate in a local variable to save frequent testing of lengthptr for NULL. We cannot do this by looking at the value of 'code' at the start and end of each alternative, because compiled items are discarded during -the pre-compile phase so that the work space is not exceeded. */ +the pre-compile phase so that the workspace is not exceeded. */ length = 2 + 2*LINK_SIZE + skipunits; @@ -7622,7 +7721,7 @@ for (;;) { if (cb->open_caps->flag) { - memmove(start_bracket + 1 + LINK_SIZE, start_bracket, + (void)memmove(start_bracket + 1 + LINK_SIZE, start_bracket, CU2BYTES(code - start_bracket)); *start_bracket = OP_ONCE; code += 1 + LINK_SIZE; @@ -7765,10 +7864,11 @@ do { if (!is_anchored(scode, bracket_map, cb, atomcount, TRUE)) return FALSE; } - /* Condition */ + /* Condition. If there is no second branch, it can't be anchored. */ - else if (op == OP_COND) + else if (op == OP_COND || op == OP_SCOND) { + if (scode[GET(scode,1)] != OP_ALT) return FALSE; if (!is_anchored(scode, bracket_map, cb, atomcount, inassert)) return FALSE; } @@ -8003,6 +8103,7 @@ for (;;) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: @@ -8221,7 +8322,7 @@ for (i = 0; i < tablecount; i++) if (crc < 0) { - memmove(slot + cb->name_entry_size, slot, + (void)memmove(slot + cb->name_entry_size, slot, CU2BYTES((tablecount - i) * cb->name_entry_size)); break; } @@ -8311,6 +8412,7 @@ for (;; pptr++) break; case META_MARK: /* Add the length of the name. */ + case META_COMMIT_ARG: case META_PRUNE_ARG: case META_SKIP_ARG: case META_THEN_ARG: @@ -8501,6 +8603,7 @@ for (;; pptr++) goto EXIT; case META_MARK: + case META_COMMIT_ARG: case META_PRUNE_ARG: case META_SKIP_ARG: case META_THEN_ARG: @@ -8572,6 +8675,32 @@ for (;; pptr++) case META_LOOKAHEADNOT: pptr = parsed_skip(pptr + 1, PSKIP_KET); if (pptr == NULL) goto PARSED_SKIP_FAILED; + + /* Also ignore any qualifiers that follow a lookahead assertion. */ + + switch (pptr[1]) + { + case META_ASTERISK: + case META_ASTERISK_PLUS: + case META_ASTERISK_QUERY: + case META_PLUS: + case META_PLUS_PLUS: + case META_PLUS_QUERY: + case META_QUERY: + case META_QUERY_PLUS: + case META_QUERY_QUERY: + pptr++; + break; + + case META_MINMAX: + case META_MINMAX_PLUS: + case META_MINMAX_QUERY: + pptr += 3; + break; + + default: + break; + } break; /* Lookbehinds can be ignored, but must themselves be checked. */ @@ -8942,6 +9071,7 @@ for (pptr = cb->parsed_pattern; *pptr != META_END; pptr++) break; case META_MARK: + case META_COMMIT_ARG: case META_PRUNE_ARG: case META_SKIP_ARG: case META_THEN_ARG: diff --git a/thirdparty/pcre2/src/pcre2_convert.c b/thirdparty/pcre2/src/pcre2_convert.c index bdf9b86df6..1dd5c337dc 100644 --- a/thirdparty/pcre2/src/pcre2_convert.c +++ b/thirdparty/pcre2/src/pcre2_convert.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -1066,11 +1066,12 @@ BOOL utf = (options & PCRE2_CONVERT_UTF) != 0; uint32_t pattype = options & TYPE_OPTIONS; if (pattern == NULL || bufflenptr == NULL) return PCRE2_ERROR_NULL; + if ((options & ~ALL_OPTIONS) != 0 || /* Undefined bit set */ (pattype & (~pattype+1)) != pattype || /* More than one type set */ pattype == 0) /* No type set */ { - *bufflenptr = 0; /* Error offset */ + *bufflenptr = 0; /* Error offset */ return PCRE2_ERROR_BADOPTION; } @@ -1081,7 +1082,11 @@ if (ccontext == NULL) ccontext = /* Check UTF if required. */ #ifndef SUPPORT_UNICODE -if (utf) return PCRE2_ERROR_UNICODE_NOT_SUPPORTED; +if (utf) + { + *bufflenptr = 0; /* Error offset */ + return PCRE2_ERROR_UNICODE_NOT_SUPPORTED; + } #else if (utf && (options & PCRE2_CONVERT_NO_UTF_CHECK) == 0) { @@ -1126,6 +1131,7 @@ for (i = 0; i < 2; i++) break; default: + *bufflenptr = 0; /* Error offset */ return PCRE2_ERROR_INTERNAL; } diff --git a/thirdparty/pcre2/src/pcre2_dfa_match.c b/thirdparty/pcre2/src/pcre2_dfa_match.c index c6184ff5e9..9b43237da7 100644 --- a/thirdparty/pcre2/src/pcre2_dfa_match.c +++ b/thirdparty/pcre2/src/pcre2_dfa_match.c @@ -181,7 +181,8 @@ static const uint8_t coptable[] = { 0, 0, 0, /* BRAZERO, BRAMINZERO, BRAPOSZERO */ 0, 0, 0, /* MARK, PRUNE, PRUNE_ARG */ 0, 0, 0, 0, /* SKIP, SKIP_ARG, THEN, THEN_ARG */ - 0, 0, 0, 0, /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT */ + 0, 0, /* COMMIT, COMMIT_ARG */ + 0, 0, 0, /* FAIL, ACCEPT, ASSERT_ACCEPT */ 0, 0, 0 /* CLOSE, SKIPZERO, DEFINE */ }; @@ -254,7 +255,8 @@ static const uint8_t poptable[] = { 0, 0, 0, /* BRAZERO, BRAMINZERO, BRAPOSZERO */ 0, 0, 0, /* MARK, PRUNE, PRUNE_ARG */ 0, 0, 0, 0, /* SKIP, SKIP_ARG, THEN, THEN_ARG */ - 0, 0, 0, 0, /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT */ + 0, 0, /* COMMIT, COMMIT_ARG */ + 0, 0, 0, /* FAIL, ACCEPT, ASSERT_ACCEPT */ 0, 0, 0 /* CLOSE, SKIPZERO, DEFINE */ }; @@ -292,6 +294,35 @@ typedef struct stateblock { #define INTS_PER_STATEBLOCK (int)(sizeof(stateblock)/sizeof(int)) +/* Before version 10.32 the recursive calls of internal_dfa_match() were passed +local working space and output vectors that were created on the stack. This has +caused issues for some patterns, especially in small-stack environments such as +Windows. A new scheme is now in use which sets up a vector on the stack, but if +this is too small, heap memory is used, up to the heap_limit. The main +parameters are all numbers of ints because the workspace is a vector of ints. + +The size of the starting stack vector, DFA_START_RWS_SIZE, is in bytes, and is +defined in pcre2_internal.h so as to be available to pcre2test when it is +finding the minimum heap requirement for a match. */ + +#define OVEC_UNIT (sizeof(PCRE2_SIZE)/sizeof(int)) + +#define RWS_BASE_SIZE (DFA_START_RWS_SIZE/sizeof(int)) /* Stack vector */ +#define RWS_RSIZE 1000 /* Work size for recursion */ +#define RWS_OVEC_RSIZE (1000*OVEC_UNIT) /* Ovector for recursion */ +#define RWS_OVEC_OSIZE (2*OVEC_UNIT) /* Ovector in other cases */ + +/* This structure is at the start of each workspace block. */ + +typedef struct RWS_anchor { + struct RWS_anchor *next; + unsigned int size; /* Number of ints */ + unsigned int free; /* Number of ints */ +} RWS_anchor; + +#define RWS_ANCHOR_SIZE (sizeof(RWS_anchor)/sizeof(int)) + + /************************************************* * Process a callout * @@ -354,6 +385,61 @@ return (mb->callout)(cb, mb->callout_data); /************************************************* +* Expand local workspace memory * +*************************************************/ + +/* This function is called when internal_dfa_match() is about to be called +recursively and there is insufficient working space left in the current +workspace block. If there's an existing next block, use it; otherwise get a new +block unless the heap limit is reached. + +Arguments: + rwsptr pointer to block pointer (updated) + ovecsize space needed for an ovector + mb the match block + +Returns: 0 rwsptr has been updated + !0 an error code +*/ + +static int +more_workspace(RWS_anchor **rwsptr, unsigned int ovecsize, dfa_match_block *mb) +{ +RWS_anchor *rws = *rwsptr; +RWS_anchor *new; + +if (rws->next != NULL) + { + new = rws->next; + } + +/* All sizes are in units of sizeof(int), except for mb->heaplimit, which is in +kibibytes. */ + +else + { + unsigned int newsize = rws->size * 2; + unsigned int heapleft = (unsigned int) + (((1024/sizeof(int))*mb->heap_limit - mb->heap_used)); + if (newsize > heapleft) newsize = heapleft; + if (newsize < RWS_RSIZE + ovecsize + RWS_ANCHOR_SIZE) + return PCRE2_ERROR_HEAPLIMIT; + new = mb->memctl.malloc(newsize*sizeof(int), mb->memctl.memory_data); + if (new == NULL) return PCRE2_ERROR_NOMEMORY; + mb->heap_used += newsize; + new->next = NULL; + new->size = newsize; + rws->next = new; + } + +new->free = new->size - RWS_ANCHOR_SIZE; +*rwsptr = new; +return 0; +} + + + +/************************************************* * Match a Regular Expression - DFA engine * *************************************************/ @@ -431,7 +517,8 @@ internal_dfa_match( uint32_t offsetcount, int *workspace, int wscount, - uint32_t rlevel) + uint32_t rlevel, + int *RWS) { stateblock *active_states, *new_states, *temp_states; stateblock *next_active_state, *next_new_state; @@ -788,7 +875,7 @@ for (;;) else if (match_count > 0 && ++match_count * 2 > (int)offsetcount) match_count = 0; count = ((match_count == 0)? (int)offsetcount : match_count * 2) - 2; - if (count > 0) memmove(offsets + 2, offsets, + if (count > 0) (void)memmove(offsets + 2, offsets, (size_t)count * sizeof(PCRE2_SIZE)); if (offsetcount >= 2) { @@ -2587,10 +2674,22 @@ for (;;) case OP_ASSERTBACK: case OP_ASSERTBACK_NOT: { - PCRE2_SPTR endasscode = code + GET(code, 1); - PCRE2_SIZE local_offsets[2]; int rc; - int local_workspace[1000]; + int *local_workspace; + PCRE2_SIZE *local_offsets; + PCRE2_SPTR endasscode = code + GET(code, 1); + RWS_anchor *rws = (RWS_anchor *)RWS; + + if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE) + { + rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb); + if (rc != 0) return rc; + RWS = (int *)rws; + } + + local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free); + local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE; + rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE; while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1); @@ -2600,10 +2699,13 @@ for (;;) ptr, /* where we currently are */ (PCRE2_SIZE)(ptr - start_subject), /* start offset */ local_offsets, /* offset vector */ - sizeof(local_offsets)/sizeof(PCRE2_SIZE), /* size of same */ + RWS_OVEC_OSIZE/OVEC_UNIT, /* size of same */ local_workspace, /* workspace vector */ - sizeof(local_workspace)/sizeof(int), /* size of same */ - rlevel); /* function recursion level */ + RWS_RSIZE, /* size of same */ + rlevel, /* function recursion level */ + RWS); /* recursion workspace */ + + rws->free += RWS_RSIZE + RWS_OVEC_OSIZE; if (rc < 0 && rc != PCRE2_ERROR_NOMATCH) return rc; if ((rc >= 0) == (codevalue == OP_ASSERT || codevalue == OP_ASSERTBACK)) @@ -2615,8 +2717,6 @@ for (;;) case OP_COND: case OP_SCOND: { - PCRE2_SIZE local_offsets[1000]; - int local_workspace[1000]; int codelink = (int)GET(code, 1); PCRE2_UCHAR condcode; @@ -2673,8 +2773,22 @@ for (;;) else { int rc; + int *local_workspace; + PCRE2_SIZE *local_offsets; PCRE2_SPTR asscode = code + LINK_SIZE + 1; PCRE2_SPTR endasscode = asscode + GET(asscode, 1); + RWS_anchor *rws = (RWS_anchor *)RWS; + + if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE) + { + rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb); + if (rc != 0) return rc; + RWS = (int *)rws; + } + + local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free); + local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE; + rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE; while (*endasscode == OP_ALT) endasscode += GET(endasscode, 1); @@ -2684,10 +2798,13 @@ for (;;) ptr, /* where we currently are */ (PCRE2_SIZE)(ptr - start_subject), /* start offset */ local_offsets, /* offset vector */ - sizeof(local_offsets)/sizeof(PCRE2_SIZE), /* size of same */ + RWS_OVEC_OSIZE/OVEC_UNIT, /* size of same */ local_workspace, /* workspace vector */ - sizeof(local_workspace)/sizeof(int), /* size of same */ - rlevel); /* function recursion level */ + RWS_RSIZE, /* size of same */ + rlevel, /* function recursion level */ + RWS); /* recursion workspace */ + + rws->free += RWS_RSIZE + RWS_OVEC_OSIZE; if (rc < 0 && rc != PCRE2_ERROR_NOMATCH) return rc; if ((rc >= 0) == @@ -2702,13 +2819,25 @@ for (;;) /*-----------------------------------------------------------------*/ case OP_RECURSE: { + int rc; + int *local_workspace; + PCRE2_SIZE *local_offsets; + RWS_anchor *rws = (RWS_anchor *)RWS; dfa_recursion_info *ri; - PCRE2_SIZE local_offsets[1000]; - int local_workspace[1000]; PCRE2_SPTR callpat = start_code + GET(code, 1); uint32_t recno = (callpat == mb->start_code)? 0 : GET2(callpat, 1 + LINK_SIZE); - int rc; + + if (rws->free < RWS_RSIZE + RWS_OVEC_RSIZE) + { + rc = more_workspace(&rws, RWS_OVEC_RSIZE, mb); + if (rc != 0) return rc; + RWS = (int *)rws; + } + + local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free); + local_workspace = ((int *)local_offsets) + RWS_OVEC_RSIZE; + rws->free -= RWS_RSIZE + RWS_OVEC_RSIZE; /* Check for repeating a recursion without advancing the subject pointer. This should catch convoluted mutual recursions. (Some simple @@ -2732,11 +2861,13 @@ for (;;) ptr, /* where we currently are */ (PCRE2_SIZE)(ptr - start_subject), /* start offset */ local_offsets, /* offset vector */ - sizeof(local_offsets)/sizeof(PCRE2_SIZE), /* size of same */ + RWS_OVEC_RSIZE/OVEC_UNIT, /* size of same */ local_workspace, /* workspace vector */ - sizeof(local_workspace)/sizeof(int), /* size of same */ - rlevel); /* function recursion level */ + RWS_RSIZE, /* size of same */ + rlevel, /* function recursion level */ + RWS); /* recursion workspace */ + rws->free += RWS_RSIZE + RWS_OVEC_RSIZE; mb->recursive = new_recursive.prevrec; /* Done this recursion */ /* Ran out of internal offsets */ @@ -2782,10 +2913,25 @@ for (;;) case OP_SCBRAPOS: case OP_BRAPOSZERO: { + int rc; + int *local_workspace; + PCRE2_SIZE *local_offsets; PCRE2_SIZE charcount, matched_count; PCRE2_SPTR local_ptr = ptr; + RWS_anchor *rws = (RWS_anchor *)RWS; BOOL allow_zero; + if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE) + { + rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb); + if (rc != 0) return rc; + RWS = (int *)rws; + } + + local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free); + local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE; + rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE; + if (codevalue == OP_BRAPOSZERO) { allow_zero = TRUE; @@ -2798,19 +2944,17 @@ for (;;) for (matched_count = 0;; matched_count++) { - PCRE2_SIZE local_offsets[2]; - int local_workspace[1000]; - - int rc = internal_dfa_match( + rc = internal_dfa_match( mb, /* fixed match data */ code, /* this subexpression's code */ local_ptr, /* where we currently are */ (PCRE2_SIZE)(ptr - start_subject), /* start offset */ local_offsets, /* offset vector */ - sizeof(local_offsets)/sizeof(PCRE2_SIZE), /* size of same */ + RWS_OVEC_OSIZE/OVEC_UNIT, /* size of same */ local_workspace, /* workspace vector */ - sizeof(local_workspace)/sizeof(int), /* size of same */ - rlevel); /* function recursion level */ + RWS_RSIZE, /* size of same */ + rlevel, /* function recursion level */ + RWS); /* recursion workspace */ /* Failed to match */ @@ -2827,6 +2971,8 @@ for (;;) local_ptr += charcount; /* Advance temporary position ptr */ } + rws->free += RWS_RSIZE + RWS_OVEC_OSIZE; + /* At this point we have matched the subpattern matched_count times, and local_ptr is pointing to the character after the end of the last match. */ @@ -2869,19 +3015,35 @@ for (;;) /*-----------------------------------------------------------------*/ case OP_ONCE: { - PCRE2_SIZE local_offsets[2]; - int local_workspace[1000]; + int rc; + int *local_workspace; + PCRE2_SIZE *local_offsets; + RWS_anchor *rws = (RWS_anchor *)RWS; - int rc = internal_dfa_match( + if (rws->free < RWS_RSIZE + RWS_OVEC_OSIZE) + { + rc = more_workspace(&rws, RWS_OVEC_OSIZE, mb); + if (rc != 0) return rc; + RWS = (int *)rws; + } + + local_offsets = (PCRE2_SIZE *)(RWS + rws->size - rws->free); + local_workspace = ((int *)local_offsets) + RWS_OVEC_OSIZE; + rws->free -= RWS_RSIZE + RWS_OVEC_OSIZE; + + rc = internal_dfa_match( mb, /* fixed match data */ code, /* this subexpression's code */ ptr, /* where we currently are */ (PCRE2_SIZE)(ptr - start_subject), /* start offset */ local_offsets, /* offset vector */ - sizeof(local_offsets)/sizeof(PCRE2_SIZE), /* size of same */ + RWS_OVEC_OSIZE/OVEC_UNIT, /* size of same */ local_workspace, /* workspace vector */ - sizeof(local_workspace)/sizeof(int), /* size of same */ - rlevel); /* function recursion level */ + RWS_RSIZE, /* size of same */ + rlevel, /* function recursion level */ + RWS); /* recursion workspace */ + + rws->free += RWS_RSIZE + RWS_OVEC_OSIZE; if (rc >= 0) { @@ -3063,6 +3225,7 @@ pcre2_dfa_match(const pcre2_code *code, PCRE2_SPTR subject, PCRE2_SIZE length, PCRE2_SIZE start_offset, uint32_t options, pcre2_match_data *match_data, pcre2_match_context *mcontext, int *workspace, PCRE2_SIZE wscount) { +int rc; const pcre2_real_code *re = (const pcre2_real_code *)code; PCRE2_SPTR start_match; @@ -3071,9 +3234,9 @@ PCRE2_SPTR bumpalong_limit; PCRE2_SPTR req_cu_ptr; BOOL utf, anchored, startline, firstline; - BOOL has_first_cu = FALSE; BOOL has_req_cu = FALSE; + PCRE2_UCHAR first_cu = 0; PCRE2_UCHAR first_cu2 = 0; PCRE2_UCHAR req_cu = 0; @@ -3088,6 +3251,17 @@ pcre2_callout_block cb; dfa_match_block actual_match_block; dfa_match_block *mb = &actual_match_block; +/* Set up a starting block of memory for use during recursive calls to +internal_dfa_match(). By putting this on the stack, it minimizes resource use +in the case when it is not needed. If this is too small, more memory is +obtained from the heap. At the start of each block is an anchor structure.*/ + +int base_recursion_workspace[RWS_BASE_SIZE]; +RWS_anchor *rws = (RWS_anchor *)base_recursion_workspace; +rws->next = NULL; +rws->size = RWS_BASE_SIZE; +rws->free = RWS_BASE_SIZE - RWS_ANCHOR_SIZE; + /* A length equal to PCRE2_ZERO_TERMINATED implies a zero-terminated subject string. */ @@ -3184,6 +3358,7 @@ if (mcontext == NULL) mb->memctl = re->memctl; mb->match_limit = PRIV(default_match_context).match_limit; mb->match_limit_depth = PRIV(default_match_context).depth_limit; + mb->heap_limit = PRIV(default_match_context).heap_limit; } else { @@ -3198,6 +3373,7 @@ else mb->memctl = mcontext->memctl; mb->match_limit = mcontext->match_limit; mb->match_limit_depth = mcontext->depth_limit; + mb->heap_limit = mcontext->heap_limit; } if (mb->match_limit > re->limit_match) @@ -3206,6 +3382,9 @@ if (mb->match_limit > re->limit_match) if (mb->match_limit_depth > re->limit_depth) mb->match_limit_depth = re->limit_depth; +if (mb->heap_limit > re->limit_heap) + mb->heap_limit = re->limit_heap; + mb->start_code = (PCRE2_UCHAR *)((uint8_t *)re + sizeof(pcre2_real_code)) + re->name_count * re->name_entry_size; mb->tables = re->tables; @@ -3215,6 +3394,7 @@ mb->start_offset = start_offset; mb->moptions = options; mb->poptions = re->overall_options; mb->match_call_count = 0; +mb->heap_used = 0; /* Process the \R and newline settings. */ @@ -3351,8 +3531,6 @@ a match. */ for (;;) { - int rc; - /* ----------------- Start of match optimizations ---------------- */ /* There are some optimizations that avoid running the match if a known @@ -3544,7 +3722,7 @@ for (;;) in characters, we treat it as code units to avoid spending too much time in this optimization. */ - if (end_subject - start_match < re->minlength) return PCRE2_ERROR_NOMATCH; + if (end_subject - start_match < re->minlength) goto NOMATCH_EXIT; /* If req_cu is set, we know that that code unit must appear in the subject for the match to succeed. If the first code unit is set, req_cu @@ -3621,7 +3799,8 @@ for (;;) (uint32_t)match_data->oveccount * 2, /* actual size of same */ workspace, /* workspace vector */ (int)wscount, /* size of same */ - 0); /* function recurse level */ + 0, /* function recurse level */ + base_recursion_workspace); /* initial workspace for recursion */ /* Anything other than "no match" means we are done, always; otherwise, carry on only if not anchored. */ @@ -3637,7 +3816,7 @@ for (;;) match_data->rightchar = (PCRE2_SIZE)( mb->last_used_ptr - subject); match_data->startchar = (PCRE2_SIZE)(start_match - subject); match_data->rc = rc; - return rc; + goto EXIT; } /* Advance to the next subject character unless we are at the end of a line @@ -3668,8 +3847,18 @@ for (;;) } /* "Bumpalong" loop */ +NOMATCH_EXIT: +rc = PCRE2_ERROR_NOMATCH; + +EXIT: +while (rws->next != NULL) + { + RWS_anchor *next = rws->next; + rws->next = next->next; + mb->memctl.free(next, mb->memctl.memory_data); + } -return PCRE2_ERROR_NOMATCH; +return rc; } /* End of pcre2_dfa_match.c */ diff --git a/thirdparty/pcre2/src/pcre2_error.c b/thirdparty/pcre2/src/pcre2_error.c index d98cae9963..4b3b3f1bc0 100644 --- a/thirdparty/pcre2/src/pcre2_error.c +++ b/thirdparty/pcre2/src/pcre2_error.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -107,7 +107,7 @@ static const unsigned char compile_error_texts[] = /* 35 */ "lookbehind is too complicated\0" "\\C is not allowed in a lookbehind assertion in UTF-" XSTRING(PCRE2_CODE_UNIT_WIDTH) " mode\0" - "PCRE does not support \\L, \\l, \\N{name}, \\U, or \\u\0" + "PCRE2 does not support \\F, \\L, \\l, \\N{name}, \\U, or \\u\0" "number after (?C is greater than 255\0" "closing parenthesis for (?C expected\0" /* 40 */ @@ -133,7 +133,8 @@ static const unsigned char compile_error_texts[] = "internal error: unknown newline setting\0" "\\g is not followed by a braced, angle-bracketed, or quoted name/number or by a plain number\0" "(?R (recursive pattern call) must be followed by a closing parenthesis\0" - "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0" + /* "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)\0" */ + "obsolete error (should not occur)\0" /* Was the above */ /* 60 */ "(*VERB) not recognized or malformed\0" "group number is too big\0" @@ -160,7 +161,7 @@ static const unsigned char compile_error_texts[] = "using UCP is disabled by the application\0" "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)\0" "character code point value in \\u.... sequence is too large\0" - "digits missing in \\x{} or \\o{}\0" + "digits missing in \\x{} or \\o{} or \\N{U+}\0" "syntax error or number too big in (?(VERSION condition\0" /* 80 */ "internal error: unknown opcode in auto_possessify()\0" @@ -178,6 +179,8 @@ static const unsigned char compile_error_texts[] = "internal error: bad code value in parsed_skip()\0" "PCRE2_EXTRA_ALLOW_SURROGATE_ESCAPES is not allowed in UTF-16 mode\0" "invalid option bits with PCRE2_LITERAL\0" + "\\N{U+dddd} is supported only in Unicode (UTF) mode\0" + "invalid hyphen in option setting\0" ; /* Match-time and UTF error texts are in the same format. */ @@ -255,11 +258,13 @@ static const unsigned char match_error_texts[] = "expected closing curly bracket in replacement string\0" "bad substitution in replacement string\0" /* 60 */ - "match with end before start is not supported\0" + "match with end before start or start moved backwards is not supported\0" "too many replacements (more than INT_MAX)\0" "bad serialized data\0" "heap limit exceeded\0" "invalid syntax\0" + /* 65 */ + "internal error - duplicate substitution match\0" ; diff --git a/thirdparty/pcre2/src/pcre2_extuni.c b/thirdparty/pcre2/src/pcre2_extuni.c index 11a0bfbdd6..237211abf7 100644 --- a/thirdparty/pcre2/src/pcre2_extuni.c +++ b/thirdparty/pcre2/src/pcre2_extuni.c @@ -129,11 +129,11 @@ while (eptr < end_subject) if ((ricount & 1) != 0) break; /* Grapheme break required */ } - /* If Extend follows E_Base[_GAZ] do not update lgb; this allows - any number of Extend before a following E_Modifier. */ + /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this + allows any number of them before a following Extended_Pictographic. */ - if (rgb != ucp_gbExtend || - (lgb != ucp_gbE_Base && lgb != ucp_gbE_Base_GAZ)) + if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) || + lgb != ucp_gbExtended_Pictographic) lgb = rgb; eptr += len; diff --git a/thirdparty/pcre2/src/pcre2_find_bracket.c b/thirdparty/pcre2/src/pcre2_find_bracket.c index 357385a11c..70baa1394f 100644 --- a/thirdparty/pcre2/src/pcre2_find_bracket.c +++ b/thirdparty/pcre2/src/pcre2_find_bracket.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -131,6 +131,7 @@ for (;;) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: diff --git a/thirdparty/pcre2/src/pcre2_internal.h b/thirdparty/pcre2/src/pcre2_internal.h index 3db9d604f4..8750f2f174 100644 --- a/thirdparty/pcre2/src/pcre2_internal.h +++ b/thirdparty/pcre2/src/pcre2_internal.h @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -165,6 +165,16 @@ by "configure". */ #define INT64_OR_DOUBLE double #endif +/* External (in the C sense) functions and tables that are private to the +libraries are always referenced using the PRIV macro. This makes it possible +for pcre2test.c to include some of the source files from the libraries using a +different PRIV definition to avoid name clashes. It also makes it clear in the +code that a non-static object is being referenced. */ + +#ifndef PRIV +#define PRIV(name) _pcre2_##name +#endif + /* When compiling for use with the Virtual Pascal compiler, these functions need to have their names changed. PCRE2 must be compiled with the -DVPCOMPAT option on the command line. */ @@ -178,50 +188,15 @@ option on the command line. */ #define memset(s,c,n) _memset(s,c,n) #else /* VPCOMPAT */ -/* To cope with SunOS4 and other systems that lack memmove() but have bcopy(), -define a macro for memmove() if HAVE_MEMMOVE is false, provided that HAVE_BCOPY -is set. Otherwise, include an emulating function for those systems that have -neither (there some non-Unix environments where this is the case). */ +/* Otherwise, to cope with SunOS4 and other systems that lack memmove(), define +a macro that calls an emulating function. */ #ifndef HAVE_MEMMOVE -#undef memmove /* some systems may have a macro */ -#ifdef HAVE_BCOPY -#define memmove(a, b, c) bcopy(b, a, c) -#else /* HAVE_BCOPY */ -static void * -pcre2_memmove(void *d, const void *s, size_t n) -{ -size_t i; -unsigned char *dest = (unsigned char *)d; -const unsigned char *src = (const unsigned char *)s; -if (dest > src) - { - dest += n; - src += n; - for (i = 0; i < n; ++i) *(--dest) = *(--src); - return (void *)dest; - } -else - { - for (i = 0; i < n; ++i) *dest++ = *src++; - return (void *)(dest - n); - } -} -#define memmove(a, b, c) pcre2_memmove(a, b, c) -#endif /* not HAVE_BCOPY */ +#undef memmove /* Some systems may have a macro */ +#define memmove(a, b, c) PRIV(memmove)(a, b, c) #endif /* not HAVE_MEMMOVE */ #endif /* not VPCOMPAT */ -/* External (in the C sense) functions and tables that are private to the -libraries are always referenced using the PRIV macro. This makes it possible -for pcre2test.c to include some of the source files from the libraries using a -different PRIV definition to avoid name clashes. It also makes it clear in the -code that a non-static object is being referenced. */ - -#ifndef PRIV -#define PRIV(name) _pcre2_##name -#endif - /* This is an unsigned int value that no UTF character can ever have, as Unicode doesn't go beyond 0x0010ffff. */ @@ -247,12 +222,17 @@ not rely on this. */ pcre2_match() is allocated on the system stack, of this size (bytes). The size must be a multiple of sizeof(PCRE2_SPTR) in all environments, so making it a multiple of 8 is best. Typical frame sizes are a few hundred bytes (it depends -on the number of capturing parentheses) so 20K handles quite a few frames. A +on the number of capturing parentheses) so 20KiB handles quite a few frames. A larger vector on the heap is obtained for patterns that need more frames. The maximum size of this can be limited. */ #define START_FRAMES_SIZE 20480 +/* Similarly, for DFA matching, an initial internal workspace vector is +allocated on the stack. */ + +#define DFA_START_RWS_SIZE 30720 + /* Define the default BSR convention. */ #ifdef BSR_ANYCRLF @@ -585,14 +565,15 @@ these tables. */ #define cbit_cntrl 288 /* [:cntrl:] */ #define cbit_length 320 /* Length of the cbits table */ -/* Bit definitions for entries in the ctypes table. */ +/* Bit definitions for entries in the ctypes table. Do not change these values +without checking pcre2_jit_compile.c, which has an assertion to ensure that +ctype_word has the value 16. */ #define ctype_space 0x01 #define ctype_letter 0x02 #define ctype_digit 0x04 -#define ctype_xdigit 0x08 +#define ctype_xdigit 0x08 /* not actually used any more */ #define ctype_word 0x10 /* alphanumeric or '_' */ -#define ctype_meta 0x80 /* regexp meta char or zero (end pattern) */ /* Offsets of the various tables from the base tables pointer, and total length of the tables. */ @@ -1267,36 +1248,6 @@ contain characters with values greater than 255. */ #define XCL_PROP 3 /* Unicode property (2-byte property code follows) */ #define XCL_NOTPROP 4 /* Unicode inverted property (ditto) */ -/* Escape items that are just an encoding of a particular data value. These -appear in the escapes[] table in pcre2_compile.c as positive numbers. */ - -#ifndef ESC_a -#define ESC_a CHAR_BEL -#endif - -#ifndef ESC_e -#define ESC_e CHAR_ESC -#endif - -#ifndef ESC_f -#define ESC_f CHAR_FF -#endif - -#ifndef ESC_n -#define ESC_n CHAR_LF -#endif - -#ifndef ESC_r -#define ESC_r CHAR_CR -#endif - -/* We can't officially use ESC_t because it is a POSIX reserved identifier -(presumably because of all the others like size_t). */ - -#ifndef ESC_tee -#define ESC_tee CHAR_HT -#endif - /* These are escaped items that aren't just an encoding of a particular data value such as \n. They must have non-zero values, as check_escape() returns 0 for a data character. In the escapes[] table in pcre2_compile.c their values @@ -1578,23 +1529,26 @@ enum { OP_THEN, /* 155 */ OP_THEN_ARG, /* 156 same, but with argument */ OP_COMMIT, /* 157 */ + OP_COMMIT_ARG, /* 158 same, but with argument */ - /* These are forced failure and success verbs */ + /* These are forced failure and success verbs. FAIL and ACCEPT do accept an + argument, but these cases can be compiled as, for example, (*MARK:X)(*FAIL) + without the need for a special opcode. */ - OP_FAIL, /* 158 */ - OP_ACCEPT, /* 159 */ - OP_ASSERT_ACCEPT, /* 160 Used inside assertions */ - OP_CLOSE, /* 161 Used before OP_ACCEPT to close open captures */ + OP_FAIL, /* 159 */ + OP_ACCEPT, /* 160 */ + OP_ASSERT_ACCEPT, /* 161 Used inside assertions */ + OP_CLOSE, /* 162 Used before OP_ACCEPT to close open captures */ /* This is used to skip a subpattern with a {0} quantifier */ - OP_SKIPZERO, /* 162 */ + OP_SKIPZERO, /* 163 */ /* This is used to identify a DEFINE group during compilation so that it can be checked for having only one branch. It is changed to OP_FALSE before compilation finishes. */ - OP_DEFINE, /* 163 */ + OP_DEFINE, /* 164 */ /* This is not an opcode, but is used to check that tables indexed by opcode are the correct length, in order to catch updating errors - there have been @@ -1650,7 +1604,7 @@ some cases doesn't actually use these names at all). */ "Cond false", "Cond true", \ "Brazero", "Braminzero", "Braposzero", \ "*MARK", "*PRUNE", "*PRUNE", "*SKIP", "*SKIP", \ - "*THEN", "*THEN", "*COMMIT", "*FAIL", \ + "*THEN", "*THEN", "*COMMIT", "*COMMIT", "*FAIL", \ "*ACCEPT", "*ASSERT_ACCEPT", \ "Close", "Skip zero", "Define" @@ -1742,7 +1696,8 @@ in UTF-8 mode. The code that uses this table must know about such things. */ 3, 1, 3, /* MARK, PRUNE, PRUNE_ARG */ \ 1, 3, /* SKIP, SKIP_ARG */ \ 1, 3, /* THEN, THEN_ARG */ \ - 1, 1, 1, 1, /* COMMIT, FAIL, ACCEPT, ASSERT_ACCEPT */ \ + 1, 3, /* COMMIT, COMMIT_ARG */ \ + 1, 1, 1, /* FAIL, ACCEPT, ASSERT_ACCEPT */ \ 1+IMM2_SIZE, 1, /* CLOSE, SKIPZERO */ \ 1 /* DEFINE */ @@ -1896,7 +1851,7 @@ extern const ucd_record PRIV(ucd_records)[]; #if PCRE2_CODE_UNIT_WIDTH == 32 extern const ucd_record PRIV(dummy_ucd_record)[]; #endif -extern const uint8_t PRIV(ucd_stage1)[]; +extern const uint16_t PRIV(ucd_stage1)[]; extern const uint16_t PRIV(ucd_stage2)[]; extern const uint32_t PRIV(ucp_gbtable)[]; extern const uint32_t PRIV(ucp_gentype)[]; @@ -1976,6 +1931,14 @@ extern int _pcre2_valid_utf(PCRE2_SPTR, PCRE2_SIZE, PCRE2_SIZE *); extern BOOL _pcre2_was_newline(PCRE2_SPTR, uint32_t, PCRE2_SPTR, uint32_t *, BOOL); extern BOOL _pcre2_xclass(uint32_t, PCRE2_SPTR, BOOL); + +/* This function is needed only when memmove() is not available. */ + +#if !defined(VPCOMPAT) && !defined(HAVE_MEMMOVE) +#define _pcre2_memmove PCRE2_SUFFIX(_pcre2_memmove) +extern void * _pcre2_memmove(void *, const void *, size_t); +#endif + #endif /* PCRE2_CODE_UNIT_WIDTH */ #endif /* PCRE2_INTERNAL_H_IDEMPOTENT_GUARD */ diff --git a/thirdparty/pcre2/src/pcre2_intmodedep.h b/thirdparty/pcre2/src/pcre2_intmodedep.h index c4c4c3adb9..62626d0a8a 100644 --- a/thirdparty/pcre2/src/pcre2_intmodedep.h +++ b/thirdparty/pcre2/src/pcre2_intmodedep.h @@ -793,11 +793,23 @@ typedef struct heapframe { uint8_t return_id; /* Where to go on in internal "return" */ uint8_t op; /* Processing opcode */ + /* At this point, the structure is 16-bit aligned. On most architectures + the alignment requirement for a pointer will ensure that the eptr field below + is 32-bit or 64-bit aligned. However, on m68k it is fine to have a pointer + that is 16-bit aligned. We must therefore ensure that what comes between here + and eptr is an odd multiple of 16 bits so as to get back into 32-bit + alignment. This happens naturally when PCRE2_UCHAR is 8 bits wide, but needs + fudges in the other cases. In the 32-bit case the padding comes first so that + the occu field itself is 32-bit aligned. Without the padding, this structure + is no longer a multiple of PCRE2_SIZE on m68k, and the check below fails. */ + #if PCRE2_CODE_UNIT_WIDTH == 8 PCRE2_UCHAR occu[6]; /* Used for other case code units */ #elif PCRE2_CODE_UNIT_WIDTH == 16 PCRE2_UCHAR occu[2]; /* Used for other case code units */ + uint8_t unused[2]; /* Ensure 32-bit alignment (see above) */ #else + uint8_t unused[2]; /* Ensure 32-bit alignment (see above) */ PCRE2_UCHAR occu[1]; /* Used for other case code units */ #endif @@ -818,6 +830,9 @@ typedef struct heapframe { PCRE2_SIZE ovector[131072]; /* Must be last in the structure */ } heapframe; +/* This typedef is a check that the size of the heapframe structure is a +multiple of PCRE2_SIZE. See various comments above. */ + typedef char check_heapframe_size[ ((sizeof(heapframe) % sizeof(PCRE2_SIZE)) == 0)? (+1):(-1)]; @@ -881,6 +896,8 @@ typedef struct dfa_match_block { PCRE2_SPTR last_used_ptr; /* Latest consulted character */ const uint8_t *tables; /* Character tables */ PCRE2_SIZE start_offset; /* The start offset value */ + PCRE2_SIZE heap_limit; /* As it says */ + PCRE2_SIZE heap_used; /* As it says */ uint32_t match_limit; /* As it says */ uint32_t match_limit_depth; /* As it says */ uint32_t match_call_count; /* Number of calls of internal function */ diff --git a/thirdparty/pcre2/src/pcre2_jit_compile.c b/thirdparty/pcre2/src/pcre2_jit_compile.c index 80ed1c4ca6..32e985b793 100644 --- a/thirdparty/pcre2/src/pcre2_jit_compile.c +++ b/thirdparty/pcre2/src/pcre2_jit_compile.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -839,6 +839,7 @@ switch(*cc) #endif case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: @@ -939,6 +940,7 @@ while (cc < ccend) common->control_head_ptr = 1; /* Fall through. */ + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_MARK: if (common->mark_ptr == 0) @@ -1553,6 +1555,7 @@ while (cc < ccend) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_THEN_ARG: SLJIT_ASSERT(common->mark_ptr != 0); @@ -1733,6 +1736,7 @@ while (cc < ccend) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_THEN_ARG: SLJIT_ASSERT(common->mark_ptr != 0); @@ -2041,6 +2045,7 @@ while (cc < ccend) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_THEN_ARG: SLJIT_ASSERT(common->mark_ptr != 0); @@ -2428,6 +2433,7 @@ while (cc < ccend) break; case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_THEN_ARG: SLJIT_ASSERT(common->mark_ptr != 0); @@ -3666,7 +3672,8 @@ if (!common->utf) #endif OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT); -OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1)); +OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1); +OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1)); OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK); OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT); OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0); @@ -5894,6 +5901,8 @@ for (i = 0; i < 32; i++) } } +if (len == 0) return FALSE; /* Should never occur, but stops analyzers complaining. */ + i = 0; j = 0; @@ -6627,7 +6636,8 @@ if (needstype || needsscript) #endif OP2(SLJIT_LSHR, TMP2, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_SHIFT); - OP1(SLJIT_MOV_U8, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1)); + OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, 1); + OP1(SLJIT_MOV_U16, TMP2, 0, SLJIT_MEM1(TMP2), (sljit_sw)PRIV(ucd_stage1)); OP2(SLJIT_AND, TMP1, 0, TMP1, 0, SLJIT_IMM, UCD_BLOCK_MASK); OP2(SLJIT_SHL, TMP2, 0, TMP2, 0, SLJIT_IMM, UCD_BLOCK_SHIFT); OP2(SLJIT_ADD, TMP1, 0, TMP1, 0, TMP2, 0); @@ -7254,10 +7264,11 @@ while (cc < end_subject) if ((ricount & 1) != 0) break; /* Grapheme break required */ } - /* If Extend follows E_Base[_GAZ] do not update lgb; this allows - any number of Extend before a following E_Modifier. */ + /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this + allows any number of them before a following Extended_Pictographic. */ - if (rgb != ucp_gbExtend || (lgb != ucp_gbE_Base && lgb != ucp_gbE_Base_GAZ)) + if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) || + lgb != ucp_gbExtended_Pictographic) lgb = rgb; prevcc = cc; @@ -7309,10 +7320,11 @@ while (cc < end_subject) if ((ricount & 1) != 0) break; /* Grapheme break required */ } - /* If Extend follows E_Base[_GAZ] do not update lgb; this allows - any number of Extend before a following E_Modifier. */ + /* If Extend or ZWJ follows Extended_Pictographic, do not update lgb; this + allows any number of them before a following Extended_Pictographic. */ - if (rgb != ucp_gbExtend || (lgb != ucp_gbE_Base && lgb != ucp_gbE_Base_GAZ)) + if ((rgb != ucp_gbExtend && rgb != ucp_gbZWJ) || + lgb != ucp_gbExtended_Pictographic) lgb = rgb; cc++; @@ -10346,7 +10358,8 @@ backtrack_common *backtrack; PCRE2_UCHAR opcode = *cc; PCRE2_SPTR ccend = cc + 1; -if (opcode == OP_PRUNE_ARG || opcode == OP_SKIP_ARG || opcode == OP_THEN_ARG) +if (opcode == OP_COMMIT_ARG || opcode == OP_PRUNE_ARG || + opcode == OP_SKIP_ARG || opcode == OP_THEN_ARG) ccend += 2 + cc[1]; PUSH_BACKTRACK(sizeof(backtrack_common), cc, NULL); @@ -10358,7 +10371,7 @@ if (opcode == OP_SKIP) return ccend; } -if (opcode == OP_PRUNE_ARG || opcode == OP_THEN_ARG) +if (opcode == OP_COMMIT_ARG || opcode == OP_PRUNE_ARG || opcode == OP_THEN_ARG) { OP1(SLJIT_MOV, TMP1, 0, ARGUMENTS, 0); OP1(SLJIT_MOV, TMP2, 0, SLJIT_IMM, (sljit_sw)(cc + 2)); @@ -10677,6 +10690,7 @@ while (cc < ccend) case OP_THEN: case OP_THEN_ARG: case OP_COMMIT: + case OP_COMMIT_ARG: cc = compile_control_verb_matchingpath(common, cc, parent); break; @@ -11751,6 +11765,7 @@ while (current) break; case OP_COMMIT: + case OP_COMMIT_ARG: if (!common->local_quit_available) OP1(SLJIT_MOV, SLJIT_RETURN_REG, 0, SLJIT_IMM, PCRE2_ERROR_NOMATCH); if (common->quit_label == NULL) diff --git a/thirdparty/pcre2/src/pcre2_maketables.c b/thirdparty/pcre2/src/pcre2_maketables.c index 2c7ae84d86..537edba8c3 100644 --- a/thirdparty/pcre2/src/pcre2_maketables.c +++ b/thirdparty/pcre2/src/pcre2_maketables.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -141,13 +141,6 @@ for (i = 0; i < 256; i++) if (isdigit(i)) x += ctype_digit; if (isxdigit(i)) x += ctype_xdigit; if (isalnum(i) || i == '_') x += ctype_word; - - /* Note: strchr includes the terminating zero in the characters it considers. - In this instance, that is ok because we want binary zero to be flagged as a - meta-character, which in this sense is any character that terminates a run - of data characters. */ - - if (strchr("\\*+?{^.$|()[", i) != 0) x += ctype_meta; *p++ = x; } diff --git a/thirdparty/pcre2/src/pcre2_match.c b/thirdparty/pcre2/src/pcre2_match.c index 79cc93f918..8741e1432d 100644 --- a/thirdparty/pcre2/src/pcre2_match.c +++ b/thirdparty/pcre2/src/pcre2_match.c @@ -43,11 +43,11 @@ POSSIBILITY OF SUCH DAMAGE. #include "config.h" #endif -/* These defines enables debugging code */ +/* These defines enable debugging code */ -//#define DEBUG_FRAMES_DISPLAY -//#define DEBUG_SHOW_OPS -//#define DEBUG_SHOW_RMATCH +/* #define DEBUG_FRAMES_DISPLAY */ +/* #define DEBUG_SHOW_OPS */ +/* #define DEBUG_SHOW_RMATCH */ #ifdef DEBUG_FRAME_DISPLAY #include <stdarg.h> @@ -149,7 +149,7 @@ changed, the code at RETURN_SWITCH below must be updated in sync. */ enum { RM1=1, RM2, RM3, RM4, RM5, RM6, RM7, RM8, RM9, RM10, RM11, RM12, RM13, RM14, RM15, RM16, RM17, RM18, RM19, RM20, RM21, RM22, RM23, RM24, RM25, RM26, RM27, RM28, RM29, RM30, - RM31, RM32, RM33, RM34, RM35 }; + RM31, RM32, RM33, RM34, RM35, RM36 }; #ifdef SUPPORT_WIDE_CHARS enum { RM100=100, RM101 }; @@ -770,7 +770,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); /* ===================================================================== */ /* Real or forced end of the pattern, assertion, or recursion. In an assertion ACCEPT, update the last used pointer and remember the current - frame so that the captures can be fished out of it. */ + frame so that the captures and mark can be fished out of it. */ case OP_ASSERT_ACCEPT: if (Feptr > mb->last_used_ptr) mb->last_used_ptr = Feptr; @@ -1776,7 +1776,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); /* ===================================================================== */ - /* Match a bit-mapped character class, possibly repeatedly. These op codes + /* Match a bit-mapped character class, possibly repeatedly. These opcodes are used when all the characters in the class have values in the range 0-255, and either the matching is caseful, or the characters are in the range 0-127 when UTF processing is enabled. The only difference between @@ -1962,11 +1962,15 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ + /* After \C in UTF mode, Lstart_eptr might be in the middle of a + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ + for (;;) { RMATCH(Fecode, RM201); if (rrc != MATCH_NOMATCH) RRETURN(rrc); - if (Feptr-- == Lstart_eptr) break; /* Tried at original position */ + if (Feptr-- <= Lstart_eptr) break; /* Tried at original position */ BACKCHAR(Feptr); } } @@ -2126,11 +2130,15 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ + /* After \C in UTF mode, Lstart_eptr might be in the middle of a + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ + for(;;) { RMATCH(Fecode, RM101); if (rrc != MATCH_NOMATCH) RRETURN(rrc); - if (Feptr-- == Lstart_eptr) break; /* Tried at original position */ + if (Feptr-- <= Lstart_eptr) break; /* Tried at original position */ #ifdef SUPPORT_UNICODE if (utf) BACKCHAR(Feptr); #endif @@ -2456,7 +2464,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); /* ===================================================================== */ /* Match a single character type repeatedly. Note that the property type - does not need to be in a stack frame as it not used within an RMATCH() + does not need to be in a stack frame as it is not used within an RMATCH() loop. */ #define Lstart_eptr F->temp_sptr[0] @@ -4002,8 +4010,8 @@ fprintf(stderr, "++ op=%d\n", *Fecode); if (reptype == REPTYPE_POS) continue; /* No backtracking */ /* After \C in UTF mode, Lstart_eptr might be in the middle of a - Unicode character. Use <= pp to ensure backtracking doesn't go too far. - */ + Unicode character. Use <= Lstart_eptr to ensure backtracking doesn't + go too far. */ for(;;) { @@ -4135,7 +4143,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); } break; - /* The "byte" (i.e. "code unit") case is the same as non-UTF */ + /* The "byte" (i.e. "code unit") case is the same as non-UTF */ case OP_ANYBYTE: fc = Lmax - Lmin; @@ -5111,7 +5119,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); /* Positive assertions are like other groups except that PCRE doesn't allow the effect of (*THEN) to escape beyond an assertion; it is therefore treated as NOMATCH. (*ACCEPT) is treated as successful assertion, with its - captures retained. Any other return is an error. */ + captures and mark retained. Any other return is an error. */ #define Lframe_type F->temp_32[0] @@ -5128,6 +5136,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); (char *)assert_accept_frame + offsetof(heapframe, ovector), assert_accept_frame->offset_top * sizeof(PCRE2_SIZE)); Foffset_top = assert_accept_frame->offset_top; + Fmark = assert_accept_frame->mark; break; } if (rrc != MATCH_NOMATCH && rrc != MATCH_THEN) RRETURN(rrc); @@ -5416,7 +5425,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); Feptr -= number; } - /* Save the earliest consulted character, then skip to next op code */ + /* Save the earliest consulted character, then skip to next opcode */ if (Feptr < mb->start_used_ptr) mb->start_used_ptr = Feptr; Fecode += 1 + LINK_SIZE; @@ -5501,7 +5510,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode); frame so that it points to the final branch. */ case OP_ONCE: - Fback_frame = ((char *)F - (char *)P) + frame_size; + Fback_frame = ((char *)F - (char *)P); for (;;) { uint32_t y = GET(P->ecode,1); @@ -5829,6 +5838,13 @@ fprintf(stderr, "++ op=%d\n", *Fecode); mb->verb_current_recurse = Fcurrent_recurse; RRETURN(MATCH_COMMIT); + case OP_COMMIT_ARG: + Fmark = mb->nomatch_mark = Fecode + 2; + RMATCH(Fecode + PRIV(OP_lengths)[*Fecode] + Fecode[1], RM36); + if (rrc != MATCH_NOMATCH) RRETURN(rrc); + mb->verb_current_recurse = Fcurrent_recurse; + RRETURN(MATCH_COMMIT); + case OP_PRUNE: RMATCH(Fecode + PRIV(OP_lengths)[*Fecode], RM14); if (rrc != MATCH_NOMATCH) RRETURN(rrc); @@ -5921,7 +5937,7 @@ in rrc. */ RETURN_SWITCH: if (Frdepth == 0) return rrc; /* Exit from the top level */ -F = (heapframe *)((char *)F - Fback_frame); /* Back track */ +F = (heapframe *)((char *)F - Fback_frame); /* Backtrack */ mb->cb->callout_flags |= PCRE2_CALLOUT_BACKTRACK; /* Note for callouts */ #ifdef DEBUG_SHOW_RMATCH @@ -5934,7 +5950,7 @@ switch (Freturn_id) LBL( 9) LBL(10) LBL(11) LBL(12) LBL(13) LBL(14) LBL(15) LBL(16) LBL(17) LBL(18) LBL(19) LBL(20) LBL(21) LBL(22) LBL(23) LBL(24) LBL(25) LBL(26) LBL(27) LBL(28) LBL(29) LBL(30) LBL(31) LBL(32) - LBL(33) LBL(34) LBL(35) + LBL(33) LBL(34) LBL(35) LBL(36) #ifdef SUPPORT_WIDE_CHARS LBL(100) LBL(101) @@ -6275,7 +6291,7 @@ mb->match_limit_depth = (mcontext->depth_limit < re->limit_depth)? /* If a pattern has very many capturing parentheses, the frame size may be very large. Ensure that there are at least 10 available frames by getting an initial vector on the heap if necessary, except when the heap limit prevents this. Get -fewer if possible. (The heap limit is in kilobytes.) */ +fewer if possible. (The heap limit is in kibibytes.) */ if (frame_size <= START_FRAMES_SIZE/10) { diff --git a/thirdparty/pcre2/src/pcre2_pattern_info.c b/thirdparty/pcre2/src/pcre2_pattern_info.c index 906e9198f5..a29f5eff67 100644 --- a/thirdparty/pcre2/src/pcre2_pattern_info.c +++ b/thirdparty/pcre2/src/pcre2_pattern_info.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -390,6 +390,7 @@ while (TRUE) #endif case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: diff --git a/thirdparty/pcre2/src/pcre2_serialize.c b/thirdparty/pcre2/src/pcre2_serialize.c index d2cc603cbb..cec1a035d1 100644 --- a/thirdparty/pcre2/src/pcre2_serialize.c +++ b/thirdparty/pcre2/src/pcre2_serialize.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -127,7 +127,25 @@ dst_bytes += tables_length; for (i = 0; i < number_of_codes; i++) { re = (const pcre2_real_code *)(codes[i]); - memcpy(dst_bytes, (char *)re, re->blocksize); + (void)memcpy(dst_bytes, (char *)re, re->blocksize); + + /* Certain fields in the compiled code block are re-set during + deserialization. In order to ensure that the serialized data stream is always + the same for the same pattern, set them to zero here. We can't assume the + copy of the pattern is correctly aligned for accessing the fields as part of + a structure. Note the use of sizeof(void *) in the second of these, to + specify the size of a pointer. If sizeof(uint8_t *) is used (tables is a + pointer to uint8_t), gcc gives a warning because the first argument is also a + pointer to uint8_t. Casting the first argument to (void *) can stop this, but + it didn't stop Coverity giving the same complaint. */ + + (void)memset(dst_bytes + offsetof(pcre2_real_code, memctl), 0, + sizeof(pcre2_memctl)); + (void)memset(dst_bytes + offsetof(pcre2_real_code, tables), 0, + sizeof(void *)); + (void)memset(dst_bytes + offsetof(pcre2_real_code, executable_jit), 0, + sizeof(void *)); + dst_bytes += re->blocksize; } diff --git a/thirdparty/pcre2/src/pcre2_string_utils.c b/thirdparty/pcre2/src/pcre2_string_utils.c index 2a1f282629..d6be01acf5 100644 --- a/thirdparty/pcre2/src/pcre2_string_utils.c +++ b/thirdparty/pcre2/src/pcre2_string_utils.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -51,6 +51,42 @@ functions work only on 8-bit data. */ /************************************************* +* Emulated memmove() for systems without it * +*************************************************/ + +/* This function can make use of bcopy() if it is available. Otherwise do it by +steam, as there some non-Unix environments that lack both memmove() and +bcopy(). */ + +#if !defined(VPCOMPAT) && !defined(HAVE_MEMMOVE) +void * +PRIV(memmove)(void *d, const void *s, size_t n) +{ +#ifdef HAVE_BCOPY +bcopy(s, d, n); +return d; +#else +size_t i; +unsigned char *dest = (unsigned char *)d; +const unsigned char *src = (const unsigned char *)s; +if (dest > src) + { + dest += n; + src += n; + for (i = 0; i < n; ++i) *(--dest) = *(--src); + return (void *)dest; + } +else + { + for (i = 0; i < n; ++i) *dest++ = *src++; + return (void *)(dest - n); + } +#endif /* not HAVE_BCOPY */ +} +#endif /* not VPCOMPAT && not HAVE_MEMMOVE */ + + +/************************************************* * Compare two zero-terminated PCRE2 strings * *************************************************/ diff --git a/thirdparty/pcre2/src/pcre2_study.c b/thirdparty/pcre2/src/pcre2_study.c index b92686759d..acbf98b41b 100644 --- a/thirdparty/pcre2/src/pcre2_study.c +++ b/thirdparty/pcre2/src/pcre2_study.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -707,6 +707,7 @@ for (;;) /* Skip these, but we need to add in the name length. */ case OP_MARK: + case OP_COMMIT_ARG: case OP_PRUNE_ARG: case OP_SKIP_ARG: case OP_THEN_ARG: @@ -956,6 +957,7 @@ do case OP_CIRCM: case OP_CLOSE: case OP_COMMIT: + case OP_COMMIT_ARG: case OP_COND: case OP_CREF: case OP_FALSE: @@ -1274,7 +1276,7 @@ do break; /* Single character types set the bits and stop. Note that if PCRE2_UCP - is set, we do not see these op codes because \d etc are converted to + is set, we do not see these opcodes because \d etc are converted to properties. Therefore, these apply in the case when only characters less than 256 are recognized to match the types. */ diff --git a/thirdparty/pcre2/src/pcre2_substitute.c b/thirdparty/pcre2/src/pcre2_substitute.c index 8da951fc6e..ab8d10908a 100644 --- a/thirdparty/pcre2/src/pcre2_substitute.c +++ b/thirdparty/pcre2/src/pcre2_substitute.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -238,10 +238,12 @@ PCRE2_SPTR repend; PCRE2_SIZE extra_needed = 0; PCRE2_SIZE buff_offset, buff_length, lengthleft, fraglength; PCRE2_SIZE *ovector; +PCRE2_SIZE ovecsave[3]; buff_offset = 0; lengthleft = buff_length = *blength; *blength = PCRE2_UNSET; +ovecsave[0] = ovecsave[1] = ovecsave[2] = PCRE2_UNSET; /* Partial matching is not valid. */ @@ -361,13 +363,33 @@ do } /* Handle a successful match. Matches that use \K to end before they start - are not supported. */ - - if (ovector[1] < ovector[0]) + or start before the current point in the subject are not supported. */ + + if (ovector[1] < ovector[0] || ovector[0] < start_offset) { rc = PCRE2_ERROR_BADSUBSPATTERN; goto EXIT; } + + /* Check for the same match as previous. This is legitimate after matching an + empty string that starts after the initial match offset. We have tried again + at the match point in case the pattern is one like /(?<=\G.)/ which can never + match at its starting point, so running the match achieves the bumpalong. If + we do get the same (null) match at the original match point, it isn't such a + pattern, so we now do the empty string magic. In all other cases, a repeat + match should never occur. */ + + if (ovecsave[0] == ovector[0] && ovecsave[1] == ovector[1]) + { + if (ovector[0] == ovector[1] && ovecsave[2] != start_offset) + { + goptions = PCRE2_NOTEMPTY_ATSTART | PCRE2_ANCHORED; + ovecsave[2] = start_offset; + continue; /* Back to the top of the loop */ + } + rc = PCRE2_ERROR_INTERNAL_DUPMATCH; + goto EXIT; + } /* Count substitutions with a paranoid check for integer overflow; surely no real call to this function would ever hit this! */ @@ -799,13 +821,18 @@ do } /* End handling a literal code unit */ } /* End of loop for scanning the replacement. */ - /* The replacement has been copied to the output. Update the start offset to - point to the rest of the subject string. If we matched an empty string, - do the magic for global matches. */ - - start_offset = ovector[1]; - goptions = (ovector[0] != ovector[1])? 0 : + /* The replacement has been copied to the output. Save the details of this + match. See above for how this data is used. If we matched an empty string, do + the magic for global matches. Finally, update the start offset to point to + the rest of the subject string. */ + + ovecsave[0] = ovector[0]; + ovecsave[1] = ovector[1]; + ovecsave[2] = start_offset; + + goptions = (ovector[0] != ovector[1] || ovector[0] > start_offset)? 0 : PCRE2_ANCHORED|PCRE2_NOTEMPTY_ATSTART; + start_offset = ovector[1]; } while ((suboptions & PCRE2_SUBSTITUTE_GLOBAL) != 0); /* Repeat "do" loop */ /* Copy the rest of the subject. */ diff --git a/thirdparty/pcre2/src/pcre2_tables.c b/thirdparty/pcre2/src/pcre2_tables.c index 9f8dc293aa..83d6f9de55 100644 --- a/thirdparty/pcre2/src/pcre2_tables.c +++ b/thirdparty/pcre2/src/pcre2_tables.c @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016-2017 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -137,9 +137,10 @@ const uint32_t PRIV(ucp_gentype)[] = { /* This table encodes the rules for finding the end of an extended grapheme cluster. Every code point has a grapheme break property which is one of the -ucp_gbXX values defined in pcre2_ucp.h. The 2-dimensional table is indexed by -the properties of two adjacent code points. The left property selects a word -from the table, and the right property selects a bit from that word like this: +ucp_gbXX values defined in pcre2_ucp.h. These changed between Unicode versions +10 and 11. The 2-dimensional table is indexed by the properties of two adjacent +code points. The left property selects a word from the table, and the right +property selects a bit from that word like this: PRIV(ucp_gbtable)[left-property] & (1 << right-property) @@ -166,49 +167,41 @@ are implementing). 6. Do not break after Prepend characters. -7. Do not break within emoji modifier sequences (E_Base or E_Base_GAZ followed - by E_Modifier). Extend characters are allowed before the modifier; this - cannot be represented in this table, the code has to deal with it. +7. Do not break within emoji modifier sequences or emoji zwj sequences. That + is, do not break between characters with the Extended_Pictographic property. + Extend and ZWJ characters are allowed between the characters; this cannot be + represented in this table, the code has to deal with it. -8. Do not break within emoji zwj sequences (ZWJ followed by Glue_After_Zwj or - E_Base_GAZ). - -9. Do not break within emoji flag sequences. That is, do not break between +8. Do not break within emoji flag sequences. That is, do not break between regional indicator (RI) symbols if there are an odd number of RI characters before the break point. This table encodes "join RI characters"; the code has to deal with checking for previous adjoining RIs. -10. Otherwise, break everywhere. +9. Otherwise, break everywhere. */ #define ESZ (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbZWJ) const uint32_t PRIV(ucp_gbtable)[] = { - (1<<ucp_gbLF), /* 0 CR */ - 0, /* 1 LF */ - 0, /* 2 Control */ - ESZ, /* 3 Extend */ - ESZ|(1<<ucp_gbPrepend)| /* 4 Prepend */ + (1<<ucp_gbLF), /* 0 CR */ + 0, /* 1 LF */ + 0, /* 2 Control */ + ESZ, /* 3 Extend */ + ESZ|(1<<ucp_gbPrepend)| /* 4 Prepend */ (1<<ucp_gbL)|(1<<ucp_gbV)|(1<<ucp_gbT)| (1<<ucp_gbLV)|(1<<ucp_gbLVT)|(1<<ucp_gbOther)| - (1<<ucp_gbRegionalIndicator)| - (1<<ucp_gbE_Base)|(1<<ucp_gbE_Modifier)| - (1<<ucp_gbE_Base_GAZ)| - (1<<ucp_gbZWJ)|(1<<ucp_gbGlue_After_Zwj), - ESZ, /* 5 SpacingMark */ - ESZ|(1<<ucp_gbL)|(1<<ucp_gbV)|(1<<ucp_gbLV)| /* 6 L */ + (1<<ucp_gbRegionalIndicator), + ESZ, /* 5 SpacingMark */ + ESZ|(1<<ucp_gbL)|(1<<ucp_gbV)|(1<<ucp_gbLV)| /* 6 L */ (1<<ucp_gbLVT), - ESZ|(1<<ucp_gbV)|(1<<ucp_gbT), /* 7 V */ - ESZ|(1<<ucp_gbT), /* 8 T */ - ESZ|(1<<ucp_gbV)|(1<<ucp_gbT), /* 9 LV */ - ESZ|(1<<ucp_gbT), /* 10 LVT */ - (1<<ucp_gbRegionalIndicator), /* 11 RegionalIndicator */ - ESZ, /* 12 Other */ - ESZ|(1<<ucp_gbE_Modifier), /* 13 E_Base */ - ESZ, /* 14 E_Modifier */ - ESZ|(1<<ucp_gbE_Modifier), /* 15 E_Base_GAZ */ - ESZ|(1<<ucp_gbGlue_After_Zwj)|(1<<ucp_gbE_Base_GAZ), /* 16 ZWJ */ - ESZ /* 12 Glue_After_Zwj */ + ESZ|(1<<ucp_gbV)|(1<<ucp_gbT), /* 7 V */ + ESZ|(1<<ucp_gbT), /* 8 T */ + ESZ|(1<<ucp_gbV)|(1<<ucp_gbT), /* 9 LV */ + ESZ|(1<<ucp_gbT), /* 10 LVT */ + (1<<ucp_gbRegionalIndicator), /* 11 RegionalIndicator */ + ESZ, /* 12 Other */ + ESZ, /* 13 ZWJ */ + ESZ|(1<<ucp_gbExtended_Pictographic) /* 14 Extended Pictographic */ }; #undef ESZ @@ -282,6 +275,7 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Cyrillic0 STR_C STR_y STR_r STR_i STR_l STR_l STR_i STR_c "\0" #define STRING_Deseret0 STR_D STR_e STR_s STR_e STR_r STR_e STR_t "\0" #define STRING_Devanagari0 STR_D STR_e STR_v STR_a STR_n STR_a STR_g STR_a STR_r STR_i "\0" +#define STRING_Dogra0 STR_D STR_o STR_g STR_r STR_a "\0" #define STRING_Duployan0 STR_D STR_u STR_p STR_l STR_o STR_y STR_a STR_n "\0" #define STRING_Egyptian_Hieroglyphs0 STR_E STR_g STR_y STR_p STR_t STR_i STR_a STR_n STR_UNDERSCORE STR_H STR_i STR_e STR_r STR_o STR_g STR_l STR_y STR_p STR_h STR_s "\0" #define STRING_Elbasan0 STR_E STR_l STR_b STR_a STR_s STR_a STR_n "\0" @@ -292,9 +286,11 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Grantha0 STR_G STR_r STR_a STR_n STR_t STR_h STR_a "\0" #define STRING_Greek0 STR_G STR_r STR_e STR_e STR_k "\0" #define STRING_Gujarati0 STR_G STR_u STR_j STR_a STR_r STR_a STR_t STR_i "\0" +#define STRING_Gunjala_Gondi0 STR_G STR_u STR_n STR_j STR_a STR_l STR_a STR_UNDERSCORE STR_G STR_o STR_n STR_d STR_i "\0" #define STRING_Gurmukhi0 STR_G STR_u STR_r STR_m STR_u STR_k STR_h STR_i "\0" #define STRING_Han0 STR_H STR_a STR_n "\0" #define STRING_Hangul0 STR_H STR_a STR_n STR_g STR_u STR_l "\0" +#define STRING_Hanifi_Rohingya0 STR_H STR_a STR_n STR_i STR_f STR_i STR_UNDERSCORE STR_R STR_o STR_h STR_i STR_n STR_g STR_y STR_a "\0" #define STRING_Hanunoo0 STR_H STR_a STR_n STR_u STR_n STR_o STR_o "\0" #define STRING_Hatran0 STR_H STR_a STR_t STR_r STR_a STR_n "\0" #define STRING_Hebrew0 STR_H STR_e STR_b STR_r STR_e STR_w "\0" @@ -330,6 +326,7 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Lydian0 STR_L STR_y STR_d STR_i STR_a STR_n "\0" #define STRING_M0 STR_M "\0" #define STRING_Mahajani0 STR_M STR_a STR_h STR_a STR_j STR_a STR_n STR_i "\0" +#define STRING_Makasar0 STR_M STR_a STR_k STR_a STR_s STR_a STR_r "\0" #define STRING_Malayalam0 STR_M STR_a STR_l STR_a STR_y STR_a STR_l STR_a STR_m "\0" #define STRING_Mandaic0 STR_M STR_a STR_n STR_d STR_a STR_i STR_c "\0" #define STRING_Manichaean0 STR_M STR_a STR_n STR_i STR_c STR_h STR_a STR_e STR_a STR_n "\0" @@ -337,6 +334,7 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Masaram_Gondi0 STR_M STR_a STR_s STR_a STR_r STR_a STR_m STR_UNDERSCORE STR_G STR_o STR_n STR_d STR_i "\0" #define STRING_Mc0 STR_M STR_c "\0" #define STRING_Me0 STR_M STR_e "\0" +#define STRING_Medefaidrin0 STR_M STR_e STR_d STR_e STR_f STR_a STR_i STR_d STR_r STR_i STR_n "\0" #define STRING_Meetei_Mayek0 STR_M STR_e STR_e STR_t STR_e STR_i STR_UNDERSCORE STR_M STR_a STR_y STR_e STR_k "\0" #define STRING_Mende_Kikakui0 STR_M STR_e STR_n STR_d STR_e STR_UNDERSCORE STR_K STR_i STR_k STR_a STR_k STR_u STR_i "\0" #define STRING_Meroitic_Cursive0 STR_M STR_e STR_r STR_o STR_i STR_t STR_i STR_c STR_UNDERSCORE STR_C STR_u STR_r STR_s STR_i STR_v STR_e "\0" @@ -364,6 +362,7 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Old_North_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_N STR_o STR_r STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0" #define STRING_Old_Permic0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_m STR_i STR_c "\0" #define STRING_Old_Persian0 STR_O STR_l STR_d STR_UNDERSCORE STR_P STR_e STR_r STR_s STR_i STR_a STR_n "\0" +#define STRING_Old_Sogdian0 STR_O STR_l STR_d STR_UNDERSCORE STR_S STR_o STR_g STR_d STR_i STR_a STR_n "\0" #define STRING_Old_South_Arabian0 STR_O STR_l STR_d STR_UNDERSCORE STR_S STR_o STR_u STR_t STR_h STR_UNDERSCORE STR_A STR_r STR_a STR_b STR_i STR_a STR_n "\0" #define STRING_Old_Turkic0 STR_O STR_l STR_d STR_UNDERSCORE STR_T STR_u STR_r STR_k STR_i STR_c "\0" #define STRING_Oriya0 STR_O STR_r STR_i STR_y STR_a "\0" @@ -397,6 +396,7 @@ strings to make sure that UTF-8 support works on EBCDIC platforms. */ #define STRING_Sk0 STR_S STR_k "\0" #define STRING_Sm0 STR_S STR_m "\0" #define STRING_So0 STR_S STR_o "\0" +#define STRING_Sogdian0 STR_S STR_o STR_g STR_d STR_i STR_a STR_n "\0" #define STRING_Sora_Sompeng0 STR_S STR_o STR_r STR_a STR_UNDERSCORE STR_S STR_o STR_m STR_p STR_e STR_n STR_g "\0" #define STRING_Soyombo0 STR_S STR_o STR_y STR_o STR_m STR_b STR_o "\0" #define STRING_Sundanese0 STR_S STR_u STR_n STR_d STR_a STR_n STR_e STR_s STR_e "\0" @@ -469,6 +469,7 @@ const char PRIV(utt_names)[] = STRING_Cyrillic0 STRING_Deseret0 STRING_Devanagari0 + STRING_Dogra0 STRING_Duployan0 STRING_Egyptian_Hieroglyphs0 STRING_Elbasan0 @@ -479,9 +480,11 @@ const char PRIV(utt_names)[] = STRING_Grantha0 STRING_Greek0 STRING_Gujarati0 + STRING_Gunjala_Gondi0 STRING_Gurmukhi0 STRING_Han0 STRING_Hangul0 + STRING_Hanifi_Rohingya0 STRING_Hanunoo0 STRING_Hatran0 STRING_Hebrew0 @@ -517,6 +520,7 @@ const char PRIV(utt_names)[] = STRING_Lydian0 STRING_M0 STRING_Mahajani0 + STRING_Makasar0 STRING_Malayalam0 STRING_Mandaic0 STRING_Manichaean0 @@ -524,6 +528,7 @@ const char PRIV(utt_names)[] = STRING_Masaram_Gondi0 STRING_Mc0 STRING_Me0 + STRING_Medefaidrin0 STRING_Meetei_Mayek0 STRING_Mende_Kikakui0 STRING_Meroitic_Cursive0 @@ -551,6 +556,7 @@ const char PRIV(utt_names)[] = STRING_Old_North_Arabian0 STRING_Old_Permic0 STRING_Old_Persian0 + STRING_Old_Sogdian0 STRING_Old_South_Arabian0 STRING_Old_Turkic0 STRING_Oriya0 @@ -584,6 +590,7 @@ const char PRIV(utt_names)[] = STRING_Sk0 STRING_Sm0 STRING_So0 + STRING_Sogdian0 STRING_Sora_Sompeng0 STRING_Soyombo0 STRING_Sundanese0 @@ -656,154 +663,161 @@ const ucp_type_table PRIV(utt)[] = { { 265, PT_SC, ucp_Cyrillic }, { 274, PT_SC, ucp_Deseret }, { 282, PT_SC, ucp_Devanagari }, - { 293, PT_SC, ucp_Duployan }, - { 302, PT_SC, ucp_Egyptian_Hieroglyphs }, - { 323, PT_SC, ucp_Elbasan }, - { 331, PT_SC, ucp_Ethiopic }, - { 340, PT_SC, ucp_Georgian }, - { 349, PT_SC, ucp_Glagolitic }, - { 360, PT_SC, ucp_Gothic }, - { 367, PT_SC, ucp_Grantha }, - { 375, PT_SC, ucp_Greek }, - { 381, PT_SC, ucp_Gujarati }, - { 390, PT_SC, ucp_Gurmukhi }, - { 399, PT_SC, ucp_Han }, - { 403, PT_SC, ucp_Hangul }, - { 410, PT_SC, ucp_Hanunoo }, - { 418, PT_SC, ucp_Hatran }, - { 425, PT_SC, ucp_Hebrew }, - { 432, PT_SC, ucp_Hiragana }, - { 441, PT_SC, ucp_Imperial_Aramaic }, - { 458, PT_SC, ucp_Inherited }, - { 468, PT_SC, ucp_Inscriptional_Pahlavi }, - { 490, PT_SC, ucp_Inscriptional_Parthian }, - { 513, PT_SC, ucp_Javanese }, - { 522, PT_SC, ucp_Kaithi }, - { 529, PT_SC, ucp_Kannada }, - { 537, PT_SC, ucp_Katakana }, - { 546, PT_SC, ucp_Kayah_Li }, - { 555, PT_SC, ucp_Kharoshthi }, - { 566, PT_SC, ucp_Khmer }, - { 572, PT_SC, ucp_Khojki }, - { 579, PT_SC, ucp_Khudawadi }, - { 589, PT_GC, ucp_L }, - { 591, PT_LAMP, 0 }, - { 594, PT_SC, ucp_Lao }, - { 598, PT_SC, ucp_Latin }, - { 604, PT_SC, ucp_Lepcha }, - { 611, PT_SC, ucp_Limbu }, - { 617, PT_SC, ucp_Linear_A }, - { 626, PT_SC, ucp_Linear_B }, - { 635, PT_SC, ucp_Lisu }, - { 640, PT_PC, ucp_Ll }, - { 643, PT_PC, ucp_Lm }, - { 646, PT_PC, ucp_Lo }, - { 649, PT_PC, ucp_Lt }, - { 652, PT_PC, ucp_Lu }, - { 655, PT_SC, ucp_Lycian }, - { 662, PT_SC, ucp_Lydian }, - { 669, PT_GC, ucp_M }, - { 671, PT_SC, ucp_Mahajani }, - { 680, PT_SC, ucp_Malayalam }, - { 690, PT_SC, ucp_Mandaic }, - { 698, PT_SC, ucp_Manichaean }, - { 709, PT_SC, ucp_Marchen }, - { 717, PT_SC, ucp_Masaram_Gondi }, - { 731, PT_PC, ucp_Mc }, - { 734, PT_PC, ucp_Me }, - { 737, PT_SC, ucp_Meetei_Mayek }, - { 750, PT_SC, ucp_Mende_Kikakui }, - { 764, PT_SC, ucp_Meroitic_Cursive }, - { 781, PT_SC, ucp_Meroitic_Hieroglyphs }, - { 802, PT_SC, ucp_Miao }, - { 807, PT_PC, ucp_Mn }, - { 810, PT_SC, ucp_Modi }, - { 815, PT_SC, ucp_Mongolian }, - { 825, PT_SC, ucp_Mro }, - { 829, PT_SC, ucp_Multani }, - { 837, PT_SC, ucp_Myanmar }, - { 845, PT_GC, ucp_N }, - { 847, PT_SC, ucp_Nabataean }, - { 857, PT_PC, ucp_Nd }, - { 860, PT_SC, ucp_New_Tai_Lue }, - { 872, PT_SC, ucp_Newa }, - { 877, PT_SC, ucp_Nko }, - { 881, PT_PC, ucp_Nl }, - { 884, PT_PC, ucp_No }, - { 887, PT_SC, ucp_Nushu }, - { 893, PT_SC, ucp_Ogham }, - { 899, PT_SC, ucp_Ol_Chiki }, - { 908, PT_SC, ucp_Old_Hungarian }, - { 922, PT_SC, ucp_Old_Italic }, - { 933, PT_SC, ucp_Old_North_Arabian }, - { 951, PT_SC, ucp_Old_Permic }, - { 962, PT_SC, ucp_Old_Persian }, - { 974, PT_SC, ucp_Old_South_Arabian }, - { 992, PT_SC, ucp_Old_Turkic }, - { 1003, PT_SC, ucp_Oriya }, - { 1009, PT_SC, ucp_Osage }, - { 1015, PT_SC, ucp_Osmanya }, - { 1023, PT_GC, ucp_P }, - { 1025, PT_SC, ucp_Pahawh_Hmong }, - { 1038, PT_SC, ucp_Palmyrene }, - { 1048, PT_SC, ucp_Pau_Cin_Hau }, - { 1060, PT_PC, ucp_Pc }, - { 1063, PT_PC, ucp_Pd }, - { 1066, PT_PC, ucp_Pe }, - { 1069, PT_PC, ucp_Pf }, - { 1072, PT_SC, ucp_Phags_Pa }, - { 1081, PT_SC, ucp_Phoenician }, - { 1092, PT_PC, ucp_Pi }, - { 1095, PT_PC, ucp_Po }, - { 1098, PT_PC, ucp_Ps }, - { 1101, PT_SC, ucp_Psalter_Pahlavi }, - { 1117, PT_SC, ucp_Rejang }, - { 1124, PT_SC, ucp_Runic }, - { 1130, PT_GC, ucp_S }, - { 1132, PT_SC, ucp_Samaritan }, - { 1142, PT_SC, ucp_Saurashtra }, - { 1153, PT_PC, ucp_Sc }, - { 1156, PT_SC, ucp_Sharada }, - { 1164, PT_SC, ucp_Shavian }, - { 1172, PT_SC, ucp_Siddham }, - { 1180, PT_SC, ucp_SignWriting }, - { 1192, PT_SC, ucp_Sinhala }, - { 1200, PT_PC, ucp_Sk }, - { 1203, PT_PC, ucp_Sm }, - { 1206, PT_PC, ucp_So }, - { 1209, PT_SC, ucp_Sora_Sompeng }, - { 1222, PT_SC, ucp_Soyombo }, - { 1230, PT_SC, ucp_Sundanese }, - { 1240, PT_SC, ucp_Syloti_Nagri }, - { 1253, PT_SC, ucp_Syriac }, - { 1260, PT_SC, ucp_Tagalog }, - { 1268, PT_SC, ucp_Tagbanwa }, - { 1277, PT_SC, ucp_Tai_Le }, - { 1284, PT_SC, ucp_Tai_Tham }, - { 1293, PT_SC, ucp_Tai_Viet }, - { 1302, PT_SC, ucp_Takri }, - { 1308, PT_SC, ucp_Tamil }, - { 1314, PT_SC, ucp_Tangut }, - { 1321, PT_SC, ucp_Telugu }, - { 1328, PT_SC, ucp_Thaana }, - { 1335, PT_SC, ucp_Thai }, - { 1340, PT_SC, ucp_Tibetan }, - { 1348, PT_SC, ucp_Tifinagh }, - { 1357, PT_SC, ucp_Tirhuta }, - { 1365, PT_SC, ucp_Ugaritic }, - { 1374, PT_SC, ucp_Vai }, - { 1378, PT_SC, ucp_Warang_Citi }, - { 1390, PT_ALNUM, 0 }, - { 1394, PT_PXSPACE, 0 }, - { 1398, PT_SPACE, 0 }, - { 1402, PT_UCNC, 0 }, - { 1406, PT_WORD, 0 }, - { 1410, PT_SC, ucp_Yi }, - { 1413, PT_GC, ucp_Z }, - { 1415, PT_SC, ucp_Zanabazar_Square }, - { 1432, PT_PC, ucp_Zl }, - { 1435, PT_PC, ucp_Zp }, - { 1438, PT_PC, ucp_Zs } + { 293, PT_SC, ucp_Dogra }, + { 299, PT_SC, ucp_Duployan }, + { 308, PT_SC, ucp_Egyptian_Hieroglyphs }, + { 329, PT_SC, ucp_Elbasan }, + { 337, PT_SC, ucp_Ethiopic }, + { 346, PT_SC, ucp_Georgian }, + { 355, PT_SC, ucp_Glagolitic }, + { 366, PT_SC, ucp_Gothic }, + { 373, PT_SC, ucp_Grantha }, + { 381, PT_SC, ucp_Greek }, + { 387, PT_SC, ucp_Gujarati }, + { 396, PT_SC, ucp_Gunjala_Gondi }, + { 410, PT_SC, ucp_Gurmukhi }, + { 419, PT_SC, ucp_Han }, + { 423, PT_SC, ucp_Hangul }, + { 430, PT_SC, ucp_Hanifi_Rohingya }, + { 446, PT_SC, ucp_Hanunoo }, + { 454, PT_SC, ucp_Hatran }, + { 461, PT_SC, ucp_Hebrew }, + { 468, PT_SC, ucp_Hiragana }, + { 477, PT_SC, ucp_Imperial_Aramaic }, + { 494, PT_SC, ucp_Inherited }, + { 504, PT_SC, ucp_Inscriptional_Pahlavi }, + { 526, PT_SC, ucp_Inscriptional_Parthian }, + { 549, PT_SC, ucp_Javanese }, + { 558, PT_SC, ucp_Kaithi }, + { 565, PT_SC, ucp_Kannada }, + { 573, PT_SC, ucp_Katakana }, + { 582, PT_SC, ucp_Kayah_Li }, + { 591, PT_SC, ucp_Kharoshthi }, + { 602, PT_SC, ucp_Khmer }, + { 608, PT_SC, ucp_Khojki }, + { 615, PT_SC, ucp_Khudawadi }, + { 625, PT_GC, ucp_L }, + { 627, PT_LAMP, 0 }, + { 630, PT_SC, ucp_Lao }, + { 634, PT_SC, ucp_Latin }, + { 640, PT_SC, ucp_Lepcha }, + { 647, PT_SC, ucp_Limbu }, + { 653, PT_SC, ucp_Linear_A }, + { 662, PT_SC, ucp_Linear_B }, + { 671, PT_SC, ucp_Lisu }, + { 676, PT_PC, ucp_Ll }, + { 679, PT_PC, ucp_Lm }, + { 682, PT_PC, ucp_Lo }, + { 685, PT_PC, ucp_Lt }, + { 688, PT_PC, ucp_Lu }, + { 691, PT_SC, ucp_Lycian }, + { 698, PT_SC, ucp_Lydian }, + { 705, PT_GC, ucp_M }, + { 707, PT_SC, ucp_Mahajani }, + { 716, PT_SC, ucp_Makasar }, + { 724, PT_SC, ucp_Malayalam }, + { 734, PT_SC, ucp_Mandaic }, + { 742, PT_SC, ucp_Manichaean }, + { 753, PT_SC, ucp_Marchen }, + { 761, PT_SC, ucp_Masaram_Gondi }, + { 775, PT_PC, ucp_Mc }, + { 778, PT_PC, ucp_Me }, + { 781, PT_SC, ucp_Medefaidrin }, + { 793, PT_SC, ucp_Meetei_Mayek }, + { 806, PT_SC, ucp_Mende_Kikakui }, + { 820, PT_SC, ucp_Meroitic_Cursive }, + { 837, PT_SC, ucp_Meroitic_Hieroglyphs }, + { 858, PT_SC, ucp_Miao }, + { 863, PT_PC, ucp_Mn }, + { 866, PT_SC, ucp_Modi }, + { 871, PT_SC, ucp_Mongolian }, + { 881, PT_SC, ucp_Mro }, + { 885, PT_SC, ucp_Multani }, + { 893, PT_SC, ucp_Myanmar }, + { 901, PT_GC, ucp_N }, + { 903, PT_SC, ucp_Nabataean }, + { 913, PT_PC, ucp_Nd }, + { 916, PT_SC, ucp_New_Tai_Lue }, + { 928, PT_SC, ucp_Newa }, + { 933, PT_SC, ucp_Nko }, + { 937, PT_PC, ucp_Nl }, + { 940, PT_PC, ucp_No }, + { 943, PT_SC, ucp_Nushu }, + { 949, PT_SC, ucp_Ogham }, + { 955, PT_SC, ucp_Ol_Chiki }, + { 964, PT_SC, ucp_Old_Hungarian }, + { 978, PT_SC, ucp_Old_Italic }, + { 989, PT_SC, ucp_Old_North_Arabian }, + { 1007, PT_SC, ucp_Old_Permic }, + { 1018, PT_SC, ucp_Old_Persian }, + { 1030, PT_SC, ucp_Old_Sogdian }, + { 1042, PT_SC, ucp_Old_South_Arabian }, + { 1060, PT_SC, ucp_Old_Turkic }, + { 1071, PT_SC, ucp_Oriya }, + { 1077, PT_SC, ucp_Osage }, + { 1083, PT_SC, ucp_Osmanya }, + { 1091, PT_GC, ucp_P }, + { 1093, PT_SC, ucp_Pahawh_Hmong }, + { 1106, PT_SC, ucp_Palmyrene }, + { 1116, PT_SC, ucp_Pau_Cin_Hau }, + { 1128, PT_PC, ucp_Pc }, + { 1131, PT_PC, ucp_Pd }, + { 1134, PT_PC, ucp_Pe }, + { 1137, PT_PC, ucp_Pf }, + { 1140, PT_SC, ucp_Phags_Pa }, + { 1149, PT_SC, ucp_Phoenician }, + { 1160, PT_PC, ucp_Pi }, + { 1163, PT_PC, ucp_Po }, + { 1166, PT_PC, ucp_Ps }, + { 1169, PT_SC, ucp_Psalter_Pahlavi }, + { 1185, PT_SC, ucp_Rejang }, + { 1192, PT_SC, ucp_Runic }, + { 1198, PT_GC, ucp_S }, + { 1200, PT_SC, ucp_Samaritan }, + { 1210, PT_SC, ucp_Saurashtra }, + { 1221, PT_PC, ucp_Sc }, + { 1224, PT_SC, ucp_Sharada }, + { 1232, PT_SC, ucp_Shavian }, + { 1240, PT_SC, ucp_Siddham }, + { 1248, PT_SC, ucp_SignWriting }, + { 1260, PT_SC, ucp_Sinhala }, + { 1268, PT_PC, ucp_Sk }, + { 1271, PT_PC, ucp_Sm }, + { 1274, PT_PC, ucp_So }, + { 1277, PT_SC, ucp_Sogdian }, + { 1285, PT_SC, ucp_Sora_Sompeng }, + { 1298, PT_SC, ucp_Soyombo }, + { 1306, PT_SC, ucp_Sundanese }, + { 1316, PT_SC, ucp_Syloti_Nagri }, + { 1329, PT_SC, ucp_Syriac }, + { 1336, PT_SC, ucp_Tagalog }, + { 1344, PT_SC, ucp_Tagbanwa }, + { 1353, PT_SC, ucp_Tai_Le }, + { 1360, PT_SC, ucp_Tai_Tham }, + { 1369, PT_SC, ucp_Tai_Viet }, + { 1378, PT_SC, ucp_Takri }, + { 1384, PT_SC, ucp_Tamil }, + { 1390, PT_SC, ucp_Tangut }, + { 1397, PT_SC, ucp_Telugu }, + { 1404, PT_SC, ucp_Thaana }, + { 1411, PT_SC, ucp_Thai }, + { 1416, PT_SC, ucp_Tibetan }, + { 1424, PT_SC, ucp_Tifinagh }, + { 1433, PT_SC, ucp_Tirhuta }, + { 1441, PT_SC, ucp_Ugaritic }, + { 1450, PT_SC, ucp_Vai }, + { 1454, PT_SC, ucp_Warang_Citi }, + { 1466, PT_ALNUM, 0 }, + { 1470, PT_PXSPACE, 0 }, + { 1474, PT_SPACE, 0 }, + { 1478, PT_UCNC, 0 }, + { 1482, PT_WORD, 0 }, + { 1486, PT_SC, ucp_Yi }, + { 1489, PT_GC, ucp_Z }, + { 1491, PT_SC, ucp_Zanabazar_Square }, + { 1508, PT_PC, ucp_Zl }, + { 1511, PT_PC, ucp_Zp }, + { 1514, PT_PC, ucp_Zs } }; const size_t PRIV(utt_size) = sizeof(PRIV(utt)) / sizeof(ucp_type_table); diff --git a/thirdparty/pcre2/src/pcre2_ucd.c b/thirdparty/pcre2/src/pcre2_ucd.c index ac7649b99e..275a4be2fe 100644 --- a/thirdparty/pcre2/src/pcre2_ucd.c +++ b/thirdparty/pcre2/src/pcre2_ucd.c @@ -20,7 +20,7 @@ needed. */ /* Unicode character database. */ /* This file was autogenerated by the MultiStage2.py script. */ -/* Total size: 80808 bytes, block size: 128. */ +/* Total size: 92592 bytes, block size: 128. */ /* The tables herein are needed only when UCP support is built, and in PCRE2 that happens automatically with UTF support. @@ -34,12 +34,12 @@ Instead, just supply small dummy tables. */ #ifndef SUPPORT_UNICODE const ucd_record PRIV(ucd_records)[] = {{0,0,0,0,0 }}; -const uint8_t PRIV(ucd_stage1)[] = {0}; +const uint16_t PRIV(ucd_stage1)[] = {0}; const uint16_t PRIV(ucd_stage2)[] = {0}; const uint32_t PRIV(ucd_caseless_sets)[] = {0}; #else -const char *PRIV(unicode_version) = "10.0.0"; +const char *PRIV(unicode_version) = "11.0.0"; /* If the 32-bit library is run in non-32-bit mode, character values greater than 0x10ffff may be encountered. For these we set up a @@ -104,7 +104,7 @@ const uint32_t PRIV(ucd_caseless_sets)[] = { #ifndef PCRE2_PCRE2TEST -const ucd_record PRIV(ucd_records)[] = { /* 6568 bytes, record size 8 */ +const ucd_record PRIV(ucd_records)[] = { /* 6832 bytes, record size 8 */ { 9, 0, 2, 0, 0, }, /* 0 */ { 9, 0, 1, 0, 0, }, /* 1 */ { 9, 0, 0, 0, 0, }, /* 2 */ @@ -125,1357 +125,1390 @@ const ucd_record PRIV(ucd_records)[] = { /* 6568 bytes, record size 8 */ { 33, 5, 12, 100, -32, }, /* 17 */ { 33, 5, 12, 1, -32, }, /* 18 */ { 9, 26, 12, 0, 0, }, /* 19 */ - { 33, 7, 12, 0, 0, }, /* 20 */ - { 9, 20, 12, 0, 0, }, /* 21 */ - { 9, 1, 2, 0, 0, }, /* 22 */ - { 9, 15, 12, 0, 0, }, /* 23 */ - { 9, 5, 12, 26, 775, }, /* 24 */ - { 9, 19, 12, 0, 0, }, /* 25 */ - { 33, 9, 12, 104, 32, }, /* 26 */ - { 33, 5, 12, 0, 7615, }, /* 27 */ - { 33, 5, 12, 104, -32, }, /* 28 */ - { 33, 5, 12, 0, 121, }, /* 29 */ - { 33, 9, 12, 0, 1, }, /* 30 */ - { 33, 5, 12, 0, -1, }, /* 31 */ - { 33, 9, 12, 0, 0, }, /* 32 */ - { 33, 5, 12, 0, 0, }, /* 33 */ - { 33, 9, 12, 0, -121, }, /* 34 */ - { 33, 5, 12, 1, -268, }, /* 35 */ - { 33, 5, 12, 0, 195, }, /* 36 */ - { 33, 9, 12, 0, 210, }, /* 37 */ - { 33, 9, 12, 0, 206, }, /* 38 */ - { 33, 9, 12, 0, 205, }, /* 39 */ - { 33, 9, 12, 0, 79, }, /* 40 */ - { 33, 9, 12, 0, 202, }, /* 41 */ - { 33, 9, 12, 0, 203, }, /* 42 */ - { 33, 9, 12, 0, 207, }, /* 43 */ - { 33, 5, 12, 0, 97, }, /* 44 */ - { 33, 9, 12, 0, 211, }, /* 45 */ - { 33, 9, 12, 0, 209, }, /* 46 */ - { 33, 5, 12, 0, 163, }, /* 47 */ - { 33, 9, 12, 0, 213, }, /* 48 */ - { 33, 5, 12, 0, 130, }, /* 49 */ - { 33, 9, 12, 0, 214, }, /* 50 */ - { 33, 9, 12, 0, 218, }, /* 51 */ - { 33, 9, 12, 0, 217, }, /* 52 */ - { 33, 9, 12, 0, 219, }, /* 53 */ - { 33, 5, 12, 0, 56, }, /* 54 */ - { 33, 9, 12, 5, 2, }, /* 55 */ - { 33, 8, 12, 5, 1, }, /* 56 */ - { 33, 5, 12, 5, -2, }, /* 57 */ - { 33, 9, 12, 9, 2, }, /* 58 */ - { 33, 8, 12, 9, 1, }, /* 59 */ - { 33, 5, 12, 9, -2, }, /* 60 */ - { 33, 9, 12, 13, 2, }, /* 61 */ - { 33, 8, 12, 13, 1, }, /* 62 */ - { 33, 5, 12, 13, -2, }, /* 63 */ - { 33, 5, 12, 0, -79, }, /* 64 */ - { 33, 9, 12, 17, 2, }, /* 65 */ - { 33, 8, 12, 17, 1, }, /* 66 */ - { 33, 5, 12, 17, -2, }, /* 67 */ - { 33, 9, 12, 0, -97, }, /* 68 */ - { 33, 9, 12, 0, -56, }, /* 69 */ - { 33, 9, 12, 0, -130, }, /* 70 */ - { 33, 9, 12, 0, 10795, }, /* 71 */ - { 33, 9, 12, 0, -163, }, /* 72 */ - { 33, 9, 12, 0, 10792, }, /* 73 */ - { 33, 5, 12, 0, 10815, }, /* 74 */ - { 33, 9, 12, 0, -195, }, /* 75 */ - { 33, 9, 12, 0, 69, }, /* 76 */ - { 33, 9, 12, 0, 71, }, /* 77 */ - { 33, 5, 12, 0, 10783, }, /* 78 */ - { 33, 5, 12, 0, 10780, }, /* 79 */ - { 33, 5, 12, 0, 10782, }, /* 80 */ - { 33, 5, 12, 0, -210, }, /* 81 */ - { 33, 5, 12, 0, -206, }, /* 82 */ - { 33, 5, 12, 0, -205, }, /* 83 */ - { 33, 5, 12, 0, -202, }, /* 84 */ - { 33, 5, 12, 0, -203, }, /* 85 */ - { 33, 5, 12, 0, 42319, }, /* 86 */ - { 33, 5, 12, 0, 42315, }, /* 87 */ - { 33, 5, 12, 0, -207, }, /* 88 */ - { 33, 5, 12, 0, 42280, }, /* 89 */ - { 33, 5, 12, 0, 42308, }, /* 90 */ - { 33, 5, 12, 0, -209, }, /* 91 */ - { 33, 5, 12, 0, -211, }, /* 92 */ - { 33, 5, 12, 0, 10743, }, /* 93 */ - { 33, 5, 12, 0, 42305, }, /* 94 */ - { 33, 5, 12, 0, 10749, }, /* 95 */ - { 33, 5, 12, 0, -213, }, /* 96 */ - { 33, 5, 12, 0, -214, }, /* 97 */ - { 33, 5, 12, 0, 10727, }, /* 98 */ - { 33, 5, 12, 0, -218, }, /* 99 */ - { 33, 5, 12, 0, 42282, }, /* 100 */ - { 33, 5, 12, 0, -69, }, /* 101 */ - { 33, 5, 12, 0, -217, }, /* 102 */ - { 33, 5, 12, 0, -71, }, /* 103 */ - { 33, 5, 12, 0, -219, }, /* 104 */ - { 33, 5, 12, 0, 42261, }, /* 105 */ - { 33, 5, 12, 0, 42258, }, /* 106 */ - { 33, 6, 12, 0, 0, }, /* 107 */ - { 9, 6, 12, 0, 0, }, /* 108 */ - { 3, 24, 12, 0, 0, }, /* 109 */ - { 27, 12, 3, 0, 0, }, /* 110 */ - { 27, 12, 3, 21, 116, }, /* 111 */ - { 19, 9, 12, 0, 1, }, /* 112 */ - { 19, 5, 12, 0, -1, }, /* 113 */ - { 19, 24, 12, 0, 0, }, /* 114 */ - { 9, 2, 12, 0, 0, }, /* 115 */ - { 19, 6, 12, 0, 0, }, /* 116 */ - { 19, 5, 12, 0, 130, }, /* 117 */ - { 19, 9, 12, 0, 116, }, /* 118 */ - { 19, 9, 12, 0, 38, }, /* 119 */ - { 19, 9, 12, 0, 37, }, /* 120 */ - { 19, 9, 12, 0, 64, }, /* 121 */ - { 19, 9, 12, 0, 63, }, /* 122 */ - { 19, 5, 12, 0, 0, }, /* 123 */ - { 19, 9, 12, 0, 32, }, /* 124 */ - { 19, 9, 12, 34, 32, }, /* 125 */ - { 19, 9, 12, 59, 32, }, /* 126 */ - { 19, 9, 12, 38, 32, }, /* 127 */ - { 19, 9, 12, 21, 32, }, /* 128 */ - { 19, 9, 12, 51, 32, }, /* 129 */ - { 19, 9, 12, 26, 32, }, /* 130 */ - { 19, 9, 12, 47, 32, }, /* 131 */ - { 19, 9, 12, 55, 32, }, /* 132 */ - { 19, 9, 12, 30, 32, }, /* 133 */ - { 19, 9, 12, 43, 32, }, /* 134 */ - { 19, 9, 12, 96, 32, }, /* 135 */ - { 19, 5, 12, 0, -38, }, /* 136 */ - { 19, 5, 12, 0, -37, }, /* 137 */ - { 19, 5, 12, 0, -32, }, /* 138 */ - { 19, 5, 12, 34, -32, }, /* 139 */ - { 19, 5, 12, 59, -32, }, /* 140 */ - { 19, 5, 12, 38, -32, }, /* 141 */ - { 19, 5, 12, 21, -116, }, /* 142 */ - { 19, 5, 12, 51, -32, }, /* 143 */ - { 19, 5, 12, 26, -775, }, /* 144 */ - { 19, 5, 12, 47, -32, }, /* 145 */ - { 19, 5, 12, 55, -32, }, /* 146 */ - { 19, 5, 12, 30, 1, }, /* 147 */ - { 19, 5, 12, 30, -32, }, /* 148 */ - { 19, 5, 12, 43, -32, }, /* 149 */ - { 19, 5, 12, 96, -32, }, /* 150 */ - { 19, 5, 12, 0, -64, }, /* 151 */ - { 19, 5, 12, 0, -63, }, /* 152 */ - { 19, 9, 12, 0, 8, }, /* 153 */ - { 19, 5, 12, 34, -30, }, /* 154 */ - { 19, 5, 12, 38, -25, }, /* 155 */ - { 19, 9, 12, 0, 0, }, /* 156 */ - { 19, 5, 12, 43, -15, }, /* 157 */ - { 19, 5, 12, 47, -22, }, /* 158 */ - { 19, 5, 12, 0, -8, }, /* 159 */ - { 10, 9, 12, 0, 1, }, /* 160 */ - { 10, 5, 12, 0, -1, }, /* 161 */ - { 19, 5, 12, 51, -54, }, /* 162 */ - { 19, 5, 12, 55, -48, }, /* 163 */ - { 19, 5, 12, 0, 7, }, /* 164 */ - { 19, 5, 12, 0, -116, }, /* 165 */ - { 19, 9, 12, 38, -60, }, /* 166 */ - { 19, 5, 12, 59, -64, }, /* 167 */ - { 19, 25, 12, 0, 0, }, /* 168 */ - { 19, 9, 12, 0, -7, }, /* 169 */ - { 19, 9, 12, 0, -130, }, /* 170 */ - { 12, 9, 12, 0, 80, }, /* 171 */ - { 12, 9, 12, 0, 32, }, /* 172 */ - { 12, 9, 12, 63, 32, }, /* 173 */ - { 12, 9, 12, 67, 32, }, /* 174 */ - { 12, 9, 12, 71, 32, }, /* 175 */ - { 12, 9, 12, 75, 32, }, /* 176 */ - { 12, 9, 12, 79, 32, }, /* 177 */ - { 12, 9, 12, 84, 32, }, /* 178 */ - { 12, 5, 12, 0, -32, }, /* 179 */ - { 12, 5, 12, 63, -32, }, /* 180 */ - { 12, 5, 12, 67, -32, }, /* 181 */ - { 12, 5, 12, 71, -32, }, /* 182 */ - { 12, 5, 12, 75, -32, }, /* 183 */ - { 12, 5, 12, 79, -32, }, /* 184 */ - { 12, 5, 12, 84, -32, }, /* 185 */ - { 12, 5, 12, 0, -80, }, /* 186 */ - { 12, 9, 12, 0, 1, }, /* 187 */ - { 12, 5, 12, 0, -1, }, /* 188 */ - { 12, 9, 12, 88, 1, }, /* 189 */ - { 12, 5, 12, 88, -1, }, /* 190 */ - { 12, 26, 12, 0, 0, }, /* 191 */ - { 12, 12, 3, 0, 0, }, /* 192 */ - { 12, 11, 3, 0, 0, }, /* 193 */ - { 12, 9, 12, 0, 15, }, /* 194 */ - { 12, 5, 12, 0, -15, }, /* 195 */ - { 1, 9, 12, 0, 48, }, /* 196 */ - { 1, 6, 12, 0, 0, }, /* 197 */ - { 1, 21, 12, 0, 0, }, /* 198 */ - { 1, 5, 12, 0, -48, }, /* 199 */ + { 9, 26, 14, 0, 0, }, /* 20 */ + { 33, 7, 12, 0, 0, }, /* 21 */ + { 9, 20, 12, 0, 0, }, /* 22 */ + { 9, 1, 2, 0, 0, }, /* 23 */ + { 9, 15, 12, 0, 0, }, /* 24 */ + { 9, 5, 12, 26, 775, }, /* 25 */ + { 9, 19, 12, 0, 0, }, /* 26 */ + { 33, 9, 12, 104, 32, }, /* 27 */ + { 33, 5, 12, 0, 7615, }, /* 28 */ + { 33, 5, 12, 104, -32, }, /* 29 */ + { 33, 5, 12, 0, 121, }, /* 30 */ + { 33, 9, 12, 0, 1, }, /* 31 */ + { 33, 5, 12, 0, -1, }, /* 32 */ + { 33, 9, 12, 0, 0, }, /* 33 */ + { 33, 5, 12, 0, 0, }, /* 34 */ + { 33, 9, 12, 0, -121, }, /* 35 */ + { 33, 5, 12, 1, -268, }, /* 36 */ + { 33, 5, 12, 0, 195, }, /* 37 */ + { 33, 9, 12, 0, 210, }, /* 38 */ + { 33, 9, 12, 0, 206, }, /* 39 */ + { 33, 9, 12, 0, 205, }, /* 40 */ + { 33, 9, 12, 0, 79, }, /* 41 */ + { 33, 9, 12, 0, 202, }, /* 42 */ + { 33, 9, 12, 0, 203, }, /* 43 */ + { 33, 9, 12, 0, 207, }, /* 44 */ + { 33, 5, 12, 0, 97, }, /* 45 */ + { 33, 9, 12, 0, 211, }, /* 46 */ + { 33, 9, 12, 0, 209, }, /* 47 */ + { 33, 5, 12, 0, 163, }, /* 48 */ + { 33, 9, 12, 0, 213, }, /* 49 */ + { 33, 5, 12, 0, 130, }, /* 50 */ + { 33, 9, 12, 0, 214, }, /* 51 */ + { 33, 9, 12, 0, 218, }, /* 52 */ + { 33, 9, 12, 0, 217, }, /* 53 */ + { 33, 9, 12, 0, 219, }, /* 54 */ + { 33, 5, 12, 0, 56, }, /* 55 */ + { 33, 9, 12, 5, 2, }, /* 56 */ + { 33, 8, 12, 5, 1, }, /* 57 */ + { 33, 5, 12, 5, -2, }, /* 58 */ + { 33, 9, 12, 9, 2, }, /* 59 */ + { 33, 8, 12, 9, 1, }, /* 60 */ + { 33, 5, 12, 9, -2, }, /* 61 */ + { 33, 9, 12, 13, 2, }, /* 62 */ + { 33, 8, 12, 13, 1, }, /* 63 */ + { 33, 5, 12, 13, -2, }, /* 64 */ + { 33, 5, 12, 0, -79, }, /* 65 */ + { 33, 9, 12, 17, 2, }, /* 66 */ + { 33, 8, 12, 17, 1, }, /* 67 */ + { 33, 5, 12, 17, -2, }, /* 68 */ + { 33, 9, 12, 0, -97, }, /* 69 */ + { 33, 9, 12, 0, -56, }, /* 70 */ + { 33, 9, 12, 0, -130, }, /* 71 */ + { 33, 9, 12, 0, 10795, }, /* 72 */ + { 33, 9, 12, 0, -163, }, /* 73 */ + { 33, 9, 12, 0, 10792, }, /* 74 */ + { 33, 5, 12, 0, 10815, }, /* 75 */ + { 33, 9, 12, 0, -195, }, /* 76 */ + { 33, 9, 12, 0, 69, }, /* 77 */ + { 33, 9, 12, 0, 71, }, /* 78 */ + { 33, 5, 12, 0, 10783, }, /* 79 */ + { 33, 5, 12, 0, 10780, }, /* 80 */ + { 33, 5, 12, 0, 10782, }, /* 81 */ + { 33, 5, 12, 0, -210, }, /* 82 */ + { 33, 5, 12, 0, -206, }, /* 83 */ + { 33, 5, 12, 0, -205, }, /* 84 */ + { 33, 5, 12, 0, -202, }, /* 85 */ + { 33, 5, 12, 0, -203, }, /* 86 */ + { 33, 5, 12, 0, 42319, }, /* 87 */ + { 33, 5, 12, 0, 42315, }, /* 88 */ + { 33, 5, 12, 0, -207, }, /* 89 */ + { 33, 5, 12, 0, 42280, }, /* 90 */ + { 33, 5, 12, 0, 42308, }, /* 91 */ + { 33, 5, 12, 0, -209, }, /* 92 */ + { 33, 5, 12, 0, -211, }, /* 93 */ + { 33, 5, 12, 0, 10743, }, /* 94 */ + { 33, 5, 12, 0, 42305, }, /* 95 */ + { 33, 5, 12, 0, 10749, }, /* 96 */ + { 33, 5, 12, 0, -213, }, /* 97 */ + { 33, 5, 12, 0, -214, }, /* 98 */ + { 33, 5, 12, 0, 10727, }, /* 99 */ + { 33, 5, 12, 0, -218, }, /* 100 */ + { 33, 5, 12, 0, 42282, }, /* 101 */ + { 33, 5, 12, 0, -69, }, /* 102 */ + { 33, 5, 12, 0, -217, }, /* 103 */ + { 33, 5, 12, 0, -71, }, /* 104 */ + { 33, 5, 12, 0, -219, }, /* 105 */ + { 33, 5, 12, 0, 42261, }, /* 106 */ + { 33, 5, 12, 0, 42258, }, /* 107 */ + { 33, 6, 12, 0, 0, }, /* 108 */ + { 9, 6, 12, 0, 0, }, /* 109 */ + { 3, 24, 12, 0, 0, }, /* 110 */ + { 27, 12, 3, 0, 0, }, /* 111 */ + { 27, 12, 3, 21, 116, }, /* 112 */ + { 19, 9, 12, 0, 1, }, /* 113 */ + { 19, 5, 12, 0, -1, }, /* 114 */ + { 19, 24, 12, 0, 0, }, /* 115 */ + { 9, 2, 12, 0, 0, }, /* 116 */ + { 19, 6, 12, 0, 0, }, /* 117 */ + { 19, 5, 12, 0, 130, }, /* 118 */ + { 19, 9, 12, 0, 116, }, /* 119 */ + { 19, 9, 12, 0, 38, }, /* 120 */ + { 19, 9, 12, 0, 37, }, /* 121 */ + { 19, 9, 12, 0, 64, }, /* 122 */ + { 19, 9, 12, 0, 63, }, /* 123 */ + { 19, 5, 12, 0, 0, }, /* 124 */ + { 19, 9, 12, 0, 32, }, /* 125 */ + { 19, 9, 12, 34, 32, }, /* 126 */ + { 19, 9, 12, 59, 32, }, /* 127 */ + { 19, 9, 12, 38, 32, }, /* 128 */ + { 19, 9, 12, 21, 32, }, /* 129 */ + { 19, 9, 12, 51, 32, }, /* 130 */ + { 19, 9, 12, 26, 32, }, /* 131 */ + { 19, 9, 12, 47, 32, }, /* 132 */ + { 19, 9, 12, 55, 32, }, /* 133 */ + { 19, 9, 12, 30, 32, }, /* 134 */ + { 19, 9, 12, 43, 32, }, /* 135 */ + { 19, 9, 12, 96, 32, }, /* 136 */ + { 19, 5, 12, 0, -38, }, /* 137 */ + { 19, 5, 12, 0, -37, }, /* 138 */ + { 19, 5, 12, 0, -32, }, /* 139 */ + { 19, 5, 12, 34, -32, }, /* 140 */ + { 19, 5, 12, 59, -32, }, /* 141 */ + { 19, 5, 12, 38, -32, }, /* 142 */ + { 19, 5, 12, 21, -116, }, /* 143 */ + { 19, 5, 12, 51, -32, }, /* 144 */ + { 19, 5, 12, 26, -775, }, /* 145 */ + { 19, 5, 12, 47, -32, }, /* 146 */ + { 19, 5, 12, 55, -32, }, /* 147 */ + { 19, 5, 12, 30, 1, }, /* 148 */ + { 19, 5, 12, 30, -32, }, /* 149 */ + { 19, 5, 12, 43, -32, }, /* 150 */ + { 19, 5, 12, 96, -32, }, /* 151 */ + { 19, 5, 12, 0, -64, }, /* 152 */ + { 19, 5, 12, 0, -63, }, /* 153 */ + { 19, 9, 12, 0, 8, }, /* 154 */ + { 19, 5, 12, 34, -30, }, /* 155 */ + { 19, 5, 12, 38, -25, }, /* 156 */ + { 19, 9, 12, 0, 0, }, /* 157 */ + { 19, 5, 12, 43, -15, }, /* 158 */ + { 19, 5, 12, 47, -22, }, /* 159 */ + { 19, 5, 12, 0, -8, }, /* 160 */ + { 10, 9, 12, 0, 1, }, /* 161 */ + { 10, 5, 12, 0, -1, }, /* 162 */ + { 19, 5, 12, 51, -54, }, /* 163 */ + { 19, 5, 12, 55, -48, }, /* 164 */ + { 19, 5, 12, 0, 7, }, /* 165 */ + { 19, 5, 12, 0, -116, }, /* 166 */ + { 19, 9, 12, 38, -60, }, /* 167 */ + { 19, 5, 12, 59, -64, }, /* 168 */ + { 19, 25, 12, 0, 0, }, /* 169 */ + { 19, 9, 12, 0, -7, }, /* 170 */ + { 19, 9, 12, 0, -130, }, /* 171 */ + { 12, 9, 12, 0, 80, }, /* 172 */ + { 12, 9, 12, 0, 32, }, /* 173 */ + { 12, 9, 12, 63, 32, }, /* 174 */ + { 12, 9, 12, 67, 32, }, /* 175 */ + { 12, 9, 12, 71, 32, }, /* 176 */ + { 12, 9, 12, 75, 32, }, /* 177 */ + { 12, 9, 12, 79, 32, }, /* 178 */ + { 12, 9, 12, 84, 32, }, /* 179 */ + { 12, 5, 12, 0, -32, }, /* 180 */ + { 12, 5, 12, 63, -32, }, /* 181 */ + { 12, 5, 12, 67, -32, }, /* 182 */ + { 12, 5, 12, 71, -32, }, /* 183 */ + { 12, 5, 12, 75, -32, }, /* 184 */ + { 12, 5, 12, 79, -32, }, /* 185 */ + { 12, 5, 12, 84, -32, }, /* 186 */ + { 12, 5, 12, 0, -80, }, /* 187 */ + { 12, 9, 12, 0, 1, }, /* 188 */ + { 12, 5, 12, 0, -1, }, /* 189 */ + { 12, 9, 12, 88, 1, }, /* 190 */ + { 12, 5, 12, 88, -1, }, /* 191 */ + { 12, 26, 12, 0, 0, }, /* 192 */ + { 12, 12, 3, 0, 0, }, /* 193 */ + { 12, 11, 3, 0, 0, }, /* 194 */ + { 12, 9, 12, 0, 15, }, /* 195 */ + { 12, 5, 12, 0, -15, }, /* 196 */ + { 1, 9, 12, 0, 48, }, /* 197 */ + { 1, 6, 12, 0, 0, }, /* 198 */ + { 1, 21, 12, 0, 0, }, /* 199 */ { 1, 5, 12, 0, 0, }, /* 200 */ - { 1, 17, 12, 0, 0, }, /* 201 */ - { 1, 26, 12, 0, 0, }, /* 202 */ - { 1, 23, 12, 0, 0, }, /* 203 */ - { 25, 12, 3, 0, 0, }, /* 204 */ - { 25, 17, 12, 0, 0, }, /* 205 */ - { 25, 21, 12, 0, 0, }, /* 206 */ - { 25, 7, 12, 0, 0, }, /* 207 */ - { 0, 1, 4, 0, 0, }, /* 208 */ - { 9, 1, 4, 0, 0, }, /* 209 */ - { 0, 25, 12, 0, 0, }, /* 210 */ - { 0, 21, 12, 0, 0, }, /* 211 */ - { 0, 23, 12, 0, 0, }, /* 212 */ - { 0, 26, 12, 0, 0, }, /* 213 */ - { 0, 12, 3, 0, 0, }, /* 214 */ - { 0, 1, 2, 0, 0, }, /* 215 */ - { 0, 7, 12, 0, 0, }, /* 216 */ - { 0, 13, 12, 0, 0, }, /* 217 */ - { 0, 6, 12, 0, 0, }, /* 218 */ - { 49, 21, 12, 0, 0, }, /* 219 */ - { 49, 1, 4, 0, 0, }, /* 220 */ - { 49, 7, 12, 0, 0, }, /* 221 */ - { 49, 12, 3, 0, 0, }, /* 222 */ - { 55, 7, 12, 0, 0, }, /* 223 */ - { 55, 12, 3, 0, 0, }, /* 224 */ - { 63, 13, 12, 0, 0, }, /* 225 */ - { 63, 7, 12, 0, 0, }, /* 226 */ - { 63, 12, 3, 0, 0, }, /* 227 */ - { 63, 6, 12, 0, 0, }, /* 228 */ - { 63, 26, 12, 0, 0, }, /* 229 */ - { 63, 21, 12, 0, 0, }, /* 230 */ - { 89, 7, 12, 0, 0, }, /* 231 */ - { 89, 12, 3, 0, 0, }, /* 232 */ - { 89, 6, 12, 0, 0, }, /* 233 */ - { 89, 21, 12, 0, 0, }, /* 234 */ - { 94, 7, 12, 0, 0, }, /* 235 */ - { 94, 12, 3, 0, 0, }, /* 236 */ - { 94, 21, 12, 0, 0, }, /* 237 */ - { 14, 12, 3, 0, 0, }, /* 238 */ - { 14, 10, 5, 0, 0, }, /* 239 */ - { 14, 7, 12, 0, 0, }, /* 240 */ - { 14, 13, 12, 0, 0, }, /* 241 */ - { 14, 21, 12, 0, 0, }, /* 242 */ - { 14, 6, 12, 0, 0, }, /* 243 */ - { 2, 7, 12, 0, 0, }, /* 244 */ - { 2, 12, 3, 0, 0, }, /* 245 */ - { 2, 10, 5, 0, 0, }, /* 246 */ - { 2, 10, 3, 0, 0, }, /* 247 */ - { 2, 13, 12, 0, 0, }, /* 248 */ - { 2, 23, 12, 0, 0, }, /* 249 */ - { 2, 15, 12, 0, 0, }, /* 250 */ - { 2, 26, 12, 0, 0, }, /* 251 */ - { 2, 21, 12, 0, 0, }, /* 252 */ - { 21, 12, 3, 0, 0, }, /* 253 */ - { 21, 10, 5, 0, 0, }, /* 254 */ - { 21, 7, 12, 0, 0, }, /* 255 */ - { 21, 13, 12, 0, 0, }, /* 256 */ - { 20, 12, 3, 0, 0, }, /* 257 */ - { 20, 10, 5, 0, 0, }, /* 258 */ - { 20, 7, 12, 0, 0, }, /* 259 */ - { 20, 13, 12, 0, 0, }, /* 260 */ - { 20, 21, 12, 0, 0, }, /* 261 */ - { 20, 23, 12, 0, 0, }, /* 262 */ - { 43, 12, 3, 0, 0, }, /* 263 */ - { 43, 10, 5, 0, 0, }, /* 264 */ - { 43, 7, 12, 0, 0, }, /* 265 */ - { 43, 10, 3, 0, 0, }, /* 266 */ - { 43, 13, 12, 0, 0, }, /* 267 */ - { 43, 26, 12, 0, 0, }, /* 268 */ - { 43, 15, 12, 0, 0, }, /* 269 */ - { 53, 12, 3, 0, 0, }, /* 270 */ - { 53, 7, 12, 0, 0, }, /* 271 */ - { 53, 10, 3, 0, 0, }, /* 272 */ - { 53, 10, 5, 0, 0, }, /* 273 */ - { 53, 13, 12, 0, 0, }, /* 274 */ - { 53, 15, 12, 0, 0, }, /* 275 */ - { 53, 26, 12, 0, 0, }, /* 276 */ - { 53, 23, 12, 0, 0, }, /* 277 */ - { 54, 12, 3, 0, 0, }, /* 278 */ - { 54, 10, 5, 0, 0, }, /* 279 */ - { 54, 7, 12, 0, 0, }, /* 280 */ - { 54, 13, 12, 0, 0, }, /* 281 */ - { 54, 15, 12, 0, 0, }, /* 282 */ - { 54, 26, 12, 0, 0, }, /* 283 */ - { 28, 7, 12, 0, 0, }, /* 284 */ - { 28, 12, 3, 0, 0, }, /* 285 */ - { 28, 10, 5, 0, 0, }, /* 286 */ - { 28, 10, 3, 0, 0, }, /* 287 */ - { 28, 13, 12, 0, 0, }, /* 288 */ - { 36, 12, 3, 0, 0, }, /* 289 */ - { 36, 10, 5, 0, 0, }, /* 290 */ - { 36, 7, 12, 0, 0, }, /* 291 */ - { 36, 10, 3, 0, 0, }, /* 292 */ - { 36, 7, 4, 0, 0, }, /* 293 */ - { 36, 26, 12, 0, 0, }, /* 294 */ - { 36, 15, 12, 0, 0, }, /* 295 */ - { 36, 13, 12, 0, 0, }, /* 296 */ - { 47, 10, 5, 0, 0, }, /* 297 */ - { 47, 7, 12, 0, 0, }, /* 298 */ - { 47, 12, 3, 0, 0, }, /* 299 */ - { 47, 10, 3, 0, 0, }, /* 300 */ - { 47, 13, 12, 0, 0, }, /* 301 */ - { 47, 21, 12, 0, 0, }, /* 302 */ - { 56, 7, 12, 0, 0, }, /* 303 */ - { 56, 12, 3, 0, 0, }, /* 304 */ - { 56, 7, 5, 0, 0, }, /* 305 */ - { 56, 6, 12, 0, 0, }, /* 306 */ - { 56, 21, 12, 0, 0, }, /* 307 */ - { 56, 13, 12, 0, 0, }, /* 308 */ - { 32, 7, 12, 0, 0, }, /* 309 */ - { 32, 12, 3, 0, 0, }, /* 310 */ - { 32, 7, 5, 0, 0, }, /* 311 */ - { 32, 6, 12, 0, 0, }, /* 312 */ - { 32, 13, 12, 0, 0, }, /* 313 */ - { 57, 7, 12, 0, 0, }, /* 314 */ - { 57, 26, 12, 0, 0, }, /* 315 */ - { 57, 21, 12, 0, 0, }, /* 316 */ - { 57, 12, 3, 0, 0, }, /* 317 */ - { 57, 13, 12, 0, 0, }, /* 318 */ - { 57, 15, 12, 0, 0, }, /* 319 */ - { 57, 22, 12, 0, 0, }, /* 320 */ - { 57, 18, 12, 0, 0, }, /* 321 */ - { 57, 10, 5, 0, 0, }, /* 322 */ - { 38, 7, 12, 0, 0, }, /* 323 */ - { 38, 10, 12, 0, 0, }, /* 324 */ - { 38, 12, 3, 0, 0, }, /* 325 */ - { 38, 10, 5, 0, 0, }, /* 326 */ - { 38, 13, 12, 0, 0, }, /* 327 */ - { 38, 21, 12, 0, 0, }, /* 328 */ - { 38, 26, 12, 0, 0, }, /* 329 */ - { 16, 9, 12, 0, 7264, }, /* 330 */ - { 16, 7, 12, 0, 0, }, /* 331 */ - { 16, 6, 12, 0, 0, }, /* 332 */ - { 23, 7, 6, 0, 0, }, /* 333 */ - { 23, 7, 7, 0, 0, }, /* 334 */ - { 23, 7, 8, 0, 0, }, /* 335 */ - { 15, 7, 12, 0, 0, }, /* 336 */ - { 15, 12, 3, 0, 0, }, /* 337 */ - { 15, 21, 12, 0, 0, }, /* 338 */ - { 15, 15, 12, 0, 0, }, /* 339 */ - { 15, 26, 12, 0, 0, }, /* 340 */ - { 8, 9, 12, 0, 38864, }, /* 341 */ - { 8, 9, 12, 0, 8, }, /* 342 */ - { 8, 5, 12, 0, -8, }, /* 343 */ - { 7, 17, 12, 0, 0, }, /* 344 */ - { 7, 7, 12, 0, 0, }, /* 345 */ - { 7, 21, 12, 0, 0, }, /* 346 */ - { 40, 29, 12, 0, 0, }, /* 347 */ - { 40, 7, 12, 0, 0, }, /* 348 */ - { 40, 22, 12, 0, 0, }, /* 349 */ - { 40, 18, 12, 0, 0, }, /* 350 */ - { 45, 7, 12, 0, 0, }, /* 351 */ - { 45, 14, 12, 0, 0, }, /* 352 */ - { 50, 7, 12, 0, 0, }, /* 353 */ - { 50, 12, 3, 0, 0, }, /* 354 */ - { 24, 7, 12, 0, 0, }, /* 355 */ - { 24, 12, 3, 0, 0, }, /* 356 */ - { 6, 7, 12, 0, 0, }, /* 357 */ - { 6, 12, 3, 0, 0, }, /* 358 */ - { 51, 7, 12, 0, 0, }, /* 359 */ - { 51, 12, 3, 0, 0, }, /* 360 */ - { 31, 7, 12, 0, 0, }, /* 361 */ - { 31, 12, 3, 0, 0, }, /* 362 */ - { 31, 10, 5, 0, 0, }, /* 363 */ - { 31, 21, 12, 0, 0, }, /* 364 */ - { 31, 6, 12, 0, 0, }, /* 365 */ - { 31, 23, 12, 0, 0, }, /* 366 */ - { 31, 13, 12, 0, 0, }, /* 367 */ - { 31, 15, 12, 0, 0, }, /* 368 */ - { 37, 21, 12, 0, 0, }, /* 369 */ - { 37, 17, 12, 0, 0, }, /* 370 */ - { 37, 12, 3, 0, 0, }, /* 371 */ - { 37, 1, 2, 0, 0, }, /* 372 */ - { 37, 13, 12, 0, 0, }, /* 373 */ - { 37, 7, 12, 0, 0, }, /* 374 */ - { 37, 6, 12, 0, 0, }, /* 375 */ - { 34, 7, 12, 0, 0, }, /* 376 */ - { 34, 12, 3, 0, 0, }, /* 377 */ - { 34, 10, 5, 0, 0, }, /* 378 */ - { 34, 26, 12, 0, 0, }, /* 379 */ - { 34, 21, 12, 0, 0, }, /* 380 */ - { 34, 13, 12, 0, 0, }, /* 381 */ - { 52, 7, 12, 0, 0, }, /* 382 */ - { 39, 7, 12, 0, 0, }, /* 383 */ - { 39, 13, 12, 0, 0, }, /* 384 */ - { 39, 15, 12, 0, 0, }, /* 385 */ - { 39, 26, 12, 0, 0, }, /* 386 */ - { 31, 26, 12, 0, 0, }, /* 387 */ - { 5, 7, 12, 0, 0, }, /* 388 */ - { 5, 12, 3, 0, 0, }, /* 389 */ - { 5, 10, 5, 0, 0, }, /* 390 */ - { 5, 21, 12, 0, 0, }, /* 391 */ - { 90, 7, 12, 0, 0, }, /* 392 */ - { 90, 10, 5, 0, 0, }, /* 393 */ - { 90, 12, 3, 0, 0, }, /* 394 */ - { 90, 10, 12, 0, 0, }, /* 395 */ - { 90, 13, 12, 0, 0, }, /* 396 */ - { 90, 21, 12, 0, 0, }, /* 397 */ - { 90, 6, 12, 0, 0, }, /* 398 */ - { 27, 11, 3, 0, 0, }, /* 399 */ - { 61, 12, 3, 0, 0, }, /* 400 */ - { 61, 10, 5, 0, 0, }, /* 401 */ - { 61, 7, 12, 0, 0, }, /* 402 */ - { 61, 13, 12, 0, 0, }, /* 403 */ - { 61, 21, 12, 0, 0, }, /* 404 */ - { 61, 26, 12, 0, 0, }, /* 405 */ - { 75, 12, 3, 0, 0, }, /* 406 */ - { 75, 10, 5, 0, 0, }, /* 407 */ - { 75, 7, 12, 0, 0, }, /* 408 */ - { 75, 13, 12, 0, 0, }, /* 409 */ - { 92, 7, 12, 0, 0, }, /* 410 */ - { 92, 12, 3, 0, 0, }, /* 411 */ - { 92, 10, 5, 0, 0, }, /* 412 */ - { 92, 21, 12, 0, 0, }, /* 413 */ - { 69, 7, 12, 0, 0, }, /* 414 */ - { 69, 10, 5, 0, 0, }, /* 415 */ - { 69, 12, 3, 0, 0, }, /* 416 */ - { 69, 21, 12, 0, 0, }, /* 417 */ - { 69, 13, 12, 0, 0, }, /* 418 */ - { 72, 13, 12, 0, 0, }, /* 419 */ - { 72, 7, 12, 0, 0, }, /* 420 */ - { 72, 6, 12, 0, 0, }, /* 421 */ - { 72, 21, 12, 0, 0, }, /* 422 */ - { 12, 5, 12, 63, -6222, }, /* 423 */ - { 12, 5, 12, 67, -6221, }, /* 424 */ - { 12, 5, 12, 71, -6212, }, /* 425 */ - { 12, 5, 12, 75, -6210, }, /* 426 */ - { 12, 5, 12, 79, -6210, }, /* 427 */ - { 12, 5, 12, 79, -6211, }, /* 428 */ - { 12, 5, 12, 84, -6204, }, /* 429 */ - { 12, 5, 12, 88, -6180, }, /* 430 */ - { 12, 5, 12, 108, 35267, }, /* 431 */ - { 75, 21, 12, 0, 0, }, /* 432 */ - { 9, 10, 5, 0, 0, }, /* 433 */ - { 9, 7, 12, 0, 0, }, /* 434 */ - { 12, 5, 12, 0, 0, }, /* 435 */ - { 12, 6, 12, 0, 0, }, /* 436 */ - { 33, 5, 12, 0, 35332, }, /* 437 */ - { 33, 5, 12, 0, 3814, }, /* 438 */ - { 33, 9, 12, 92, 1, }, /* 439 */ - { 33, 5, 12, 92, -1, }, /* 440 */ - { 33, 5, 12, 92, -58, }, /* 441 */ - { 33, 9, 12, 0, -7615, }, /* 442 */ - { 19, 5, 12, 0, 8, }, /* 443 */ - { 19, 9, 12, 0, -8, }, /* 444 */ - { 19, 5, 12, 0, 74, }, /* 445 */ - { 19, 5, 12, 0, 86, }, /* 446 */ - { 19, 5, 12, 0, 100, }, /* 447 */ - { 19, 5, 12, 0, 128, }, /* 448 */ - { 19, 5, 12, 0, 112, }, /* 449 */ - { 19, 5, 12, 0, 126, }, /* 450 */ - { 19, 8, 12, 0, -8, }, /* 451 */ - { 19, 5, 12, 0, 9, }, /* 452 */ - { 19, 9, 12, 0, -74, }, /* 453 */ - { 19, 8, 12, 0, -9, }, /* 454 */ - { 19, 5, 12, 21, -7173, }, /* 455 */ - { 19, 9, 12, 0, -86, }, /* 456 */ - { 19, 9, 12, 0, -100, }, /* 457 */ - { 19, 9, 12, 0, -112, }, /* 458 */ - { 19, 9, 12, 0, -128, }, /* 459 */ - { 19, 9, 12, 0, -126, }, /* 460 */ - { 27, 1, 3, 0, 0, }, /* 461 */ - { 27, 1, 16, 0, 0, }, /* 462 */ - { 9, 27, 2, 0, 0, }, /* 463 */ - { 9, 28, 2, 0, 0, }, /* 464 */ - { 9, 2, 2, 0, 0, }, /* 465 */ - { 9, 9, 12, 0, 0, }, /* 466 */ - { 9, 5, 12, 0, 0, }, /* 467 */ - { 19, 9, 12, 96, -7517, }, /* 468 */ - { 33, 9, 12, 100, -8383, }, /* 469 */ - { 33, 9, 12, 104, -8262, }, /* 470 */ - { 33, 9, 12, 0, 28, }, /* 471 */ - { 33, 5, 12, 0, -28, }, /* 472 */ - { 33, 14, 12, 0, 16, }, /* 473 */ - { 33, 14, 12, 0, -16, }, /* 474 */ - { 33, 14, 12, 0, 0, }, /* 475 */ - { 9, 26, 12, 0, 26, }, /* 476 */ - { 9, 26, 12, 0, -26, }, /* 477 */ - { 9, 26, 13, 0, 0, }, /* 478 */ - { 9, 26, 17, 0, 0, }, /* 479 */ - { 4, 26, 12, 0, 0, }, /* 480 */ - { 17, 9, 12, 0, 48, }, /* 481 */ - { 17, 5, 12, 0, -48, }, /* 482 */ - { 33, 9, 12, 0, -10743, }, /* 483 */ - { 33, 9, 12, 0, -3814, }, /* 484 */ - { 33, 9, 12, 0, -10727, }, /* 485 */ - { 33, 5, 12, 0, -10795, }, /* 486 */ - { 33, 5, 12, 0, -10792, }, /* 487 */ - { 33, 9, 12, 0, -10780, }, /* 488 */ - { 33, 9, 12, 0, -10749, }, /* 489 */ - { 33, 9, 12, 0, -10783, }, /* 490 */ - { 33, 9, 12, 0, -10782, }, /* 491 */ - { 33, 9, 12, 0, -10815, }, /* 492 */ - { 10, 5, 12, 0, 0, }, /* 493 */ - { 10, 26, 12, 0, 0, }, /* 494 */ - { 10, 12, 3, 0, 0, }, /* 495 */ - { 10, 21, 12, 0, 0, }, /* 496 */ - { 10, 15, 12, 0, 0, }, /* 497 */ - { 16, 5, 12, 0, -7264, }, /* 498 */ - { 58, 7, 12, 0, 0, }, /* 499 */ - { 58, 6, 12, 0, 0, }, /* 500 */ - { 58, 21, 12, 0, 0, }, /* 501 */ - { 58, 12, 3, 0, 0, }, /* 502 */ - { 22, 26, 12, 0, 0, }, /* 503 */ - { 22, 6, 12, 0, 0, }, /* 504 */ - { 22, 14, 12, 0, 0, }, /* 505 */ - { 23, 10, 3, 0, 0, }, /* 506 */ - { 26, 7, 12, 0, 0, }, /* 507 */ - { 26, 6, 12, 0, 0, }, /* 508 */ - { 29, 7, 12, 0, 0, }, /* 509 */ - { 29, 6, 12, 0, 0, }, /* 510 */ - { 3, 7, 12, 0, 0, }, /* 511 */ - { 23, 7, 12, 0, 0, }, /* 512 */ - { 23, 26, 12, 0, 0, }, /* 513 */ - { 29, 26, 12, 0, 0, }, /* 514 */ - { 22, 7, 12, 0, 0, }, /* 515 */ - { 60, 7, 12, 0, 0, }, /* 516 */ - { 60, 6, 12, 0, 0, }, /* 517 */ - { 60, 26, 12, 0, 0, }, /* 518 */ - { 85, 7, 12, 0, 0, }, /* 519 */ - { 85, 6, 12, 0, 0, }, /* 520 */ - { 85, 21, 12, 0, 0, }, /* 521 */ - { 76, 7, 12, 0, 0, }, /* 522 */ - { 76, 6, 12, 0, 0, }, /* 523 */ - { 76, 21, 12, 0, 0, }, /* 524 */ - { 76, 13, 12, 0, 0, }, /* 525 */ - { 12, 9, 12, 108, 1, }, /* 526 */ - { 12, 5, 12, 108, -35267, }, /* 527 */ - { 12, 7, 12, 0, 0, }, /* 528 */ - { 12, 21, 12, 0, 0, }, /* 529 */ - { 78, 7, 12, 0, 0, }, /* 530 */ - { 78, 14, 12, 0, 0, }, /* 531 */ - { 78, 12, 3, 0, 0, }, /* 532 */ - { 78, 21, 12, 0, 0, }, /* 533 */ - { 33, 9, 12, 0, -35332, }, /* 534 */ - { 33, 9, 12, 0, -42280, }, /* 535 */ - { 33, 9, 12, 0, -42308, }, /* 536 */ - { 33, 9, 12, 0, -42319, }, /* 537 */ - { 33, 9, 12, 0, -42315, }, /* 538 */ - { 33, 9, 12, 0, -42305, }, /* 539 */ - { 33, 9, 12, 0, -42258, }, /* 540 */ - { 33, 9, 12, 0, -42282, }, /* 541 */ - { 33, 9, 12, 0, -42261, }, /* 542 */ - { 33, 9, 12, 0, 928, }, /* 543 */ - { 48, 7, 12, 0, 0, }, /* 544 */ - { 48, 12, 3, 0, 0, }, /* 545 */ - { 48, 10, 5, 0, 0, }, /* 546 */ - { 48, 26, 12, 0, 0, }, /* 547 */ - { 64, 7, 12, 0, 0, }, /* 548 */ - { 64, 21, 12, 0, 0, }, /* 549 */ - { 74, 10, 5, 0, 0, }, /* 550 */ - { 74, 7, 12, 0, 0, }, /* 551 */ - { 74, 12, 3, 0, 0, }, /* 552 */ - { 74, 21, 12, 0, 0, }, /* 553 */ - { 74, 13, 12, 0, 0, }, /* 554 */ - { 68, 13, 12, 0, 0, }, /* 555 */ - { 68, 7, 12, 0, 0, }, /* 556 */ - { 68, 12, 3, 0, 0, }, /* 557 */ - { 68, 21, 12, 0, 0, }, /* 558 */ - { 73, 7, 12, 0, 0, }, /* 559 */ - { 73, 12, 3, 0, 0, }, /* 560 */ - { 73, 10, 5, 0, 0, }, /* 561 */ - { 73, 21, 12, 0, 0, }, /* 562 */ - { 83, 12, 3, 0, 0, }, /* 563 */ - { 83, 10, 5, 0, 0, }, /* 564 */ - { 83, 7, 12, 0, 0, }, /* 565 */ - { 83, 21, 12, 0, 0, }, /* 566 */ - { 83, 13, 12, 0, 0, }, /* 567 */ - { 38, 6, 12, 0, 0, }, /* 568 */ - { 67, 7, 12, 0, 0, }, /* 569 */ - { 67, 12, 3, 0, 0, }, /* 570 */ - { 67, 10, 5, 0, 0, }, /* 571 */ - { 67, 13, 12, 0, 0, }, /* 572 */ - { 67, 21, 12, 0, 0, }, /* 573 */ - { 91, 7, 12, 0, 0, }, /* 574 */ - { 91, 12, 3, 0, 0, }, /* 575 */ - { 91, 6, 12, 0, 0, }, /* 576 */ - { 91, 21, 12, 0, 0, }, /* 577 */ - { 86, 7, 12, 0, 0, }, /* 578 */ - { 86, 10, 5, 0, 0, }, /* 579 */ - { 86, 12, 3, 0, 0, }, /* 580 */ - { 86, 21, 12, 0, 0, }, /* 581 */ - { 86, 6, 12, 0, 0, }, /* 582 */ - { 33, 5, 12, 0, -928, }, /* 583 */ - { 8, 5, 12, 0, -38864, }, /* 584 */ - { 86, 13, 12, 0, 0, }, /* 585 */ - { 23, 7, 9, 0, 0, }, /* 586 */ - { 23, 7, 10, 0, 0, }, /* 587 */ - { 9, 4, 2, 0, 0, }, /* 588 */ - { 9, 3, 12, 0, 0, }, /* 589 */ - { 25, 25, 12, 0, 0, }, /* 590 */ - { 0, 24, 12, 0, 0, }, /* 591 */ - { 9, 6, 3, 0, 0, }, /* 592 */ - { 35, 7, 12, 0, 0, }, /* 593 */ - { 19, 14, 12, 0, 0, }, /* 594 */ - { 19, 15, 12, 0, 0, }, /* 595 */ - { 19, 26, 12, 0, 0, }, /* 596 */ - { 70, 7, 12, 0, 0, }, /* 597 */ - { 66, 7, 12, 0, 0, }, /* 598 */ - { 41, 7, 12, 0, 0, }, /* 599 */ - { 41, 15, 12, 0, 0, }, /* 600 */ - { 18, 7, 12, 0, 0, }, /* 601 */ - { 18, 14, 12, 0, 0, }, /* 602 */ - { 117, 7, 12, 0, 0, }, /* 603 */ - { 117, 12, 3, 0, 0, }, /* 604 */ - { 59, 7, 12, 0, 0, }, /* 605 */ - { 59, 21, 12, 0, 0, }, /* 606 */ - { 42, 7, 12, 0, 0, }, /* 607 */ - { 42, 21, 12, 0, 0, }, /* 608 */ - { 42, 14, 12, 0, 0, }, /* 609 */ - { 13, 9, 12, 0, 40, }, /* 610 */ - { 13, 5, 12, 0, -40, }, /* 611 */ - { 46, 7, 12, 0, 0, }, /* 612 */ - { 44, 7, 12, 0, 0, }, /* 613 */ - { 44, 13, 12, 0, 0, }, /* 614 */ - { 135, 9, 12, 0, 40, }, /* 615 */ - { 135, 5, 12, 0, -40, }, /* 616 */ - { 105, 7, 12, 0, 0, }, /* 617 */ - { 103, 7, 12, 0, 0, }, /* 618 */ - { 103, 21, 12, 0, 0, }, /* 619 */ - { 109, 7, 12, 0, 0, }, /* 620 */ - { 11, 7, 12, 0, 0, }, /* 621 */ - { 80, 7, 12, 0, 0, }, /* 622 */ - { 80, 21, 12, 0, 0, }, /* 623 */ - { 80, 15, 12, 0, 0, }, /* 624 */ - { 119, 7, 12, 0, 0, }, /* 625 */ - { 119, 26, 12, 0, 0, }, /* 626 */ - { 119, 15, 12, 0, 0, }, /* 627 */ - { 115, 7, 12, 0, 0, }, /* 628 */ - { 115, 15, 12, 0, 0, }, /* 629 */ - { 127, 7, 12, 0, 0, }, /* 630 */ - { 127, 15, 12, 0, 0, }, /* 631 */ - { 65, 7, 12, 0, 0, }, /* 632 */ - { 65, 15, 12, 0, 0, }, /* 633 */ - { 65, 21, 12, 0, 0, }, /* 634 */ - { 71, 7, 12, 0, 0, }, /* 635 */ - { 71, 21, 12, 0, 0, }, /* 636 */ - { 97, 7, 12, 0, 0, }, /* 637 */ - { 96, 7, 12, 0, 0, }, /* 638 */ - { 96, 15, 12, 0, 0, }, /* 639 */ - { 30, 7, 12, 0, 0, }, /* 640 */ - { 30, 12, 3, 0, 0, }, /* 641 */ - { 30, 15, 12, 0, 0, }, /* 642 */ - { 30, 21, 12, 0, 0, }, /* 643 */ - { 87, 7, 12, 0, 0, }, /* 644 */ - { 87, 15, 12, 0, 0, }, /* 645 */ - { 87, 21, 12, 0, 0, }, /* 646 */ - { 116, 7, 12, 0, 0, }, /* 647 */ - { 116, 15, 12, 0, 0, }, /* 648 */ - { 111, 7, 12, 0, 0, }, /* 649 */ - { 111, 26, 12, 0, 0, }, /* 650 */ - { 111, 12, 3, 0, 0, }, /* 651 */ - { 111, 15, 12, 0, 0, }, /* 652 */ - { 111, 21, 12, 0, 0, }, /* 653 */ - { 77, 7, 12, 0, 0, }, /* 654 */ - { 77, 21, 12, 0, 0, }, /* 655 */ - { 82, 7, 12, 0, 0, }, /* 656 */ - { 82, 15, 12, 0, 0, }, /* 657 */ - { 81, 7, 12, 0, 0, }, /* 658 */ - { 81, 15, 12, 0, 0, }, /* 659 */ - { 120, 7, 12, 0, 0, }, /* 660 */ - { 120, 21, 12, 0, 0, }, /* 661 */ - { 120, 15, 12, 0, 0, }, /* 662 */ - { 88, 7, 12, 0, 0, }, /* 663 */ - { 129, 9, 12, 0, 64, }, /* 664 */ - { 129, 5, 12, 0, -64, }, /* 665 */ - { 129, 15, 12, 0, 0, }, /* 666 */ - { 0, 15, 12, 0, 0, }, /* 667 */ - { 93, 10, 5, 0, 0, }, /* 668 */ - { 93, 12, 3, 0, 0, }, /* 669 */ - { 93, 7, 12, 0, 0, }, /* 670 */ - { 93, 21, 12, 0, 0, }, /* 671 */ - { 93, 15, 12, 0, 0, }, /* 672 */ - { 93, 13, 12, 0, 0, }, /* 673 */ - { 84, 12, 3, 0, 0, }, /* 674 */ - { 84, 10, 5, 0, 0, }, /* 675 */ - { 84, 7, 12, 0, 0, }, /* 676 */ - { 84, 21, 12, 0, 0, }, /* 677 */ - { 84, 1, 4, 0, 0, }, /* 678 */ - { 100, 7, 12, 0, 0, }, /* 679 */ - { 100, 13, 12, 0, 0, }, /* 680 */ - { 95, 12, 3, 0, 0, }, /* 681 */ - { 95, 7, 12, 0, 0, }, /* 682 */ - { 95, 10, 5, 0, 0, }, /* 683 */ - { 95, 13, 12, 0, 0, }, /* 684 */ - { 95, 21, 12, 0, 0, }, /* 685 */ - { 110, 7, 12, 0, 0, }, /* 686 */ - { 110, 12, 3, 0, 0, }, /* 687 */ - { 110, 21, 12, 0, 0, }, /* 688 */ - { 99, 12, 3, 0, 0, }, /* 689 */ - { 99, 10, 5, 0, 0, }, /* 690 */ - { 99, 7, 12, 0, 0, }, /* 691 */ - { 99, 7, 4, 0, 0, }, /* 692 */ - { 99, 21, 12, 0, 0, }, /* 693 */ - { 99, 13, 12, 0, 0, }, /* 694 */ - { 47, 15, 12, 0, 0, }, /* 695 */ - { 107, 7, 12, 0, 0, }, /* 696 */ - { 107, 10, 5, 0, 0, }, /* 697 */ - { 107, 12, 3, 0, 0, }, /* 698 */ - { 107, 21, 12, 0, 0, }, /* 699 */ - { 128, 7, 12, 0, 0, }, /* 700 */ - { 128, 21, 12, 0, 0, }, /* 701 */ - { 108, 7, 12, 0, 0, }, /* 702 */ - { 108, 12, 3, 0, 0, }, /* 703 */ - { 108, 10, 5, 0, 0, }, /* 704 */ - { 108, 13, 12, 0, 0, }, /* 705 */ - { 106, 12, 3, 0, 0, }, /* 706 */ - { 106, 10, 5, 0, 0, }, /* 707 */ - { 106, 7, 12, 0, 0, }, /* 708 */ - { 106, 10, 3, 0, 0, }, /* 709 */ - { 134, 7, 12, 0, 0, }, /* 710 */ - { 134, 10, 5, 0, 0, }, /* 711 */ - { 134, 12, 3, 0, 0, }, /* 712 */ - { 134, 21, 12, 0, 0, }, /* 713 */ - { 134, 13, 12, 0, 0, }, /* 714 */ - { 123, 7, 12, 0, 0, }, /* 715 */ - { 123, 10, 3, 0, 0, }, /* 716 */ - { 123, 10, 5, 0, 0, }, /* 717 */ - { 123, 12, 3, 0, 0, }, /* 718 */ - { 123, 21, 12, 0, 0, }, /* 719 */ - { 123, 13, 12, 0, 0, }, /* 720 */ - { 122, 7, 12, 0, 0, }, /* 721 */ - { 122, 10, 3, 0, 0, }, /* 722 */ - { 122, 10, 5, 0, 0, }, /* 723 */ - { 122, 12, 3, 0, 0, }, /* 724 */ - { 122, 21, 12, 0, 0, }, /* 725 */ - { 113, 7, 12, 0, 0, }, /* 726 */ - { 113, 10, 5, 0, 0, }, /* 727 */ - { 113, 12, 3, 0, 0, }, /* 728 */ - { 113, 21, 12, 0, 0, }, /* 729 */ - { 113, 13, 12, 0, 0, }, /* 730 */ - { 101, 7, 12, 0, 0, }, /* 731 */ - { 101, 12, 3, 0, 0, }, /* 732 */ - { 101, 10, 5, 0, 0, }, /* 733 */ - { 101, 13, 12, 0, 0, }, /* 734 */ - { 125, 7, 12, 0, 0, }, /* 735 */ - { 125, 12, 3, 0, 0, }, /* 736 */ - { 125, 10, 5, 0, 0, }, /* 737 */ - { 125, 13, 12, 0, 0, }, /* 738 */ - { 125, 15, 12, 0, 0, }, /* 739 */ - { 125, 21, 12, 0, 0, }, /* 740 */ - { 125, 26, 12, 0, 0, }, /* 741 */ - { 124, 9, 12, 0, 32, }, /* 742 */ - { 124, 5, 12, 0, -32, }, /* 743 */ - { 124, 13, 12, 0, 0, }, /* 744 */ - { 124, 15, 12, 0, 0, }, /* 745 */ - { 124, 7, 12, 0, 0, }, /* 746 */ - { 140, 7, 12, 0, 0, }, /* 747 */ - { 140, 12, 3, 0, 0, }, /* 748 */ - { 140, 10, 5, 0, 0, }, /* 749 */ - { 140, 7, 4, 0, 0, }, /* 750 */ - { 140, 21, 12, 0, 0, }, /* 751 */ - { 139, 7, 12, 0, 0, }, /* 752 */ - { 139, 12, 3, 0, 0, }, /* 753 */ - { 139, 10, 5, 0, 0, }, /* 754 */ - { 139, 7, 4, 0, 0, }, /* 755 */ - { 139, 21, 12, 0, 0, }, /* 756 */ - { 121, 7, 12, 0, 0, }, /* 757 */ - { 132, 7, 12, 0, 0, }, /* 758 */ - { 132, 10, 5, 0, 0, }, /* 759 */ - { 132, 12, 3, 0, 0, }, /* 760 */ - { 132, 21, 12, 0, 0, }, /* 761 */ - { 132, 13, 12, 0, 0, }, /* 762 */ - { 132, 15, 12, 0, 0, }, /* 763 */ - { 133, 21, 12, 0, 0, }, /* 764 */ - { 133, 7, 12, 0, 0, }, /* 765 */ - { 133, 12, 3, 0, 0, }, /* 766 */ - { 133, 10, 5, 0, 0, }, /* 767 */ - { 137, 7, 12, 0, 0, }, /* 768 */ - { 137, 12, 3, 0, 0, }, /* 769 */ - { 137, 7, 4, 0, 0, }, /* 770 */ - { 137, 13, 12, 0, 0, }, /* 771 */ - { 62, 7, 12, 0, 0, }, /* 772 */ - { 62, 14, 12, 0, 0, }, /* 773 */ - { 62, 21, 12, 0, 0, }, /* 774 */ - { 79, 7, 12, 0, 0, }, /* 775 */ - { 126, 7, 12, 0, 0, }, /* 776 */ - { 114, 7, 12, 0, 0, }, /* 777 */ - { 114, 13, 12, 0, 0, }, /* 778 */ - { 114, 21, 12, 0, 0, }, /* 779 */ - { 102, 7, 12, 0, 0, }, /* 780 */ - { 102, 12, 3, 0, 0, }, /* 781 */ - { 102, 21, 12, 0, 0, }, /* 782 */ - { 118, 7, 12, 0, 0, }, /* 783 */ - { 118, 12, 3, 0, 0, }, /* 784 */ - { 118, 21, 12, 0, 0, }, /* 785 */ - { 118, 26, 12, 0, 0, }, /* 786 */ - { 118, 6, 12, 0, 0, }, /* 787 */ - { 118, 13, 12, 0, 0, }, /* 788 */ - { 118, 15, 12, 0, 0, }, /* 789 */ - { 98, 7, 12, 0, 0, }, /* 790 */ - { 98, 10, 5, 0, 0, }, /* 791 */ - { 98, 12, 3, 0, 0, }, /* 792 */ - { 98, 6, 12, 0, 0, }, /* 793 */ - { 136, 6, 12, 0, 0, }, /* 794 */ - { 138, 6, 12, 0, 0, }, /* 795 */ - { 136, 7, 12, 0, 0, }, /* 796 */ - { 138, 7, 12, 0, 0, }, /* 797 */ - { 104, 7, 12, 0, 0, }, /* 798 */ - { 104, 26, 12, 0, 0, }, /* 799 */ - { 104, 12, 3, 0, 0, }, /* 800 */ - { 104, 21, 12, 0, 0, }, /* 801 */ - { 9, 10, 3, 0, 0, }, /* 802 */ - { 19, 12, 3, 0, 0, }, /* 803 */ - { 130, 26, 12, 0, 0, }, /* 804 */ - { 130, 12, 3, 0, 0, }, /* 805 */ - { 130, 21, 12, 0, 0, }, /* 806 */ - { 17, 12, 3, 0, 0, }, /* 807 */ - { 112, 7, 12, 0, 0, }, /* 808 */ - { 112, 15, 12, 0, 0, }, /* 809 */ - { 112, 12, 3, 0, 0, }, /* 810 */ - { 131, 9, 12, 0, 34, }, /* 811 */ - { 131, 5, 12, 0, -34, }, /* 812 */ - { 131, 12, 3, 0, 0, }, /* 813 */ - { 131, 13, 12, 0, 0, }, /* 814 */ - { 131, 21, 12, 0, 0, }, /* 815 */ - { 9, 26, 11, 0, 0, }, /* 816 */ - { 26, 26, 12, 0, 0, }, /* 817 */ - { 9, 24, 14, 0, 0, }, /* 818 */ - { 9, 26, 15, 0, 0, }, /* 819 */ - { 9, 1, 3, 0, 0, }, /* 820 */ + { 1, 5, 12, 0, -48, }, /* 201 */ + { 1, 17, 12, 0, 0, }, /* 202 */ + { 1, 26, 12, 0, 0, }, /* 203 */ + { 1, 23, 12, 0, 0, }, /* 204 */ + { 25, 12, 3, 0, 0, }, /* 205 */ + { 25, 17, 12, 0, 0, }, /* 206 */ + { 25, 21, 12, 0, 0, }, /* 207 */ + { 25, 7, 12, 0, 0, }, /* 208 */ + { 0, 1, 4, 0, 0, }, /* 209 */ + { 9, 1, 4, 0, 0, }, /* 210 */ + { 0, 25, 12, 0, 0, }, /* 211 */ + { 0, 21, 12, 0, 0, }, /* 212 */ + { 0, 23, 12, 0, 0, }, /* 213 */ + { 0, 26, 12, 0, 0, }, /* 214 */ + { 0, 12, 3, 0, 0, }, /* 215 */ + { 0, 1, 2, 0, 0, }, /* 216 */ + { 0, 7, 12, 0, 0, }, /* 217 */ + { 0, 13, 12, 0, 0, }, /* 218 */ + { 0, 6, 12, 0, 0, }, /* 219 */ + { 49, 21, 12, 0, 0, }, /* 220 */ + { 49, 1, 4, 0, 0, }, /* 221 */ + { 49, 7, 12, 0, 0, }, /* 222 */ + { 49, 12, 3, 0, 0, }, /* 223 */ + { 55, 7, 12, 0, 0, }, /* 224 */ + { 55, 12, 3, 0, 0, }, /* 225 */ + { 63, 13, 12, 0, 0, }, /* 226 */ + { 63, 7, 12, 0, 0, }, /* 227 */ + { 63, 12, 3, 0, 0, }, /* 228 */ + { 63, 6, 12, 0, 0, }, /* 229 */ + { 63, 26, 12, 0, 0, }, /* 230 */ + { 63, 21, 12, 0, 0, }, /* 231 */ + { 63, 23, 12, 0, 0, }, /* 232 */ + { 89, 7, 12, 0, 0, }, /* 233 */ + { 89, 12, 3, 0, 0, }, /* 234 */ + { 89, 6, 12, 0, 0, }, /* 235 */ + { 89, 21, 12, 0, 0, }, /* 236 */ + { 94, 7, 12, 0, 0, }, /* 237 */ + { 94, 12, 3, 0, 0, }, /* 238 */ + { 94, 21, 12, 0, 0, }, /* 239 */ + { 14, 12, 3, 0, 0, }, /* 240 */ + { 14, 10, 5, 0, 0, }, /* 241 */ + { 14, 7, 12, 0, 0, }, /* 242 */ + { 14, 13, 12, 0, 0, }, /* 243 */ + { 14, 21, 12, 0, 0, }, /* 244 */ + { 14, 6, 12, 0, 0, }, /* 245 */ + { 2, 7, 12, 0, 0, }, /* 246 */ + { 2, 12, 3, 0, 0, }, /* 247 */ + { 2, 10, 5, 0, 0, }, /* 248 */ + { 2, 10, 3, 0, 0, }, /* 249 */ + { 2, 13, 12, 0, 0, }, /* 250 */ + { 2, 23, 12, 0, 0, }, /* 251 */ + { 2, 15, 12, 0, 0, }, /* 252 */ + { 2, 26, 12, 0, 0, }, /* 253 */ + { 2, 21, 12, 0, 0, }, /* 254 */ + { 21, 12, 3, 0, 0, }, /* 255 */ + { 21, 10, 5, 0, 0, }, /* 256 */ + { 21, 7, 12, 0, 0, }, /* 257 */ + { 21, 13, 12, 0, 0, }, /* 258 */ + { 21, 21, 12, 0, 0, }, /* 259 */ + { 20, 12, 3, 0, 0, }, /* 260 */ + { 20, 10, 5, 0, 0, }, /* 261 */ + { 20, 7, 12, 0, 0, }, /* 262 */ + { 20, 13, 12, 0, 0, }, /* 263 */ + { 20, 21, 12, 0, 0, }, /* 264 */ + { 20, 23, 12, 0, 0, }, /* 265 */ + { 43, 12, 3, 0, 0, }, /* 266 */ + { 43, 10, 5, 0, 0, }, /* 267 */ + { 43, 7, 12, 0, 0, }, /* 268 */ + { 43, 10, 3, 0, 0, }, /* 269 */ + { 43, 13, 12, 0, 0, }, /* 270 */ + { 43, 26, 12, 0, 0, }, /* 271 */ + { 43, 15, 12, 0, 0, }, /* 272 */ + { 53, 12, 3, 0, 0, }, /* 273 */ + { 53, 7, 12, 0, 0, }, /* 274 */ + { 53, 10, 3, 0, 0, }, /* 275 */ + { 53, 10, 5, 0, 0, }, /* 276 */ + { 53, 13, 12, 0, 0, }, /* 277 */ + { 53, 15, 12, 0, 0, }, /* 278 */ + { 53, 26, 12, 0, 0, }, /* 279 */ + { 53, 23, 12, 0, 0, }, /* 280 */ + { 54, 12, 3, 0, 0, }, /* 281 */ + { 54, 10, 5, 0, 0, }, /* 282 */ + { 54, 7, 12, 0, 0, }, /* 283 */ + { 54, 13, 12, 0, 0, }, /* 284 */ + { 54, 15, 12, 0, 0, }, /* 285 */ + { 54, 26, 12, 0, 0, }, /* 286 */ + { 28, 7, 12, 0, 0, }, /* 287 */ + { 28, 12, 3, 0, 0, }, /* 288 */ + { 28, 10, 5, 0, 0, }, /* 289 */ + { 28, 21, 12, 0, 0, }, /* 290 */ + { 28, 10, 3, 0, 0, }, /* 291 */ + { 28, 13, 12, 0, 0, }, /* 292 */ + { 36, 12, 3, 0, 0, }, /* 293 */ + { 36, 10, 5, 0, 0, }, /* 294 */ + { 36, 7, 12, 0, 0, }, /* 295 */ + { 36, 10, 3, 0, 0, }, /* 296 */ + { 36, 7, 4, 0, 0, }, /* 297 */ + { 36, 26, 12, 0, 0, }, /* 298 */ + { 36, 15, 12, 0, 0, }, /* 299 */ + { 36, 13, 12, 0, 0, }, /* 300 */ + { 47, 10, 5, 0, 0, }, /* 301 */ + { 47, 7, 12, 0, 0, }, /* 302 */ + { 47, 12, 3, 0, 0, }, /* 303 */ + { 47, 10, 3, 0, 0, }, /* 304 */ + { 47, 13, 12, 0, 0, }, /* 305 */ + { 47, 21, 12, 0, 0, }, /* 306 */ + { 56, 7, 12, 0, 0, }, /* 307 */ + { 56, 12, 3, 0, 0, }, /* 308 */ + { 56, 7, 5, 0, 0, }, /* 309 */ + { 56, 6, 12, 0, 0, }, /* 310 */ + { 56, 21, 12, 0, 0, }, /* 311 */ + { 56, 13, 12, 0, 0, }, /* 312 */ + { 32, 7, 12, 0, 0, }, /* 313 */ + { 32, 12, 3, 0, 0, }, /* 314 */ + { 32, 7, 5, 0, 0, }, /* 315 */ + { 32, 6, 12, 0, 0, }, /* 316 */ + { 32, 13, 12, 0, 0, }, /* 317 */ + { 57, 7, 12, 0, 0, }, /* 318 */ + { 57, 26, 12, 0, 0, }, /* 319 */ + { 57, 21, 12, 0, 0, }, /* 320 */ + { 57, 12, 3, 0, 0, }, /* 321 */ + { 57, 13, 12, 0, 0, }, /* 322 */ + { 57, 15, 12, 0, 0, }, /* 323 */ + { 57, 22, 12, 0, 0, }, /* 324 */ + { 57, 18, 12, 0, 0, }, /* 325 */ + { 57, 10, 5, 0, 0, }, /* 326 */ + { 38, 7, 12, 0, 0, }, /* 327 */ + { 38, 10, 12, 0, 0, }, /* 328 */ + { 38, 12, 3, 0, 0, }, /* 329 */ + { 38, 10, 5, 0, 0, }, /* 330 */ + { 38, 13, 12, 0, 0, }, /* 331 */ + { 38, 21, 12, 0, 0, }, /* 332 */ + { 38, 26, 12, 0, 0, }, /* 333 */ + { 16, 9, 12, 0, 7264, }, /* 334 */ + { 16, 5, 12, 0, 3008, }, /* 335 */ + { 16, 6, 12, 0, 0, }, /* 336 */ + { 23, 7, 6, 0, 0, }, /* 337 */ + { 23, 7, 7, 0, 0, }, /* 338 */ + { 23, 7, 8, 0, 0, }, /* 339 */ + { 15, 7, 12, 0, 0, }, /* 340 */ + { 15, 12, 3, 0, 0, }, /* 341 */ + { 15, 21, 12, 0, 0, }, /* 342 */ + { 15, 15, 12, 0, 0, }, /* 343 */ + { 15, 26, 12, 0, 0, }, /* 344 */ + { 8, 9, 12, 0, 38864, }, /* 345 */ + { 8, 9, 12, 0, 8, }, /* 346 */ + { 8, 5, 12, 0, -8, }, /* 347 */ + { 7, 17, 12, 0, 0, }, /* 348 */ + { 7, 7, 12, 0, 0, }, /* 349 */ + { 7, 21, 12, 0, 0, }, /* 350 */ + { 40, 29, 12, 0, 0, }, /* 351 */ + { 40, 7, 12, 0, 0, }, /* 352 */ + { 40, 22, 12, 0, 0, }, /* 353 */ + { 40, 18, 12, 0, 0, }, /* 354 */ + { 45, 7, 12, 0, 0, }, /* 355 */ + { 45, 14, 12, 0, 0, }, /* 356 */ + { 50, 7, 12, 0, 0, }, /* 357 */ + { 50, 12, 3, 0, 0, }, /* 358 */ + { 24, 7, 12, 0, 0, }, /* 359 */ + { 24, 12, 3, 0, 0, }, /* 360 */ + { 6, 7, 12, 0, 0, }, /* 361 */ + { 6, 12, 3, 0, 0, }, /* 362 */ + { 51, 7, 12, 0, 0, }, /* 363 */ + { 51, 12, 3, 0, 0, }, /* 364 */ + { 31, 7, 12, 0, 0, }, /* 365 */ + { 31, 12, 3, 0, 0, }, /* 366 */ + { 31, 10, 5, 0, 0, }, /* 367 */ + { 31, 21, 12, 0, 0, }, /* 368 */ + { 31, 6, 12, 0, 0, }, /* 369 */ + { 31, 23, 12, 0, 0, }, /* 370 */ + { 31, 13, 12, 0, 0, }, /* 371 */ + { 31, 15, 12, 0, 0, }, /* 372 */ + { 37, 21, 12, 0, 0, }, /* 373 */ + { 37, 17, 12, 0, 0, }, /* 374 */ + { 37, 12, 3, 0, 0, }, /* 375 */ + { 37, 1, 2, 0, 0, }, /* 376 */ + { 37, 13, 12, 0, 0, }, /* 377 */ + { 37, 7, 12, 0, 0, }, /* 378 */ + { 37, 6, 12, 0, 0, }, /* 379 */ + { 34, 7, 12, 0, 0, }, /* 380 */ + { 34, 12, 3, 0, 0, }, /* 381 */ + { 34, 10, 5, 0, 0, }, /* 382 */ + { 34, 26, 12, 0, 0, }, /* 383 */ + { 34, 21, 12, 0, 0, }, /* 384 */ + { 34, 13, 12, 0, 0, }, /* 385 */ + { 52, 7, 12, 0, 0, }, /* 386 */ + { 39, 7, 12, 0, 0, }, /* 387 */ + { 39, 13, 12, 0, 0, }, /* 388 */ + { 39, 15, 12, 0, 0, }, /* 389 */ + { 39, 26, 12, 0, 0, }, /* 390 */ + { 31, 26, 12, 0, 0, }, /* 391 */ + { 5, 7, 12, 0, 0, }, /* 392 */ + { 5, 12, 3, 0, 0, }, /* 393 */ + { 5, 10, 5, 0, 0, }, /* 394 */ + { 5, 21, 12, 0, 0, }, /* 395 */ + { 90, 7, 12, 0, 0, }, /* 396 */ + { 90, 10, 5, 0, 0, }, /* 397 */ + { 90, 12, 3, 0, 0, }, /* 398 */ + { 90, 10, 12, 0, 0, }, /* 399 */ + { 90, 13, 12, 0, 0, }, /* 400 */ + { 90, 21, 12, 0, 0, }, /* 401 */ + { 90, 6, 12, 0, 0, }, /* 402 */ + { 27, 11, 3, 0, 0, }, /* 403 */ + { 61, 12, 3, 0, 0, }, /* 404 */ + { 61, 10, 5, 0, 0, }, /* 405 */ + { 61, 7, 12, 0, 0, }, /* 406 */ + { 61, 13, 12, 0, 0, }, /* 407 */ + { 61, 21, 12, 0, 0, }, /* 408 */ + { 61, 26, 12, 0, 0, }, /* 409 */ + { 75, 12, 3, 0, 0, }, /* 410 */ + { 75, 10, 5, 0, 0, }, /* 411 */ + { 75, 7, 12, 0, 0, }, /* 412 */ + { 75, 13, 12, 0, 0, }, /* 413 */ + { 92, 7, 12, 0, 0, }, /* 414 */ + { 92, 12, 3, 0, 0, }, /* 415 */ + { 92, 10, 5, 0, 0, }, /* 416 */ + { 92, 21, 12, 0, 0, }, /* 417 */ + { 69, 7, 12, 0, 0, }, /* 418 */ + { 69, 10, 5, 0, 0, }, /* 419 */ + { 69, 12, 3, 0, 0, }, /* 420 */ + { 69, 21, 12, 0, 0, }, /* 421 */ + { 69, 13, 12, 0, 0, }, /* 422 */ + { 72, 13, 12, 0, 0, }, /* 423 */ + { 72, 7, 12, 0, 0, }, /* 424 */ + { 72, 6, 12, 0, 0, }, /* 425 */ + { 72, 21, 12, 0, 0, }, /* 426 */ + { 12, 5, 12, 63, -6222, }, /* 427 */ + { 12, 5, 12, 67, -6221, }, /* 428 */ + { 12, 5, 12, 71, -6212, }, /* 429 */ + { 12, 5, 12, 75, -6210, }, /* 430 */ + { 12, 5, 12, 79, -6210, }, /* 431 */ + { 12, 5, 12, 79, -6211, }, /* 432 */ + { 12, 5, 12, 84, -6204, }, /* 433 */ + { 12, 5, 12, 88, -6180, }, /* 434 */ + { 12, 5, 12, 108, 35267, }, /* 435 */ + { 16, 9, 12, 0, -3008, }, /* 436 */ + { 75, 21, 12, 0, 0, }, /* 437 */ + { 9, 10, 5, 0, 0, }, /* 438 */ + { 9, 7, 12, 0, 0, }, /* 439 */ + { 12, 5, 12, 0, 0, }, /* 440 */ + { 12, 6, 12, 0, 0, }, /* 441 */ + { 33, 5, 12, 0, 35332, }, /* 442 */ + { 33, 5, 12, 0, 3814, }, /* 443 */ + { 33, 9, 12, 92, 1, }, /* 444 */ + { 33, 5, 12, 92, -1, }, /* 445 */ + { 33, 5, 12, 92, -58, }, /* 446 */ + { 33, 9, 12, 0, -7615, }, /* 447 */ + { 19, 5, 12, 0, 8, }, /* 448 */ + { 19, 9, 12, 0, -8, }, /* 449 */ + { 19, 5, 12, 0, 74, }, /* 450 */ + { 19, 5, 12, 0, 86, }, /* 451 */ + { 19, 5, 12, 0, 100, }, /* 452 */ + { 19, 5, 12, 0, 128, }, /* 453 */ + { 19, 5, 12, 0, 112, }, /* 454 */ + { 19, 5, 12, 0, 126, }, /* 455 */ + { 19, 8, 12, 0, -8, }, /* 456 */ + { 19, 5, 12, 0, 9, }, /* 457 */ + { 19, 9, 12, 0, -74, }, /* 458 */ + { 19, 8, 12, 0, -9, }, /* 459 */ + { 19, 5, 12, 21, -7173, }, /* 460 */ + { 19, 9, 12, 0, -86, }, /* 461 */ + { 19, 9, 12, 0, -100, }, /* 462 */ + { 19, 9, 12, 0, -112, }, /* 463 */ + { 19, 9, 12, 0, -128, }, /* 464 */ + { 19, 9, 12, 0, -126, }, /* 465 */ + { 27, 1, 3, 0, 0, }, /* 466 */ + { 27, 1, 13, 0, 0, }, /* 467 */ + { 9, 27, 2, 0, 0, }, /* 468 */ + { 9, 28, 2, 0, 0, }, /* 469 */ + { 9, 21, 14, 0, 0, }, /* 470 */ + { 9, 2, 2, 0, 0, }, /* 471 */ + { 9, 9, 12, 0, 0, }, /* 472 */ + { 9, 5, 12, 0, 0, }, /* 473 */ + { 19, 9, 12, 96, -7517, }, /* 474 */ + { 33, 9, 12, 100, -8383, }, /* 475 */ + { 33, 9, 12, 104, -8262, }, /* 476 */ + { 33, 9, 12, 0, 28, }, /* 477 */ + { 9, 5, 14, 0, 0, }, /* 478 */ + { 33, 5, 12, 0, -28, }, /* 479 */ + { 33, 14, 12, 0, 16, }, /* 480 */ + { 33, 14, 12, 0, -16, }, /* 481 */ + { 33, 14, 12, 0, 0, }, /* 482 */ + { 9, 25, 14, 0, 0, }, /* 483 */ + { 9, 26, 12, 0, 26, }, /* 484 */ + { 9, 26, 14, 0, 26, }, /* 485 */ + { 9, 26, 12, 0, -26, }, /* 486 */ + { 4, 26, 12, 0, 0, }, /* 487 */ + { 17, 9, 12, 0, 48, }, /* 488 */ + { 17, 5, 12, 0, -48, }, /* 489 */ + { 33, 9, 12, 0, -10743, }, /* 490 */ + { 33, 9, 12, 0, -3814, }, /* 491 */ + { 33, 9, 12, 0, -10727, }, /* 492 */ + { 33, 5, 12, 0, -10795, }, /* 493 */ + { 33, 5, 12, 0, -10792, }, /* 494 */ + { 33, 9, 12, 0, -10780, }, /* 495 */ + { 33, 9, 12, 0, -10749, }, /* 496 */ + { 33, 9, 12, 0, -10783, }, /* 497 */ + { 33, 9, 12, 0, -10782, }, /* 498 */ + { 33, 9, 12, 0, -10815, }, /* 499 */ + { 10, 5, 12, 0, 0, }, /* 500 */ + { 10, 26, 12, 0, 0, }, /* 501 */ + { 10, 12, 3, 0, 0, }, /* 502 */ + { 10, 21, 12, 0, 0, }, /* 503 */ + { 10, 15, 12, 0, 0, }, /* 504 */ + { 16, 5, 12, 0, -7264, }, /* 505 */ + { 58, 7, 12, 0, 0, }, /* 506 */ + { 58, 6, 12, 0, 0, }, /* 507 */ + { 58, 21, 12, 0, 0, }, /* 508 */ + { 58, 12, 3, 0, 0, }, /* 509 */ + { 22, 26, 12, 0, 0, }, /* 510 */ + { 22, 6, 12, 0, 0, }, /* 511 */ + { 22, 14, 12, 0, 0, }, /* 512 */ + { 23, 10, 3, 0, 0, }, /* 513 */ + { 9, 17, 14, 0, 0, }, /* 514 */ + { 26, 7, 12, 0, 0, }, /* 515 */ + { 26, 6, 12, 0, 0, }, /* 516 */ + { 29, 7, 12, 0, 0, }, /* 517 */ + { 29, 6, 12, 0, 0, }, /* 518 */ + { 3, 7, 12, 0, 0, }, /* 519 */ + { 23, 7, 12, 0, 0, }, /* 520 */ + { 23, 26, 12, 0, 0, }, /* 521 */ + { 29, 26, 12, 0, 0, }, /* 522 */ + { 22, 7, 12, 0, 0, }, /* 523 */ + { 60, 7, 12, 0, 0, }, /* 524 */ + { 60, 6, 12, 0, 0, }, /* 525 */ + { 60, 26, 12, 0, 0, }, /* 526 */ + { 85, 7, 12, 0, 0, }, /* 527 */ + { 85, 6, 12, 0, 0, }, /* 528 */ + { 85, 21, 12, 0, 0, }, /* 529 */ + { 76, 7, 12, 0, 0, }, /* 530 */ + { 76, 6, 12, 0, 0, }, /* 531 */ + { 76, 21, 12, 0, 0, }, /* 532 */ + { 76, 13, 12, 0, 0, }, /* 533 */ + { 12, 9, 12, 108, 1, }, /* 534 */ + { 12, 5, 12, 108, -35267, }, /* 535 */ + { 12, 7, 12, 0, 0, }, /* 536 */ + { 12, 21, 12, 0, 0, }, /* 537 */ + { 78, 7, 12, 0, 0, }, /* 538 */ + { 78, 14, 12, 0, 0, }, /* 539 */ + { 78, 12, 3, 0, 0, }, /* 540 */ + { 78, 21, 12, 0, 0, }, /* 541 */ + { 33, 9, 12, 0, -35332, }, /* 542 */ + { 33, 9, 12, 0, -42280, }, /* 543 */ + { 33, 9, 12, 0, -42308, }, /* 544 */ + { 33, 9, 12, 0, -42319, }, /* 545 */ + { 33, 9, 12, 0, -42315, }, /* 546 */ + { 33, 9, 12, 0, -42305, }, /* 547 */ + { 33, 9, 12, 0, -42258, }, /* 548 */ + { 33, 9, 12, 0, -42282, }, /* 549 */ + { 33, 9, 12, 0, -42261, }, /* 550 */ + { 33, 9, 12, 0, 928, }, /* 551 */ + { 48, 7, 12, 0, 0, }, /* 552 */ + { 48, 12, 3, 0, 0, }, /* 553 */ + { 48, 10, 5, 0, 0, }, /* 554 */ + { 48, 26, 12, 0, 0, }, /* 555 */ + { 64, 7, 12, 0, 0, }, /* 556 */ + { 64, 21, 12, 0, 0, }, /* 557 */ + { 74, 10, 5, 0, 0, }, /* 558 */ + { 74, 7, 12, 0, 0, }, /* 559 */ + { 74, 12, 3, 0, 0, }, /* 560 */ + { 74, 21, 12, 0, 0, }, /* 561 */ + { 74, 13, 12, 0, 0, }, /* 562 */ + { 68, 13, 12, 0, 0, }, /* 563 */ + { 68, 7, 12, 0, 0, }, /* 564 */ + { 68, 12, 3, 0, 0, }, /* 565 */ + { 68, 21, 12, 0, 0, }, /* 566 */ + { 73, 7, 12, 0, 0, }, /* 567 */ + { 73, 12, 3, 0, 0, }, /* 568 */ + { 73, 10, 5, 0, 0, }, /* 569 */ + { 73, 21, 12, 0, 0, }, /* 570 */ + { 83, 12, 3, 0, 0, }, /* 571 */ + { 83, 10, 5, 0, 0, }, /* 572 */ + { 83, 7, 12, 0, 0, }, /* 573 */ + { 83, 21, 12, 0, 0, }, /* 574 */ + { 83, 13, 12, 0, 0, }, /* 575 */ + { 38, 6, 12, 0, 0, }, /* 576 */ + { 67, 7, 12, 0, 0, }, /* 577 */ + { 67, 12, 3, 0, 0, }, /* 578 */ + { 67, 10, 5, 0, 0, }, /* 579 */ + { 67, 13, 12, 0, 0, }, /* 580 */ + { 67, 21, 12, 0, 0, }, /* 581 */ + { 91, 7, 12, 0, 0, }, /* 582 */ + { 91, 12, 3, 0, 0, }, /* 583 */ + { 91, 6, 12, 0, 0, }, /* 584 */ + { 91, 21, 12, 0, 0, }, /* 585 */ + { 86, 7, 12, 0, 0, }, /* 586 */ + { 86, 10, 5, 0, 0, }, /* 587 */ + { 86, 12, 3, 0, 0, }, /* 588 */ + { 86, 21, 12, 0, 0, }, /* 589 */ + { 86, 6, 12, 0, 0, }, /* 590 */ + { 33, 5, 12, 0, -928, }, /* 591 */ + { 8, 5, 12, 0, -38864, }, /* 592 */ + { 86, 13, 12, 0, 0, }, /* 593 */ + { 23, 7, 9, 0, 0, }, /* 594 */ + { 23, 7, 10, 0, 0, }, /* 595 */ + { 9, 4, 2, 0, 0, }, /* 596 */ + { 9, 3, 12, 0, 0, }, /* 597 */ + { 25, 25, 12, 0, 0, }, /* 598 */ + { 0, 24, 12, 0, 0, }, /* 599 */ + { 9, 6, 3, 0, 0, }, /* 600 */ + { 35, 7, 12, 0, 0, }, /* 601 */ + { 19, 14, 12, 0, 0, }, /* 602 */ + { 19, 15, 12, 0, 0, }, /* 603 */ + { 19, 26, 12, 0, 0, }, /* 604 */ + { 70, 7, 12, 0, 0, }, /* 605 */ + { 66, 7, 12, 0, 0, }, /* 606 */ + { 41, 7, 12, 0, 0, }, /* 607 */ + { 41, 15, 12, 0, 0, }, /* 608 */ + { 18, 7, 12, 0, 0, }, /* 609 */ + { 18, 14, 12, 0, 0, }, /* 610 */ + { 117, 7, 12, 0, 0, }, /* 611 */ + { 117, 12, 3, 0, 0, }, /* 612 */ + { 59, 7, 12, 0, 0, }, /* 613 */ + { 59, 21, 12, 0, 0, }, /* 614 */ + { 42, 7, 12, 0, 0, }, /* 615 */ + { 42, 21, 12, 0, 0, }, /* 616 */ + { 42, 14, 12, 0, 0, }, /* 617 */ + { 13, 9, 12, 0, 40, }, /* 618 */ + { 13, 5, 12, 0, -40, }, /* 619 */ + { 46, 7, 12, 0, 0, }, /* 620 */ + { 44, 7, 12, 0, 0, }, /* 621 */ + { 44, 13, 12, 0, 0, }, /* 622 */ + { 135, 9, 12, 0, 40, }, /* 623 */ + { 135, 5, 12, 0, -40, }, /* 624 */ + { 105, 7, 12, 0, 0, }, /* 625 */ + { 103, 7, 12, 0, 0, }, /* 626 */ + { 103, 21, 12, 0, 0, }, /* 627 */ + { 109, 7, 12, 0, 0, }, /* 628 */ + { 11, 7, 12, 0, 0, }, /* 629 */ + { 80, 7, 12, 0, 0, }, /* 630 */ + { 80, 21, 12, 0, 0, }, /* 631 */ + { 80, 15, 12, 0, 0, }, /* 632 */ + { 119, 7, 12, 0, 0, }, /* 633 */ + { 119, 26, 12, 0, 0, }, /* 634 */ + { 119, 15, 12, 0, 0, }, /* 635 */ + { 115, 7, 12, 0, 0, }, /* 636 */ + { 115, 15, 12, 0, 0, }, /* 637 */ + { 127, 7, 12, 0, 0, }, /* 638 */ + { 127, 15, 12, 0, 0, }, /* 639 */ + { 65, 7, 12, 0, 0, }, /* 640 */ + { 65, 15, 12, 0, 0, }, /* 641 */ + { 65, 21, 12, 0, 0, }, /* 642 */ + { 71, 7, 12, 0, 0, }, /* 643 */ + { 71, 21, 12, 0, 0, }, /* 644 */ + { 97, 7, 12, 0, 0, }, /* 645 */ + { 96, 7, 12, 0, 0, }, /* 646 */ + { 96, 15, 12, 0, 0, }, /* 647 */ + { 30, 7, 12, 0, 0, }, /* 648 */ + { 30, 12, 3, 0, 0, }, /* 649 */ + { 30, 15, 12, 0, 0, }, /* 650 */ + { 30, 21, 12, 0, 0, }, /* 651 */ + { 87, 7, 12, 0, 0, }, /* 652 */ + { 87, 15, 12, 0, 0, }, /* 653 */ + { 87, 21, 12, 0, 0, }, /* 654 */ + { 116, 7, 12, 0, 0, }, /* 655 */ + { 116, 15, 12, 0, 0, }, /* 656 */ + { 111, 7, 12, 0, 0, }, /* 657 */ + { 111, 26, 12, 0, 0, }, /* 658 */ + { 111, 12, 3, 0, 0, }, /* 659 */ + { 111, 15, 12, 0, 0, }, /* 660 */ + { 111, 21, 12, 0, 0, }, /* 661 */ + { 77, 7, 12, 0, 0, }, /* 662 */ + { 77, 21, 12, 0, 0, }, /* 663 */ + { 82, 7, 12, 0, 0, }, /* 664 */ + { 82, 15, 12, 0, 0, }, /* 665 */ + { 81, 7, 12, 0, 0, }, /* 666 */ + { 81, 15, 12, 0, 0, }, /* 667 */ + { 120, 7, 12, 0, 0, }, /* 668 */ + { 120, 21, 12, 0, 0, }, /* 669 */ + { 120, 15, 12, 0, 0, }, /* 670 */ + { 88, 7, 12, 0, 0, }, /* 671 */ + { 129, 9, 12, 0, 64, }, /* 672 */ + { 129, 5, 12, 0, -64, }, /* 673 */ + { 129, 15, 12, 0, 0, }, /* 674 */ + { 143, 7, 12, 0, 0, }, /* 675 */ + { 143, 12, 3, 0, 0, }, /* 676 */ + { 143, 13, 12, 0, 0, }, /* 677 */ + { 0, 15, 12, 0, 0, }, /* 678 */ + { 146, 7, 12, 0, 0, }, /* 679 */ + { 146, 15, 12, 0, 0, }, /* 680 */ + { 147, 7, 12, 0, 0, }, /* 681 */ + { 147, 12, 3, 0, 0, }, /* 682 */ + { 147, 15, 12, 0, 0, }, /* 683 */ + { 147, 21, 12, 0, 0, }, /* 684 */ + { 93, 10, 5, 0, 0, }, /* 685 */ + { 93, 12, 3, 0, 0, }, /* 686 */ + { 93, 7, 12, 0, 0, }, /* 687 */ + { 93, 21, 12, 0, 0, }, /* 688 */ + { 93, 15, 12, 0, 0, }, /* 689 */ + { 93, 13, 12, 0, 0, }, /* 690 */ + { 84, 12, 3, 0, 0, }, /* 691 */ + { 84, 10, 5, 0, 0, }, /* 692 */ + { 84, 7, 12, 0, 0, }, /* 693 */ + { 84, 21, 12, 0, 0, }, /* 694 */ + { 84, 1, 4, 0, 0, }, /* 695 */ + { 100, 7, 12, 0, 0, }, /* 696 */ + { 100, 13, 12, 0, 0, }, /* 697 */ + { 95, 12, 3, 0, 0, }, /* 698 */ + { 95, 7, 12, 0, 0, }, /* 699 */ + { 95, 10, 5, 0, 0, }, /* 700 */ + { 95, 13, 12, 0, 0, }, /* 701 */ + { 95, 21, 12, 0, 0, }, /* 702 */ + { 110, 7, 12, 0, 0, }, /* 703 */ + { 110, 12, 3, 0, 0, }, /* 704 */ + { 110, 21, 12, 0, 0, }, /* 705 */ + { 99, 12, 3, 0, 0, }, /* 706 */ + { 99, 10, 5, 0, 0, }, /* 707 */ + { 99, 7, 12, 0, 0, }, /* 708 */ + { 99, 7, 4, 0, 0, }, /* 709 */ + { 99, 21, 12, 0, 0, }, /* 710 */ + { 99, 13, 12, 0, 0, }, /* 711 */ + { 47, 15, 12, 0, 0, }, /* 712 */ + { 107, 7, 12, 0, 0, }, /* 713 */ + { 107, 10, 5, 0, 0, }, /* 714 */ + { 107, 12, 3, 0, 0, }, /* 715 */ + { 107, 21, 12, 0, 0, }, /* 716 */ + { 128, 7, 12, 0, 0, }, /* 717 */ + { 128, 21, 12, 0, 0, }, /* 718 */ + { 108, 7, 12, 0, 0, }, /* 719 */ + { 108, 12, 3, 0, 0, }, /* 720 */ + { 108, 10, 5, 0, 0, }, /* 721 */ + { 108, 13, 12, 0, 0, }, /* 722 */ + { 106, 12, 3, 0, 0, }, /* 723 */ + { 106, 10, 5, 0, 0, }, /* 724 */ + { 106, 7, 12, 0, 0, }, /* 725 */ + { 106, 10, 3, 0, 0, }, /* 726 */ + { 134, 7, 12, 0, 0, }, /* 727 */ + { 134, 10, 5, 0, 0, }, /* 728 */ + { 134, 12, 3, 0, 0, }, /* 729 */ + { 134, 21, 12, 0, 0, }, /* 730 */ + { 134, 13, 12, 0, 0, }, /* 731 */ + { 123, 7, 12, 0, 0, }, /* 732 */ + { 123, 10, 3, 0, 0, }, /* 733 */ + { 123, 10, 5, 0, 0, }, /* 734 */ + { 123, 12, 3, 0, 0, }, /* 735 */ + { 123, 21, 12, 0, 0, }, /* 736 */ + { 123, 13, 12, 0, 0, }, /* 737 */ + { 122, 7, 12, 0, 0, }, /* 738 */ + { 122, 10, 3, 0, 0, }, /* 739 */ + { 122, 10, 5, 0, 0, }, /* 740 */ + { 122, 12, 3, 0, 0, }, /* 741 */ + { 122, 21, 12, 0, 0, }, /* 742 */ + { 113, 7, 12, 0, 0, }, /* 743 */ + { 113, 10, 5, 0, 0, }, /* 744 */ + { 113, 12, 3, 0, 0, }, /* 745 */ + { 113, 21, 12, 0, 0, }, /* 746 */ + { 113, 13, 12, 0, 0, }, /* 747 */ + { 101, 7, 12, 0, 0, }, /* 748 */ + { 101, 12, 3, 0, 0, }, /* 749 */ + { 101, 10, 5, 0, 0, }, /* 750 */ + { 101, 13, 12, 0, 0, }, /* 751 */ + { 125, 7, 12, 0, 0, }, /* 752 */ + { 125, 12, 3, 0, 0, }, /* 753 */ + { 125, 10, 5, 0, 0, }, /* 754 */ + { 125, 13, 12, 0, 0, }, /* 755 */ + { 125, 15, 12, 0, 0, }, /* 756 */ + { 125, 21, 12, 0, 0, }, /* 757 */ + { 125, 26, 12, 0, 0, }, /* 758 */ + { 141, 7, 12, 0, 0, }, /* 759 */ + { 141, 10, 5, 0, 0, }, /* 760 */ + { 141, 12, 3, 0, 0, }, /* 761 */ + { 141, 21, 12, 0, 0, }, /* 762 */ + { 124, 9, 12, 0, 32, }, /* 763 */ + { 124, 5, 12, 0, -32, }, /* 764 */ + { 124, 13, 12, 0, 0, }, /* 765 */ + { 124, 15, 12, 0, 0, }, /* 766 */ + { 124, 7, 12, 0, 0, }, /* 767 */ + { 140, 7, 12, 0, 0, }, /* 768 */ + { 140, 12, 3, 0, 0, }, /* 769 */ + { 140, 10, 5, 0, 0, }, /* 770 */ + { 140, 7, 4, 0, 0, }, /* 771 */ + { 140, 21, 12, 0, 0, }, /* 772 */ + { 139, 7, 12, 0, 0, }, /* 773 */ + { 139, 12, 3, 0, 0, }, /* 774 */ + { 139, 10, 5, 0, 0, }, /* 775 */ + { 139, 7, 4, 0, 0, }, /* 776 */ + { 139, 21, 12, 0, 0, }, /* 777 */ + { 121, 7, 12, 0, 0, }, /* 778 */ + { 132, 7, 12, 0, 0, }, /* 779 */ + { 132, 10, 5, 0, 0, }, /* 780 */ + { 132, 12, 3, 0, 0, }, /* 781 */ + { 132, 21, 12, 0, 0, }, /* 782 */ + { 132, 13, 12, 0, 0, }, /* 783 */ + { 132, 15, 12, 0, 0, }, /* 784 */ + { 133, 21, 12, 0, 0, }, /* 785 */ + { 133, 7, 12, 0, 0, }, /* 786 */ + { 133, 12, 3, 0, 0, }, /* 787 */ + { 133, 10, 5, 0, 0, }, /* 788 */ + { 137, 7, 12, 0, 0, }, /* 789 */ + { 137, 12, 3, 0, 0, }, /* 790 */ + { 137, 7, 4, 0, 0, }, /* 791 */ + { 137, 13, 12, 0, 0, }, /* 792 */ + { 142, 7, 12, 0, 0, }, /* 793 */ + { 142, 10, 5, 0, 0, }, /* 794 */ + { 142, 12, 3, 0, 0, }, /* 795 */ + { 142, 13, 12, 0, 0, }, /* 796 */ + { 144, 7, 12, 0, 0, }, /* 797 */ + { 144, 12, 3, 0, 0, }, /* 798 */ + { 144, 10, 5, 0, 0, }, /* 799 */ + { 144, 21, 12, 0, 0, }, /* 800 */ + { 62, 7, 12, 0, 0, }, /* 801 */ + { 62, 14, 12, 0, 0, }, /* 802 */ + { 62, 21, 12, 0, 0, }, /* 803 */ + { 79, 7, 12, 0, 0, }, /* 804 */ + { 126, 7, 12, 0, 0, }, /* 805 */ + { 114, 7, 12, 0, 0, }, /* 806 */ + { 114, 13, 12, 0, 0, }, /* 807 */ + { 114, 21, 12, 0, 0, }, /* 808 */ + { 102, 7, 12, 0, 0, }, /* 809 */ + { 102, 12, 3, 0, 0, }, /* 810 */ + { 102, 21, 12, 0, 0, }, /* 811 */ + { 118, 7, 12, 0, 0, }, /* 812 */ + { 118, 12, 3, 0, 0, }, /* 813 */ + { 118, 21, 12, 0, 0, }, /* 814 */ + { 118, 26, 12, 0, 0, }, /* 815 */ + { 118, 6, 12, 0, 0, }, /* 816 */ + { 118, 13, 12, 0, 0, }, /* 817 */ + { 118, 15, 12, 0, 0, }, /* 818 */ + { 145, 9, 12, 0, 32, }, /* 819 */ + { 145, 5, 12, 0, -32, }, /* 820 */ + { 145, 15, 12, 0, 0, }, /* 821 */ + { 145, 21, 12, 0, 0, }, /* 822 */ + { 98, 7, 12, 0, 0, }, /* 823 */ + { 98, 10, 5, 0, 0, }, /* 824 */ + { 98, 12, 3, 0, 0, }, /* 825 */ + { 98, 6, 12, 0, 0, }, /* 826 */ + { 136, 6, 12, 0, 0, }, /* 827 */ + { 138, 6, 12, 0, 0, }, /* 828 */ + { 136, 7, 12, 0, 0, }, /* 829 */ + { 138, 7, 12, 0, 0, }, /* 830 */ + { 104, 7, 12, 0, 0, }, /* 831 */ + { 104, 26, 12, 0, 0, }, /* 832 */ + { 104, 12, 3, 0, 0, }, /* 833 */ + { 104, 21, 12, 0, 0, }, /* 834 */ + { 9, 10, 3, 0, 0, }, /* 835 */ + { 19, 12, 3, 0, 0, }, /* 836 */ + { 130, 26, 12, 0, 0, }, /* 837 */ + { 130, 12, 3, 0, 0, }, /* 838 */ + { 130, 21, 12, 0, 0, }, /* 839 */ + { 17, 12, 3, 0, 0, }, /* 840 */ + { 112, 7, 12, 0, 0, }, /* 841 */ + { 112, 15, 12, 0, 0, }, /* 842 */ + { 112, 12, 3, 0, 0, }, /* 843 */ + { 131, 9, 12, 0, 34, }, /* 844 */ + { 131, 5, 12, 0, -34, }, /* 845 */ + { 131, 12, 3, 0, 0, }, /* 846 */ + { 131, 13, 12, 0, 0, }, /* 847 */ + { 131, 21, 12, 0, 0, }, /* 848 */ + { 9, 2, 14, 0, 0, }, /* 849 */ + { 9, 26, 11, 0, 0, }, /* 850 */ + { 26, 26, 12, 0, 0, }, /* 851 */ + { 9, 24, 3, 0, 0, }, /* 852 */ + { 9, 1, 3, 0, 0, }, /* 853 */ }; -const uint8_t PRIV(ucd_stage1)[] = { /* 8704 bytes */ +const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, /* U+0000 */ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, /* U+0800 */ 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 41, 41, 42, 43, 44, 45, /* U+1000 */ 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, /* U+1800 */ 62, 63, 64, 65, 66, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, /* U+2000 */ - 77, 77, 66, 78, 66, 66, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, /* U+2800 */ - 89, 90, 91, 92, 93, 94, 95, 71, 96, 96, 96, 96, 96, 96, 96, 96, /* U+3000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+3800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+4000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 97, 96, 96, 96, 96, /* U+4800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+5000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+5800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+6000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+6800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+7000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+7800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+8000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+8800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+9000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 98, /* U+9800 */ - 99,100,100,100,100,100,100,100,100,101,102,102,103,104,105,106, /* U+A000 */ -107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,115, /* U+A800 */ -116,117,118,119,120,121,115,116,117,118,119,120,121,115,116,117, /* U+B000 */ -118,119,120,121,115,116,117,118,119,120,121,115,116,117,118,119, /* U+B800 */ -120,121,115,116,117,118,119,120,121,115,116,117,118,119,120,121, /* U+C000 */ -115,116,117,118,119,120,121,115,116,117,118,119,120,121,115,116, /* U+C800 */ -117,118,119,120,121,115,116,117,118,119,120,121,115,116,117,122, /* U+D000 */ -123,123,123,123,123,123,123,123,123,123,123,123,123,123,123,123, /* U+D800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+E000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+E800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F000 */ -124,124, 96, 96,125,126,127,128,129,129,130,131,132,133,134,135, /* U+F800 */ -136,137,138,139,140,141,142,143,144,145,146,140,147,147,148,140, /* U+10000 */ -149,150,151,152,153,154,155,156,157,158,140,140,159,140,140,140, /* U+10800 */ -160,161,162,163,164,165,166,140,167,168,140,169,170,171,172,140, /* U+11000 */ -140,173,140,140,174,175,140,140,176,177,178,140,140,140,140,140, /* U+11800 */ -179,179,179,179,179,179,179,180,181,179,182,140,140,140,140,140, /* U+12000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+12800 */ -183,183,183,183,183,183,183,183,184,140,140,140,140,140,140,140, /* U+13000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+13800 */ -140,140,140,140,140,140,140,140,185,185,185,185,186,140,140,140, /* U+14000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+14800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+15000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+15800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+16000 */ -187,187,187,187,188,189,190,191,140,140,140,140,140,140,192,193, /* U+16800 */ -194,194,194,194,194,194,194,194,194,194,194,194,194,194,194,194, /* U+17000 */ -194,194,194,194,194,194,194,194,194,194,194,194,194,194,194,194, /* U+17800 */ -194,194,194,194,194,194,194,194,194,194,194,194,194,194,194,195, /* U+18000 */ -194,194,194,194,194,196,140,140,140,140,140,140,140,140,140,140, /* U+18800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+19000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+19800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1A800 */ -197,198,199,200,200,201,140,140,140,140,140,140,140,140,140,140, /* U+1B000 */ -140,140,140,140,140,140,140,140,202,203,140,140,140,140,140,140, /* U+1B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1C800 */ - 71,204,205,206,207,140,208,140,209,210,211,212,213,214,215,216, /* U+1D000 */ -217,217,217,217,218,219,140,140,140,140,140,140,140,140,140,140, /* U+1D800 */ -220,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1E000 */ -221,222,223,140,140,140,140,140,140,140,140,140,224,225,140,140, /* U+1E800 */ -226,227,228,229,230,140,231,232,233,234,235,236,237,238,239,240, /* U+1F000 */ -241,242,243,244,140,140,140,140,140,140,140,140,140,140,140,140, /* U+1F800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+20000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+20800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+21000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+21800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+22000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+22800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+23000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+23800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+24000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+24800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+25000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+25800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+26000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+26800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+27000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+27800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+28000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+28800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+29000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+29800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,245, 96, 96, /* U+2A000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2A800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,246, 96, /* U+2B000 */ -247, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2B800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2C000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96,248, 96, 96, /* U+2C800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2D000 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2D800 */ - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, /* U+2E000 */ - 96, 96, 96, 96, 96, 96, 96,249,140,140,140,140,140,140,140,140, /* U+2E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+2F000 */ - 96, 96, 96, 96,250,140,140,140,140,140,140,140,140,140,140,140, /* U+2F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+30000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+30800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+31000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+31800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+32000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+32800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+33000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+33800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+34000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+34800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+35000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+35800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+36000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+36800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+37000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+37800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+38000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+38800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+39000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+39800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+3F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+40000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+40800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+41000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+41800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+42000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+42800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+43000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+43800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+44000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+44800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+45000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+45800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+46000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+46800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+47000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+47800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+48000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+48800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+49000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+49800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+4F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+50000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+50800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+51000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+51800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+52000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+52800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+53000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+53800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+54000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+54800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+55000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+55800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+56000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+56800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+57000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+57800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+58000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+58800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+59000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+59800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+5F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+60000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+60800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+61000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+61800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+62000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+62800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+63000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+63800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+64000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+64800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+65000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+65800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+66000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+66800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+67000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+67800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+68000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+68800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+69000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+69800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+6F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+70000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+70800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+71000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+71800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+72000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+72800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+73000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+73800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+74000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+74800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+75000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+75800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+76000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+76800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+77000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+77800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+78000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+78800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+79000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+79800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+7F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+80000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+80800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+81000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+81800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+82000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+82800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+83000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+83800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+84000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+84800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+85000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+85800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+86000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+86800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+87000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+87800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+88000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+88800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+89000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+89800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+8F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+90000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+90800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+91000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+91800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+92000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+92800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+93000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+93800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+94000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+94800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+95000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+95800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+96000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+96800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+97000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+97800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+98000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+98800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+99000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+99800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9A000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9A800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9B000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9B800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9C000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9C800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9D000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9D800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9E000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9E800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9F000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+9F800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A0000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A0800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A1000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A1800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A2000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A2800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A3000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A3800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A4000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A4800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A5000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A5800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A6000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A6800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A7000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A7800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A8000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A8800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A9000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+A9800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AA000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AA800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AB000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AB800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AC000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AC800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AD000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AD800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AE000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AE800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AF000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+AF800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B0000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B0800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B1000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B1800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B2000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B2800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B3000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B3800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B4000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B4800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B5000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B5800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B6000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B6800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B7000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B7800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B8000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B8800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B9000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+B9800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BA000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BA800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BB000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BB800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BC000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BC800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BD000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BD800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BE000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BE800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BF000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+BF800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C0000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C0800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C1000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C1800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C2000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C2800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C3000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C3800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C4000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C4800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C5000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C5800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C6000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C6800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C7000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C7800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C8000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C8800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C9000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+C9800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CA000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CA800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CB000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CB800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CC000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CC800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CD000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CD800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CE000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CE800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CF000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+CF800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D0000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D0800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D1000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D1800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D2000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D2800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D3000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D3800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D4000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D4800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D5000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D5800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D6000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D6800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D7000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D7800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D8000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D8800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D9000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+D9800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DA000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DA800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DB000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DB800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DC000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DC800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DD000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DD800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DE000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DE800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DF000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+DF800 */ -251,252,253,254,252,252,252,252,252,252,252,252,252,252,252,252, /* U+E0000 */ -252,252,252,252,252,252,252,252,252,252,252,252,252,252,252,252, /* U+E0800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E1000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E1800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E2000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E2800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E3000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E3800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E4000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E4800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E5000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E5800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E6000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E6800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E7000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E7800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E8000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E8800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E9000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+E9800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EA000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EA800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EB000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EB800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EC000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EC800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+ED000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+ED800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EE000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EE800 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EF000 */ -140,140,140,140,140,140,140,140,140,140,140,140,140,140,140,140, /* U+EF800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F0000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F0800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F1000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F1800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F2000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F2800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F3000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F3800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F4000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F4800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F5000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F5800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F6000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F6800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F7000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F7800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F8000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F8800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F9000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+F9800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FA000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FA800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FB000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FB800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FC000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FC800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FD000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FD800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FE000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FE800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+FF000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,255, /* U+FF800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+100000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+100800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+101000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+101800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+102000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+102800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+103000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+103800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+104000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+104800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+105000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+105800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+106000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+106800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+107000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+107800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+108000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+108800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+109000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+109800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10A000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10A800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10B000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10B800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10C000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10C800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10D000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10D800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10E000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10E800 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+10F000 */ -124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,255, /* U+10F800 */ + 77, 77, 78, 79, 66, 66, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, /* U+2800 */ + 90, 91, 92, 93, 94, 95, 96, 71, 97, 97, 97, 97, 97, 97, 97, 97, /* U+3000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+3800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+4000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 98, 97, 97, 97, 97, /* U+4800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+5000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+5800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+6000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+6800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+7000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+7800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+8000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+8800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+9000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 99, /* U+9800 */ +100,101,101,101,101,101,101,101,101,102,103,103,104,105,106,107, /* U+A000 */ +108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,116, /* U+A800 */ +117,118,119,120,121,122,116,117,118,119,120,121,122,116,117,118, /* U+B000 */ +119,120,121,122,116,117,118,119,120,121,122,116,117,118,119,120, /* U+B800 */ +121,122,116,117,118,119,120,121,122,116,117,118,119,120,121,122, /* U+C000 */ +116,117,118,119,120,121,122,116,117,118,119,120,121,122,116,117, /* U+C800 */ +118,119,120,121,122,116,117,118,119,120,121,122,116,117,118,123, /* U+D000 */ +124,124,124,124,124,124,124,124,124,124,124,124,124,124,124,124, /* U+D800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+E000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+E800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F000 */ +125,125, 97, 97,126,127,128,129,130,130,131,132,133,134,135,136, /* U+F800 */ +137,138,139,140,141,142,143,144,145,146,147,141,148,148,149,141, /* U+10000 */ +150,151,152,153,154,155,156,157,158,159,160,141,161,141,162,141, /* U+10800 */ +163,164,165,166,167,168,169,141,170,171,141,172,173,174,175,141, /* U+11000 */ +176,177,141,141,178,179,141,141,180,181,182,183,141,184,141,141, /* U+11800 */ +185,185,185,185,185,185,185,186,187,185,188,141,141,141,141,141, /* U+12000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+12800 */ +189,189,189,189,189,189,189,189,190,141,141,141,141,141,141,141, /* U+13000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+13800 */ +141,141,141,141,141,141,141,141,191,191,191,191,192,141,141,141, /* U+14000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+14800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+15000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+15800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+16000 */ +193,193,193,193,194,195,196,197,141,141,141,141,198,199,200,201, /* U+16800 */ +202,202,202,202,202,202,202,202,202,202,202,202,202,202,202,202, /* U+17000 */ +202,202,202,202,202,202,202,202,202,202,202,202,202,202,202,202, /* U+17800 */ +202,202,202,202,202,202,202,202,202,202,202,202,202,202,202,203, /* U+18000 */ +202,202,202,202,202,204,141,141,141,141,141,141,141,141,141,141, /* U+18800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+19000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+19800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+1A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+1A800 */ +205,206,207,208,208,209,141,141,141,141,141,141,141,141,141,141, /* U+1B000 */ +141,141,141,141,141,141,141,141,210,211,141,141,141,141,141,141, /* U+1B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+1C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+1C800 */ + 71,212,213,214,215,216,217,141,218,219,220,221,222,223,224,225, /* U+1D000 */ +226,226,226,226,227,228,141,141,141,141,141,141,141,141,141,141, /* U+1D800 */ +229,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+1E000 */ +230,231,232,141,141,141,141,141,233,234,141,141,235,236,141,141, /* U+1E800 */ +237,238,239,240,241,242,243,244,243,243,245,243,246,247,248,249, /* U+1F000 */ +250,251,252,253,254,242,242,242,242,242,242,242,242,242,242,255, /* U+1F800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+20000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+20800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+21000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+21800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+22000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+22800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+23000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+23800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+24000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+24800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+25000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+25800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+26000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+26800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+27000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+27800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+28000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+28800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+29000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+29800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,256, 97, 97, /* U+2A000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2A800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,257, 97, /* U+2B000 */ +258, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2B800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2C000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97,259, 97, 97, /* U+2C800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2D000 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2D800 */ + 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, 97, /* U+2E000 */ + 97, 97, 97, 97, 97, 97, 97,260,141,141,141,141,141,141,141,141, /* U+2E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+2F000 */ + 97, 97, 97, 97,261,141,141,141,141,141,141,141,141,141,141,141, /* U+2F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+30000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+30800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+31000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+31800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+32000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+32800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+33000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+33800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+34000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+34800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+35000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+35800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+36000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+36800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+37000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+37800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+38000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+38800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+39000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+39800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+3F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+40000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+40800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+41000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+41800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+42000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+42800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+43000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+43800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+44000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+44800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+45000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+45800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+46000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+46800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+47000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+47800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+48000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+48800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+49000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+49800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+4F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+50000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+50800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+51000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+51800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+52000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+52800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+53000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+53800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+54000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+54800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+55000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+55800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+56000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+56800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+57000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+57800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+58000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+58800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+59000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+59800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+5F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+60000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+60800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+61000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+61800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+62000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+62800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+63000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+63800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+64000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+64800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+65000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+65800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+66000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+66800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+67000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+67800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+68000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+68800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+69000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+69800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+6F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+70000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+70800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+71000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+71800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+72000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+72800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+73000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+73800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+74000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+74800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+75000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+75800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+76000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+76800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+77000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+77800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+78000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+78800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+79000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+79800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+7F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+80000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+80800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+81000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+81800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+82000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+82800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+83000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+83800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+84000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+84800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+85000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+85800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+86000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+86800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+87000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+87800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+88000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+88800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+89000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+89800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+8F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+90000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+90800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+91000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+91800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+92000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+92800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+93000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+93800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+94000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+94800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+95000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+95800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+96000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+96800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+97000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+97800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+98000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+98800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+99000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+99800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9A000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9A800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9B000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9B800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9C000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9C800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9D000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9D800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9E000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9E800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9F000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+9F800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A0000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A0800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A1000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A1800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A2000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A2800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A3000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A3800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A4000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A4800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A5000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A5800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A6000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A6800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A7000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A7800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A8000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A8800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A9000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+A9800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AA000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AA800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AB000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AB800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AC000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AC800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AD000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AD800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AE000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AE800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AF000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+AF800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B0000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B0800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B1000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B1800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B2000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B2800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B3000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B3800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B4000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B4800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B5000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B5800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B6000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B6800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B7000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B7800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B8000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B8800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B9000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+B9800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BA000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BA800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BB000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BB800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BC000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BC800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BD000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BD800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BE000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BE800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BF000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+BF800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C0000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C0800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C1000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C1800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C2000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C2800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C3000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C3800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C4000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C4800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C5000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C5800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C6000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C6800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C7000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C7800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C8000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C8800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C9000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+C9800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CA000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CA800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CB000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CB800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CC000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CC800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CD000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CD800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CE000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CE800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CF000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+CF800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D0000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D0800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D1000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D1800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D2000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D2800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D3000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D3800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D4000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D4800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D5000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D5800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D6000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D6800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D7000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D7800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D8000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D8800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D9000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+D9800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DA000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DA800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DB000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DB800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DC000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DC800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DD000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DD800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DE000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DE800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DF000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+DF800 */ +262,263,264,265,263,263,263,263,263,263,263,263,263,263,263,263, /* U+E0000 */ +263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263, /* U+E0800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E1000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E1800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E2000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E2800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E3000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E3800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E4000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E4800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E5000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E5800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E6000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E6800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E7000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E7800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E8000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E8800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E9000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+E9800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EA000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EA800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EB000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EB800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EC000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EC800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+ED000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+ED800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EE000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EE800 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EF000 */ +141,141,141,141,141,141,141,141,141,141,141,141,141,141,141,141, /* U+EF800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F0000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F0800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F1000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F1800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F2000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F2800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F3000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F3800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F4000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F4800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F5000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F5800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F6000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F6800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F7000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F7800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F8000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F8800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F9000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+F9800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FA000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FA800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FB000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FB800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FC000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FC800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FD000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FD800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FE000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FE800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+FF000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,266, /* U+FF800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+100000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+100800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+101000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+101800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+102000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+102800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+103000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+103800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+104000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+104800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+105000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+105800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+106000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+106800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+107000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+107800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+108000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+108800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+109000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+109800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10A000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10A800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10B000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10B800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10C000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10C800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10D000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10D800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10E000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10E800 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,125, /* U+10F000 */ +125,125,125,125,125,125,125,125,125,125,125,125,125,125,125,266, /* U+10F800 */ }; -const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ +const uint16_t PRIV(ucd_stage2)[] = { /* 68352 bytes, block = 128 */ /* block 0 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1489,647 +1522,647 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ /* block 1 */ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 3, 4, 5, 5, 5, 5, 19, 4, 14, 19, 20, 21, 8, 22, 19, 14, - 19, 8, 23, 23, 14, 24, 4, 4, 14, 23, 20, 25, 23, 23, 23, 4, - 11, 11, 11, 11, 11, 26, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 8, 11, 11, 11, 11, 11, 11, 11, 27, - 16, 16, 16, 16, 16, 28, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, - 16, 16, 16, 16, 16, 16, 16, 8, 16, 16, 16, 16, 16, 16, 16, 29, + 3, 4, 5, 5, 5, 5, 19, 4, 14, 20, 21, 22, 8, 23, 20, 14, + 19, 8, 24, 24, 14, 25, 4, 4, 14, 24, 21, 26, 24, 24, 24, 4, + 11, 11, 11, 11, 11, 27, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 11, 11, 8, 11, 11, 11, 11, 11, 11, 11, 28, + 16, 16, 16, 16, 16, 29, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, + 16, 16, 16, 16, 16, 16, 16, 8, 16, 16, 16, 16, 16, 16, 16, 30, /* block 2 */ - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 32, 33, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31, 30, - 31, 30, 31, 30, 31, 30, 31, 30, 31, 33, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 34, 30, 31, 30, 31, 30, 31, 35, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 33, 34, 31, 32, 31, 32, 31, 32, 34, 31, 32, 31, 32, 31, 32, 31, + 32, 31, 32, 31, 32, 31, 32, 31, 32, 34, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 35, 31, 32, 31, 32, 31, 32, 36, /* block 3 */ - 36, 37, 30, 31, 30, 31, 38, 30, 31, 39, 39, 30, 31, 33, 40, 41, - 42, 30, 31, 39, 43, 44, 45, 46, 30, 31, 47, 33, 45, 48, 49, 50, - 30, 31, 30, 31, 30, 31, 51, 30, 31, 51, 33, 33, 30, 31, 51, 30, - 31, 52, 52, 30, 31, 30, 31, 53, 30, 31, 33, 20, 30, 31, 33, 54, - 20, 20, 20, 20, 55, 56, 57, 58, 59, 60, 61, 62, 63, 30, 31, 30, - 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 64, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 33, 65, 66, 67, 30, 31, 68, 69, 30, 31, 30, 31, 30, 31, 30, 31, + 37, 38, 31, 32, 31, 32, 39, 31, 32, 40, 40, 31, 32, 34, 41, 42, + 43, 31, 32, 40, 44, 45, 46, 47, 31, 32, 48, 34, 46, 49, 50, 51, + 31, 32, 31, 32, 31, 32, 52, 31, 32, 52, 34, 34, 31, 32, 52, 31, + 32, 53, 53, 31, 32, 31, 32, 54, 31, 32, 34, 21, 31, 32, 34, 55, + 21, 21, 21, 21, 56, 57, 58, 59, 60, 61, 62, 63, 64, 31, 32, 31, + 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 65, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 34, 66, 67, 68, 31, 32, 69, 70, 31, 32, 31, 32, 31, 32, 31, 32, /* block 4 */ - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 70, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 33, 33, 33, 33, 33, 33, 71, 30, 31, 72, 73, 74, - 74, 30, 31, 75, 76, 77, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 78, 79, 80, 81, 82, 33, 83, 83, 33, 84, 33, 85, 86, 33, 33, 33, - 83, 87, 33, 88, 33, 89, 90, 33, 91, 92, 90, 93, 94, 33, 33, 92, - 33, 95, 96, 33, 33, 97, 33, 33, 33, 33, 33, 33, 33, 98, 33, 33, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 71, 34, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 34, 34, 34, 34, 34, 34, 72, 31, 32, 73, 74, 75, + 75, 31, 32, 76, 77, 78, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 79, 80, 81, 82, 83, 34, 84, 84, 34, 85, 34, 86, 87, 34, 34, 34, + 84, 88, 34, 89, 34, 90, 91, 34, 92, 93, 91, 94, 95, 34, 34, 93, + 34, 96, 97, 34, 34, 98, 34, 34, 34, 34, 34, 34, 34, 99, 34, 34, /* block 5 */ - 99, 33, 33, 99, 33, 33, 33,100, 99,101,102,102,103, 33, 33, 33, - 33, 33,104, 33, 20, 33, 33, 33, 33, 33, 33, 33, 33,105,106, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, -107,107,107,107,107,107,107,107,107,108,108,108,108,108,108,108, -108,108, 14, 14, 14, 14,108,108,108,108,108,108,108,108,108,108, -108,108, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, -107,107,107,107,107, 14, 14, 14, 14, 14,109,109,108, 14,108, 14, +100, 34, 34,100, 34, 34, 34,101,100,102,103,103,104, 34, 34, 34, + 34, 34,105, 34, 21, 34, 34, 34, 34, 34, 34, 34, 34,106,107, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, +108,108,108,108,108,108,108,108,108,109,109,109,109,109,109,109, +109,109, 14, 14, 14, 14,109,109,109,109,109,109,109,109,109,109, +109,109, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, +108,108,108,108,108, 14, 14, 14, 14, 14,110,110,109, 14,109, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, /* block 6 */ -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,111,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -112,113,112,113,108,114,112,113,115,115,116,117,117,117, 4,118, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,112,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +113,114,113,114,109,115,113,114,116,116,117,118,118,118, 4,119, /* block 7 */ -115,115,115,115,114, 14,119, 4,120,120,120,115,121,115,122,122, -123,124,125,124,124,126,124,124,127,128,129,124,130,124,124,124, -131,132,115,133,124,124,134,124,124,135,124,124,136,137,137,137, -123,138,139,138,138,140,138,138,141,142,143,138,144,138,138,138, -145,146,147,148,138,138,149,138,138,150,138,138,151,152,152,153, -154,155,156,156,156,157,158,159,112,113,112,113,112,113,112,113, -112,113,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -162,163,164,165,166,167,168,112,113,169,112,113,123,170,170,170, +116,116,116,116,115, 14,120, 4,121,121,121,116,122,116,123,123, +124,125,126,125,125,127,125,125,128,129,130,125,131,125,125,125, +132,133,116,134,125,125,135,125,125,136,125,125,137,138,138,138, +124,139,140,139,139,141,139,139,142,143,144,139,145,139,139,139, +146,147,148,149,139,139,150,139,139,151,139,139,152,153,153,154, +155,156,157,157,157,158,159,160,113,114,113,114,113,114,113,114, +113,114,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +163,164,165,166,167,168,169,113,114,170,113,114,124,171,171,171, /* block 8 */ -171,171,171,171,171,171,171,171,171,171,171,171,171,171,171,171, -172,172,173,172,174,172,172,172,172,172,172,172,172,172,175,172, -172,176,177,172,172,172,172,172,172,172,178,172,172,172,172,172, -179,179,180,179,181,179,179,179,179,179,179,179,179,179,182,179, -179,183,184,179,179,179,179,179,179,179,185,179,179,179,179,179, -186,186,186,186,186,186,186,186,186,186,186,186,186,186,186,186, -187,188,189,190,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, +172,172,172,172,172,172,172,172,172,172,172,172,172,172,172,172, +173,173,174,173,175,173,173,173,173,173,173,173,173,173,176,173, +173,177,178,173,173,173,173,173,173,173,179,173,173,173,173,173, +180,180,181,180,182,180,180,180,180,180,180,180,180,180,183,180, +180,184,185,180,180,180,180,180,180,180,186,180,180,180,180,180, +187,187,187,187,187,187,187,187,187,187,187,187,187,187,187,187, +188,189,190,191,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, /* block 9 */ -187,188,191,192,192,110,110,192,193,193,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -194,187,188,187,188,187,188,187,188,187,188,187,188,187,188,195, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, +188,189,192,193,193,111,111,193,194,194,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +195,188,189,188,189,188,189,188,189,188,189,188,189,188,189,196, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, /* block 10 */ -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -115,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196, -196,196,196,196,196,196,196,196,196,196,196,196,196,196,196,196, -196,196,196,196,196,196,196,115,115,197,198,198,198,198,198,198, -115,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199, -199,199,199,199,199,199,199,199,199,199,199,199,199,199,199,199, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +116,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197, +197,197,197,197,197,197,197,197,197,197,197,197,197,197,197,197, +197,197,197,197,197,197,197,116,116,198,199,199,199,199,199,199, +200,201,201,201,201,201,201,201,201,201,201,201,201,201,201,201, +201,201,201,201,201,201,201,201,201,201,201,201,201,201,201,201, /* block 11 */ -199,199,199,199,199,199,199,200,115, 4,201,115,115,202,202,203, -115,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204, -204,204,204,204,204,204,204,204,204,204,204,204,204,204,204,204, -204,204,204,204,204,204,204,204,204,204,204,204,204,204,205,204, -206,204,204,206,204,204,206,204,115,115,115,115,115,115,115,115, -207,207,207,207,207,207,207,207,207,207,207,207,207,207,207,207, -207,207,207,207,207,207,207,207,207,207,207,115,115,115,115,115, -207,207,207,206,206,115,115,115,115,115,115,115,115,115,115,115, +201,201,201,201,201,201,201,200,200, 4,202,116,116,203,203,204, +116,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205, +205,205,205,205,205,205,205,205,205,205,205,205,205,205,205,205, +205,205,205,205,205,205,205,205,205,205,205,205,205,205,206,205, +207,205,205,207,205,205,207,205,116,116,116,116,116,116,116,116, +208,208,208,208,208,208,208,208,208,208,208,208,208,208,208,208, +208,208,208,208,208,208,208,208,208,208,208,116,116,116,116,208, +208,208,208,207,207,116,116,116,116,116,116,116,116,116,116,116, /* block 12 */ -208,208,208,208,208,209,210,210,210,211,211,212, 4,211,213,213, -214,214,214,214,214,214,214,214,214,214,214, 4,215,115,211, 4, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -108,216,216,216,216,216,216,216,216,216,216,110,110,110,110,110, -110,110,110,110,110,110,214,214,214,214,214,214,214,214,214,214, -217,217,217,217,217,217,217,217,217,217,211,211,211,211,216,216, -110,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, +209,209,209,209,209,210,211,211,211,212,212,213, 4,212,214,214, +215,215,215,215,215,215,215,215,215,215,215, 4,216,116,212, 4, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +109,217,217,217,217,217,217,217,217,217,217,111,111,111,111,111, +111,111,111,111,111,111,215,215,215,215,215,215,215,215,215,215, +218,218,218,218,218,218,218,218,218,218,212,212,212,212,217,217, +111,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 13 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,211,216,214,214,214,214,214,214,214,209,213,214, -214,214,214,214,214,218,218,214,214,213,214,214,214,214,216,216, -217,217,217,217,217,217,217,217,217,217,216,216,216,213,213,216, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,212,217,215,215,215,215,215,215,215,210,214,215, +215,215,215,215,215,219,219,215,215,214,215,215,215,215,217,217, +218,218,218,218,218,218,218,218,218,218,217,217,217,214,214,217, /* block 14 */ -219,219,219,219,219,219,219,219,219,219,219,219,219,219,115,220, -221,222,221,221,221,221,221,221,221,221,221,221,221,221,221,221, -221,221,221,221,221,221,221,221,221,221,221,221,221,221,221,221, +220,220,220,220,220,220,220,220,220,220,220,220,220,220,116,221, +222,223,222,222,222,222,222,222,222,222,222,222,222,222,222,222, 222,222,222,222,222,222,222,222,222,222,222,222,222,222,222,222, -222,222,222,222,222,222,222,222,222,222,222,115,115,221,221,221, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, +223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, +223,223,223,223,223,223,223,223,223,223,223,116,116,222,222,222, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 15 */ -223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, -223,223,223,223,223,223,223,223,223,223,223,223,223,223,223,223, -223,223,223,223,223,223,224,224,224,224,224,224,224,224,224,224, -224,223,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -225,225,225,225,225,225,225,225,225,225,226,226,226,226,226,226, -226,226,226,226,226,226,226,226,226,226,226,226,226,226,226,226, -226,226,226,226,226,226,226,226,226,226,226,227,227,227,227,227, -227,227,227,227,228,228,229,230,230,230,228,115,115,115,115,115, +224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224, +224,224,224,224,224,224,224,224,224,224,224,224,224,224,224,224, +224,224,224,224,224,224,225,225,225,225,225,225,225,225,225,225, +225,224,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +226,226,226,226,226,226,226,226,226,226,227,227,227,227,227,227, +227,227,227,227,227,227,227,227,227,227,227,227,227,227,227,227, +227,227,227,227,227,227,227,227,227,227,227,228,228,228,228,228, +228,228,228,228,229,229,230,231,231,231,229,116,116,228,232,232, /* block 16 */ -231,231,231,231,231,231,231,231,231,231,231,231,231,231,231,231, -231,231,231,231,231,231,232,232,232,232,233,232,232,232,232,232, -232,232,232,232,233,232,232,232,233,232,232,232,232,232,115,115, -234,234,234,234,234,234,234,234,234,234,234,234,234,234,234,115, -235,235,235,235,235,235,235,235,235,235,235,235,235,235,235,235, -235,235,235,235,235,235,235,235,235,236,236,236,115,115,237,115, -221,221,221,221,221,221,221,221,221,221,221,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +233,233,233,233,233,233,233,233,233,233,233,233,233,233,233,233, +233,233,233,233,233,233,234,234,234,234,235,234,234,234,234,234, +234,234,234,234,235,234,234,234,235,234,234,234,234,234,116,116, +236,236,236,236,236,236,236,236,236,236,236,236,236,236,236,116, +237,237,237,237,237,237,237,237,237,237,237,237,237,237,237,237, +237,237,237,237,237,237,237,237,237,238,238,238,116,116,239,116, +222,222,222,222,222,222,222,222,222,222,222,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 17 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,115,216,216,216,216,216,216,216,216,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,214,214,214,214,214,214,214,214,214,214,214,214, -214,214,209,214,214,214,214,214,214,214,214,214,214,214,214,214, -214,214,214,214,214,214,214,214,214,214,214,214,214,214,214,214, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,116,217,217,217,217,217,217,217,217,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,215,215,215,215,215,215,215,215,215,215,215,215,215, +215,215,210,215,215,215,215,215,215,215,215,215,215,215,215,215, +215,215,215,215,215,215,215,215,215,215,215,215,215,215,215,215, /* block 18 */ -238,238,238,239,240,240,240,240,240,240,240,240,240,240,240,240, -240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, -240,240,240,240,240,240,240,240,240,240,238,239,238,240,239,239, -239,238,238,238,238,238,238,238,238,239,239,239,239,238,239,239, -240,110,110,238,238,238,238,238,240,240,240,240,240,240,240,240, -240,240,238,238, 4, 4,241,241,241,241,241,241,241,241,241,241, -242,243,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +240,240,240,241,242,242,242,242,242,242,242,242,242,242,242,242, +242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242, +242,242,242,242,242,242,242,242,242,242,242,242,242,242,242,242, +242,242,242,242,242,242,242,242,242,242,240,241,240,242,241,241, +241,240,240,240,240,240,240,240,240,241,241,241,241,240,241,241, +242,111,111,240,240,240,240,240,242,242,242,242,242,242,242,242, +242,242,240,240, 4, 4,243,243,243,243,243,243,243,243,243,243, +244,245,242,242,242,242,242,242,242,242,242,242,242,242,242,242, /* block 19 */ -244,245,246,246,115,244,244,244,244,244,244,244,244,115,115,244, -244,115,115,244,244,244,244,244,244,244,244,244,244,244,244,244, -244,244,244,244,244,244,244,244,244,115,244,244,244,244,244,244, -244,115,244,115,115,115,244,244,244,244,115,115,245,244,247,246, -246,245,245,245,245,115,115,246,246,115,115,246,246,245,244,115, -115,115,115,115,115,115,115,247,115,115,115,115,244,244,115,244, -244,244,245,245,115,115,248,248,248,248,248,248,248,248,248,248, -244,244,249,249,250,250,250,250,250,250,251,249,244,252,115,115, +246,247,248,248,116,246,246,246,246,246,246,246,246,116,116,246, +246,116,116,246,246,246,246,246,246,246,246,246,246,246,246,246, +246,246,246,246,246,246,246,246,246,116,246,246,246,246,246,246, +246,116,246,116,116,116,246,246,246,246,116,116,247,246,249,248, +248,247,247,247,247,116,116,248,248,116,116,248,248,247,246,116, +116,116,116,116,116,116,116,249,116,116,116,116,246,246,116,246, +246,246,247,247,116,116,250,250,250,250,250,250,250,250,250,250, +246,246,251,251,252,252,252,252,252,252,253,251,246,254,247,116, /* block 20 */ -115,253,253,254,115,255,255,255,255,255,255,115,115,115,115,255, -255,115,115,255,255,255,255,255,255,255,255,255,255,255,255,255, -255,255,255,255,255,255,255,255,255,115,255,255,255,255,255,255, -255,115,255,255,115,255,255,115,255,255,115,115,253,115,254,254, -254,253,253,115,115,115,115,253,253,115,115,253,253,253,115,115, -115,253,115,115,115,115,115,115,115,255,255,255,255,115,255,115, -115,115,115,115,115,115,256,256,256,256,256,256,256,256,256,256, -253,253,255,255,255,253,115,115,115,115,115,115,115,115,115,115, +116,255,255,256,116,257,257,257,257,257,257,116,116,116,116,257, +257,116,116,257,257,257,257,257,257,257,257,257,257,257,257,257, +257,257,257,257,257,257,257,257,257,116,257,257,257,257,257,257, +257,116,257,257,116,257,257,116,257,257,116,116,255,116,256,256, +256,255,255,116,116,116,116,255,255,116,116,255,255,255,116,116, +116,255,116,116,116,116,116,116,116,257,257,257,257,116,257,116, +116,116,116,116,116,116,258,258,258,258,258,258,258,258,258,258, +255,255,257,257,257,255,259,116,116,116,116,116,116,116,116,116, /* block 21 */ -115,257,257,258,115,259,259,259,259,259,259,259,259,259,115,259, -259,259,115,259,259,259,259,259,259,259,259,259,259,259,259,259, -259,259,259,259,259,259,259,259,259,115,259,259,259,259,259,259, -259,115,259,259,115,259,259,259,259,259,115,115,257,259,258,258, -258,257,257,257,257,257,115,257,257,258,115,258,258,257,115,115, -259,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -259,259,257,257,115,115,260,260,260,260,260,260,260,260,260,260, -261,262,115,115,115,115,115,115,115,259,257,257,257,257,257,257, +116,260,260,261,116,262,262,262,262,262,262,262,262,262,116,262, +262,262,116,262,262,262,262,262,262,262,262,262,262,262,262,262, +262,262,262,262,262,262,262,262,262,116,262,262,262,262,262,262, +262,116,262,262,116,262,262,262,262,262,116,116,260,262,261,261, +261,260,260,260,260,260,116,260,260,261,116,261,261,260,116,116, +262,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +262,262,260,260,116,116,263,263,263,263,263,263,263,263,263,263, +264,265,116,116,116,116,116,116,116,262,260,260,260,260,260,260, /* block 22 */ -115,263,264,264,115,265,265,265,265,265,265,265,265,115,115,265, -265,115,115,265,265,265,265,265,265,265,265,265,265,265,265,265, -265,265,265,265,265,265,265,265,265,115,265,265,265,265,265,265, -265,115,265,265,115,265,265,265,265,265,115,115,263,265,266,263, -264,263,263,263,263,115,115,264,264,115,115,264,264,263,115,115, -115,115,115,115,115,115,263,266,115,115,115,115,265,265,115,265, -265,265,263,263,115,115,267,267,267,267,267,267,267,267,267,267, -268,265,269,269,269,269,269,269,115,115,115,115,115,115,115,115, +116,266,267,267,116,268,268,268,268,268,268,268,268,116,116,268, +268,116,116,268,268,268,268,268,268,268,268,268,268,268,268,268, +268,268,268,268,268,268,268,268,268,116,268,268,268,268,268,268, +268,116,268,268,116,268,268,268,268,268,116,116,266,268,269,266, +267,266,266,266,266,116,116,267,267,116,116,267,267,266,116,116, +116,116,116,116,116,116,266,269,116,116,116,116,268,268,116,268, +268,268,266,266,116,116,270,270,270,270,270,270,270,270,270,270, +271,268,272,272,272,272,272,272,116,116,116,116,116,116,116,116, /* block 23 */ -115,115,270,271,115,271,271,271,271,271,271,115,115,115,271,271, -271,115,271,271,271,271,115,115,115,271,271,115,271,115,271,271, -115,115,115,271,271,115,115,115,271,271,271,115,115,115,271,271, -271,271,271,271,271,271,271,271,271,271,115,115,115,115,272,273, -270,273,273,115,115,115,273,273,273,115,273,273,273,270,115,115, -271,115,115,115,115,115,115,272,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,274,274,274,274,274,274,274,274,274,274, -275,275,275,276,276,276,276,276,276,277,276,115,115,115,115,115, +116,116,273,274,116,274,274,274,274,274,274,116,116,116,274,274, +274,116,274,274,274,274,116,116,116,274,274,116,274,116,274,274, +116,116,116,274,274,116,116,116,274,274,274,116,116,116,274,274, +274,274,274,274,274,274,274,274,274,274,116,116,116,116,275,276, +273,276,276,116,116,116,276,276,276,116,276,276,276,273,116,116, +274,116,116,116,116,116,116,275,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,277,277,277,277,277,277,277,277,277,277, +278,278,278,279,279,279,279,279,279,280,279,116,116,116,116,116, /* block 24 */ -278,279,279,279,115,280,280,280,280,280,280,280,280,115,280,280, -280,115,280,280,280,280,280,280,280,280,280,280,280,280,280,280, -280,280,280,280,280,280,280,280,280,115,280,280,280,280,280,280, -280,280,280,280,280,280,280,280,280,280,115,115,115,280,278,278, -278,279,279,279,279,115,278,278,278,115,278,278,278,278,115,115, -115,115,115,115,115,278,278,115,280,280,280,115,115,115,115,115, -280,280,278,278,115,115,281,281,281,281,281,281,281,281,281,281, -115,115,115,115,115,115,115,115,282,282,282,282,282,282,282,283, +281,282,282,282,281,283,283,283,283,283,283,283,283,116,283,283, +283,116,283,283,283,283,283,283,283,283,283,283,283,283,283,283, +283,283,283,283,283,283,283,283,283,116,283,283,283,283,283,283, +283,283,283,283,283,283,283,283,283,283,116,116,116,283,281,281, +281,282,282,282,282,116,281,281,281,116,281,281,281,281,116,116, +116,116,116,116,116,281,281,116,283,283,283,116,116,116,116,116, +283,283,281,281,116,116,284,284,284,284,284,284,284,284,284,284, +116,116,116,116,116,116,116,116,285,285,285,285,285,285,285,286, /* block 25 */ -284,285,286,286,115,284,284,284,284,284,284,284,284,115,284,284, -284,115,284,284,284,284,284,284,284,284,284,284,284,284,284,284, -284,284,284,284,284,284,284,284,284,115,284,284,284,284,284,284, -284,284,284,284,115,284,284,284,284,284,115,115,285,284,286,285, -286,286,287,286,286,115,285,286,286,115,286,286,285,285,115,115, -115,115,115,115,115,287,287,115,115,115,115,115,115,115,284,115, -284,284,285,285,115,115,288,288,288,288,288,288,288,288,288,288, -115,284,284,115,115,115,115,115,115,115,115,115,115,115,115,115, +287,288,289,289,290,287,287,287,287,287,287,287,287,116,287,287, +287,116,287,287,287,287,287,287,287,287,287,287,287,287,287,287, +287,287,287,287,287,287,287,287,287,116,287,287,287,287,287,287, +287,287,287,287,116,287,287,287,287,287,116,116,288,287,289,288, +289,289,291,289,289,116,288,289,289,116,289,289,288,288,116,116, +116,116,116,116,116,291,291,116,116,116,116,116,116,116,287,116, +287,287,288,288,116,116,292,292,292,292,292,292,292,292,292,292, +116,287,287,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 26 */ -289,289,290,290,115,291,291,291,291,291,291,291,291,115,291,291, -291,115,291,291,291,291,291,291,291,291,291,291,291,291,291,291, -291,291,291,291,291,291,291,291,291,291,291,291,291,291,291,291, -291,291,291,291,291,291,291,291,291,291,291,289,289,291,292,290, -290,289,289,289,289,115,290,290,290,115,290,290,290,289,293,294, -115,115,115,115,291,291,291,292,295,295,295,295,295,295,295,291, -291,291,289,289,115,115,296,296,296,296,296,296,296,296,296,296, -295,295,295,295,295,295,295,295,295,294,291,291,291,291,291,291, +293,293,294,294,116,295,295,295,295,295,295,295,295,116,295,295, +295,116,295,295,295,295,295,295,295,295,295,295,295,295,295,295, +295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295, +295,295,295,295,295,295,295,295,295,295,295,293,293,295,296,294, +294,293,293,293,293,116,294,294,294,116,294,294,294,293,297,298, +116,116,116,116,295,295,295,296,299,299,299,299,299,299,299,295, +295,295,293,293,116,116,300,300,300,300,300,300,300,300,300,300, +299,299,299,299,299,299,299,299,299,298,295,295,295,295,295,295, /* block 27 */ -115,115,297,297,115,298,298,298,298,298,298,298,298,298,298,298, -298,298,298,298,298,298,298,115,115,115,298,298,298,298,298,298, -298,298,298,298,298,298,298,298,298,298,298,298,298,298,298,298, -298,298,115,298,298,298,298,298,298,298,298,298,115,298,115,115, -298,298,298,298,298,298,298,115,115,115,299,115,115,115,115,300, -297,297,299,299,299,115,299,115,297,297,297,297,297,297,297,300, -115,115,115,115,115,115,301,301,301,301,301,301,301,301,301,301, -115,115,297,297,302,115,115,115,115,115,115,115,115,115,115,115, +116,116,301,301,116,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,116,116,116,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,116,302,302,302,302,302,302,302,302,302,116,302,116,116, +302,302,302,302,302,302,302,116,116,116,303,116,116,116,116,304, +301,301,303,303,303,116,303,116,301,301,301,301,301,301,301,304, +116,116,116,116,116,116,305,305,305,305,305,305,305,305,305,305, +116,116,301,301,306,116,116,116,116,116,116,116,116,116,116,116, /* block 28 */ -115,303,303,303,303,303,303,303,303,303,303,303,303,303,303,303, -303,303,303,303,303,303,303,303,303,303,303,303,303,303,303,303, -303,303,303,303,303,303,303,303,303,303,303,303,303,303,303,303, -303,304,303,305,304,304,304,304,304,304,304,115,115,115,115, 5, -303,303,303,303,303,303,306,304,304,304,304,304,304,304,304,307, -308,308,308,308,308,308,308,308,308,308,307,307,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,307,307,307,307,307,307,307,307,307,307,307,307,307,307,307, +307,307,307,307,307,307,307,307,307,307,307,307,307,307,307,307, +307,307,307,307,307,307,307,307,307,307,307,307,307,307,307,307, +307,308,307,309,308,308,308,308,308,308,308,116,116,116,116, 5, +307,307,307,307,307,307,310,308,308,308,308,308,308,308,308,311, +312,312,312,312,312,312,312,312,312,312,311,311,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 29 */ -115,309,309,115,309,115,115,309,309,115,309,115,115,309,115,115, -115,115,115,115,309,309,309,309,115,309,309,309,309,309,309,309, -115,309,309,309,115,309,115,309,115,115,309,309,115,309,309,309, -309,310,309,311,310,310,310,310,310,310,115,310,310,309,115,115, -309,309,309,309,309,115,312,115,310,310,310,310,310,310,115,115, -313,313,313,313,313,313,313,313,313,313,115,115,309,309,309,309, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,313,313,116,313,116,116,313,313,116,313,116,116,313,116,116, +116,116,116,116,313,313,313,313,116,313,313,313,313,313,313,313, +116,313,313,313,116,313,116,313,116,116,313,313,116,313,313,313, +313,314,313,315,314,314,314,314,314,314,116,314,314,313,116,116, +313,313,313,313,313,116,316,116,314,314,314,314,314,314,116,116, +317,317,317,317,317,317,317,317,317,317,116,116,313,313,313,313, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 30 */ -314,315,315,315,316,316,316,316,316,316,316,316,316,316,316,316, -316,316,316,315,316,315,315,315,317,317,315,315,315,315,315,315, -318,318,318,318,318,318,318,318,318,318,319,319,319,319,319,319, -319,319,319,319,315,317,315,317,315,317,320,321,320,321,322,322, -314,314,314,314,314,314,314,314,115,314,314,314,314,314,314,314, -314,314,314,314,314,314,314,314,314,314,314,314,314,314,314,314, -314,314,314,314,314,314,314,314,314,314,314,314,314,115,115,115, -115,317,317,317,317,317,317,317,317,317,317,317,317,317,317,322, +318,319,319,319,320,320,320,320,320,320,320,320,320,320,320,320, +320,320,320,319,320,319,319,319,321,321,319,319,319,319,319,319, +322,322,322,322,322,322,322,322,322,322,323,323,323,323,323,323, +323,323,323,323,319,321,319,321,319,321,324,325,324,325,326,326, +318,318,318,318,318,318,318,318,116,318,318,318,318,318,318,318, +318,318,318,318,318,318,318,318,318,318,318,318,318,318,318,318, +318,318,318,318,318,318,318,318,318,318,318,318,318,116,116,116, +116,321,321,321,321,321,321,321,321,321,321,321,321,321,321,326, /* block 31 */ -317,317,317,317,317,316,317,317,314,314,314,314,314,317,317,317, -317,317,317,317,317,317,317,317,115,317,317,317,317,317,317,317, -317,317,317,317,317,317,317,317,317,317,317,317,317,317,317,317, -317,317,317,317,317,317,317,317,317,317,317,317,317,115,315,315, -315,315,315,315,315,315,317,315,315,315,315,315,315,115,315,315, -316,316,316,316,316, 19, 19, 19, 19,316,316,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +321,321,321,321,321,320,321,321,318,318,318,318,318,321,321,321, +321,321,321,321,321,321,321,321,116,321,321,321,321,321,321,321, +321,321,321,321,321,321,321,321,321,321,321,321,321,321,321,321, +321,321,321,321,321,321,321,321,321,321,321,321,321,116,319,319, +319,319,319,319,319,319,321,319,319,319,319,319,319,116,319,319, +320,320,320,320,320, 19, 19, 19, 19,320,320,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 32 */ -323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323, -323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323, -323,323,323,323,323,323,323,323,323,323,323,324,324,325,325,325, -325,326,325,325,325,325,325,325,324,325,325,326,326,325,325,323, -327,327,327,327,327,327,327,327,327,327,328,328,328,328,328,328, -323,323,323,323,323,323,326,326,325,325,323,323,323,323,325,325, -325,323,324,324,324,323,323,324,324,324,324,324,324,324,323,323, -323,325,325,325,325,323,323,323,323,323,323,323,323,323,323,323, +327,327,327,327,327,327,327,327,327,327,327,327,327,327,327,327, +327,327,327,327,327,327,327,327,327,327,327,327,327,327,327,327, +327,327,327,327,327,327,327,327,327,327,327,328,328,329,329,329, +329,330,329,329,329,329,329,329,328,329,329,330,330,329,329,327, +331,331,331,331,331,331,331,331,331,331,332,332,332,332,332,332, +327,327,327,327,327,327,330,330,329,329,327,327,327,327,329,329, +329,327,328,328,328,327,327,328,328,328,328,328,328,328,327,327, +327,329,329,329,329,327,327,327,327,327,327,327,327,327,327,327, /* block 33 */ -323,323,325,324,326,325,325,324,324,324,324,324,324,325,323,324, -327,327,327,327,327,327,327,327,327,327,324,324,324,325,329,329, -330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330, -330,330,330,330,330,330,330,330,330,330,330,330,330,330,330,330, -330,330,330,330,330,330,115,330,115,115,115,115,115,330,115,115, -331,331,331,331,331,331,331,331,331,331,331,331,331,331,331,331, -331,331,331,331,331,331,331,331,331,331,331,331,331,331,331,331, -331,331,331,331,331,331,331,331,331,331,331, 4,332,331,331,331, - -/* block 34 */ -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334, +327,327,329,328,330,329,329,328,328,328,328,328,328,329,327,328, +331,331,331,331,331,331,331,331,331,331,328,328,328,329,333,333, 334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334, - -/* block 35 */ 334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334, -334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334, -334,334,334,334,334,334,334,334,335,335,335,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, +334,334,334,334,334,334,116,334,116,116,116,116,116,334,116,116, 335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, 335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, +335,335,335,335,335,335,335,335,335,335,335, 4,336,335,335,335, + +/* block 34 */ +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338, +338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338, + +/* block 35 */ +338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338, +338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338, +338,338,338,338,338,338,338,338,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, /* block 36 */ -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,115,336,336,336,336,115,115, -336,336,336,336,336,336,336,115,336,115,336,336,336,336,115,115, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,116,340,340,340,340,116,116, +340,340,340,340,340,340,340,116,340,116,340,340,340,340,116,116, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, /* block 37 */ -336,336,336,336,336,336,336,336,336,115,336,336,336,336,115,115, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,115,336,336,336,336,115,115,336,336,336,336,336,336,336,115, -336,115,336,336,336,336,115,115,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, +340,340,340,340,340,340,340,340,340,116,340,340,340,340,116,116, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,116,340,340,340,340,116,116,340,340,340,340,340,340,340,116, +340,116,340,340,340,340,116,116,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, /* block 38 */ -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,115,336,336,336,336,115,115,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,336,336,336,336,115,115,337,337,337, -338,338,338,338,338,338,338,338,338,339,339,339,339,339,339,339, -339,339,339,339,339,339,339,339,339,339,339,339,339,115,115,115, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,116,340,340,340,340,116,116,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,340,340,340,340,116,116,341,341,341, +342,342,342,342,342,342,342,342,342,343,343,343,343,343,343,343, +343,343,343,343,343,343,343,343,343,343,343,343,343,116,116,116, /* block 39 */ -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -340,340,340,340,340,340,340,340,340,340,115,115,115,115,115,115, -341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341, -341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341, -341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341, -341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341, -341,341,341,341,341,341,341,341,341,341,341,341,341,341,341,341, -342,342,342,342,342,342,115,115,343,343,343,343,343,343,115,115, - -/* block 40 */ -344,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +344,344,344,344,344,344,344,344,344,344,116,116,116,116,116,116, 345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, 345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, 345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, 345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, 345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, +346,346,346,346,346,346,116,116,347,347,347,347,347,347,116,116, + +/* block 40 */ +348,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, /* block 41 */ -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, /* block 42 */ -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,346,346,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,350,350,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, /* block 43 */ -347,348,348,348,348,348,348,348,348,348,348,348,348,348,348,348, -348,348,348,348,348,348,348,348,348,348,348,349,350,115,115,115, -351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351, -351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351, -351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351, -351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351, -351,351,351,351,351,351,351,351,351,351,351, 4, 4, 4,352,352, -352,351,351,351,351,351,351,351,351,115,115,115,115,115,115,115, +351,352,352,352,352,352,352,352,352,352,352,352,352,352,352,352, +352,352,352,352,352,352,352,352,352,352,352,353,354,116,116,116, +355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355, +355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355, +355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355, +355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355, +355,355,355,355,355,355,355,355,355,355,355, 4, 4, 4,356,356, +356,355,355,355,355,355,355,355,355,116,116,116,116,116,116,116, /* block 44 */ -353,353,353,353,353,353,353,353,353,353,353,353,353,115,353,353, -353,353,354,354,354,115,115,115,115,115,115,115,115,115,115,115, -355,355,355,355,355,355,355,355,355,355,355,355,355,355,355,355, -355,355,356,356,356, 4, 4,115,115,115,115,115,115,115,115,115, -357,357,357,357,357,357,357,357,357,357,357,357,357,357,357,357, -357,357,358,358,115,115,115,115,115,115,115,115,115,115,115,115, -359,359,359,359,359,359,359,359,359,359,359,359,359,115,359,359, -359,115,360,360,115,115,115,115,115,115,115,115,115,115,115,115, +357,357,357,357,357,357,357,357,357,357,357,357,357,116,357,357, +357,357,358,358,358,116,116,116,116,116,116,116,116,116,116,116, +359,359,359,359,359,359,359,359,359,359,359,359,359,359,359,359, +359,359,360,360,360, 4, 4,116,116,116,116,116,116,116,116,116, +361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361, +361,361,362,362,116,116,116,116,116,116,116,116,116,116,116,116, +363,363,363,363,363,363,363,363,363,363,363,363,363,116,363,363, +363,116,364,364,116,116,116,116,116,116,116,116,116,116,116,116, /* block 45 */ -361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361, -361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361, -361,361,361,361,361,361,361,361,361,361,361,361,361,361,361,361, -361,361,361,361,362,362,363,362,362,362,362,362,362,362,363,363, -363,363,363,363,363,363,362,363,363,362,362,362,362,362,362,362, -362,362,362,362,364,364,364,365,364,364,364,366,361,362,115,115, -367,367,367,367,367,367,367,367,367,367,115,115,115,115,115,115, -368,368,368,368,368,368,368,368,368,368,115,115,115,115,115,115, +365,365,365,365,365,365,365,365,365,365,365,365,365,365,365,365, +365,365,365,365,365,365,365,365,365,365,365,365,365,365,365,365, +365,365,365,365,365,365,365,365,365,365,365,365,365,365,365,365, +365,365,365,365,366,366,367,366,366,366,366,366,366,366,367,367, +367,367,367,367,367,367,366,367,367,366,366,366,366,366,366,366, +366,366,366,366,368,368,368,369,368,368,368,370,365,366,116,116, +371,371,371,371,371,371,371,371,371,371,116,116,116,116,116,116, +372,372,372,372,372,372,372,372,372,372,116,116,116,116,116,116, /* block 46 */ -369,369, 4, 4,369, 4,370,369,369,369,369,371,371,371,372,115, -373,373,373,373,373,373,373,373,373,373,115,115,115,115,115,115, -374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,375,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,115,115,115,115,115,115,115,115, +373,373, 4, 4,373, 4,374,373,373,373,373,375,375,375,376,116, +377,377,377,377,377,377,377,377,377,377,116,116,116,116,116,116, +378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,379,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,116,116,116,116,116,116,116, /* block 47 */ -374,374,374,374,374,371,371,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,374,374,374,374,374,374,374,374, -374,374,374,374,374,374,374,374,374,371,374,115,115,115,115,115, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,345,345,345,345,345,345,345,345,345,345, -345,345,345,345,345,345,115,115,115,115,115,115,115,115,115,115, +378,378,378,378,378,375,375,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378, +378,378,378,378,378,378,378,378,378,375,378,116,116,116,116,116, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349, +349,349,349,349,349,349,116,116,116,116,116,116,116,116,116,116, /* block 48 */ -376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,376, -376,376,376,376,376,376,376,376,376,376,376,376,376,376,376,115, -377,377,377,378,378,378,378,377,377,378,378,378,115,115,115,115, -378,378,377,378,378,378,378,378,378,377,377,377,115,115,115,115, -379,115,115,115,380,380,381,381,381,381,381,381,381,381,381,381, -382,382,382,382,382,382,382,382,382,382,382,382,382,382,382,382, -382,382,382,382,382,382,382,382,382,382,382,382,382,382,115,115, -382,382,382,382,382,115,115,115,115,115,115,115,115,115,115,115, +380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,380, +380,380,380,380,380,380,380,380,380,380,380,380,380,380,380,116, +381,381,381,382,382,382,382,381,381,382,382,382,116,116,116,116, +382,382,381,382,382,382,382,382,382,381,381,381,116,116,116,116, +383,116,116,116,384,384,385,385,385,385,385,385,385,385,385,385, +386,386,386,386,386,386,386,386,386,386,386,386,386,386,386,386, +386,386,386,386,386,386,386,386,386,386,386,386,386,386,116,116, +386,386,386,386,386,116,116,116,116,116,116,116,116,116,116,116, /* block 49 */ -383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383, -383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383, -383,383,383,383,383,383,383,383,383,383,383,383,115,115,115,115, -383,383,383,383,383,383,383,383,383,383,383,383,383,383,383,383, -383,383,383,383,383,383,383,383,383,383,115,115,115,115,115,115, -384,384,384,384,384,384,384,384,384,384,385,115,115,115,386,386, 387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387, 387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387, +387,387,387,387,387,387,387,387,387,387,387,387,116,116,116,116, +387,387,387,387,387,387,387,387,387,387,387,387,387,387,387,387, +387,387,387,387,387,387,387,387,387,387,116,116,116,116,116,116, +388,388,388,388,388,388,388,388,388,388,389,116,116,116,390,390, +391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391, +391,391,391,391,391,391,391,391,391,391,391,391,391,391,391,391, /* block 50 */ -388,388,388,388,388,388,388,388,388,388,388,388,388,388,388,388, -388,388,388,388,388,388,388,389,389,390,390,389,115,115,391,391, 392,392,392,392,392,392,392,392,392,392,392,392,392,392,392,392, -392,392,392,392,392,392,392,392,392,392,392,392,392,392,392,392, -392,392,392,392,392,392,392,392,392,392,392,392,392,392,392,392, -392,392,392,392,392,393,394,393,394,394,394,394,394,394,394,115, -394,395,394,395,395,394,394,394,394,394,394,394,394,393,393,393, -393,393,393,394,394,394,394,394,394,394,394,394,394,115,115,394, +392,392,392,392,392,392,392,393,393,394,394,393,116,116,395,395, +396,396,396,396,396,396,396,396,396,396,396,396,396,396,396,396, +396,396,396,396,396,396,396,396,396,396,396,396,396,396,396,396, +396,396,396,396,396,396,396,396,396,396,396,396,396,396,396,396, +396,396,396,396,396,397,398,397,398,398,398,398,398,398,398,116, +398,399,398,399,399,398,398,398,398,398,398,398,398,397,397,397, +397,397,397,398,398,398,398,398,398,398,398,398,398,116,116,398, /* block 51 */ -396,396,396,396,396,396,396,396,396,396,115,115,115,115,115,115, -396,396,396,396,396,396,396,396,396,396,115,115,115,115,115,115, -397,397,397,397,397,397,397,398,397,397,397,397,397,397,115,115, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,399,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +400,400,400,400,400,400,400,400,400,400,116,116,116,116,116,116, +400,400,400,400,400,400,400,400,400,400,116,116,116,116,116,116, +401,401,401,401,401,401,401,402,401,401,401,401,401,401,116,116, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,403,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 52 */ -400,400,400,400,401,402,402,402,402,402,402,402,402,402,402,402, -402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402, -402,402,402,402,402,402,402,402,402,402,402,402,402,402,402,402, -402,402,402,402,400,401,400,400,400,400,400,401,400,401,401,401, -401,401,400,401,401,402,402,402,402,402,402,402,115,115,115,115, -403,403,403,403,403,403,403,403,403,403,404,404,404,404,404,404, -404,405,405,405,405,405,405,405,405,405,405,400,400,400,400,400, -400,400,400,400,405,405,405,405,405,405,405,405,405,115,115,115, +404,404,404,404,405,406,406,406,406,406,406,406,406,406,406,406, +406,406,406,406,406,406,406,406,406,406,406,406,406,406,406,406, +406,406,406,406,406,406,406,406,406,406,406,406,406,406,406,406, +406,406,406,406,404,405,404,404,404,404,404,405,404,405,405,405, +405,405,404,405,405,406,406,406,406,406,406,406,116,116,116,116, +407,407,407,407,407,407,407,407,407,407,408,408,408,408,408,408, +408,409,409,409,409,409,409,409,409,409,409,404,404,404,404,404, +404,404,404,404,409,409,409,409,409,409,409,409,409,116,116,116, /* block 53 */ -406,406,407,408,408,408,408,408,408,408,408,408,408,408,408,408, -408,408,408,408,408,408,408,408,408,408,408,408,408,408,408,408, -408,407,406,406,406,406,407,407,406,406,407,406,406,406,408,408, -409,409,409,409,409,409,409,409,409,409,408,408,408,408,408,408, -410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410, -410,410,410,410,410,410,410,410,410,410,410,410,410,410,410,410, -410,410,410,410,410,410,411,412,411,411,412,412,412,411,412,411, -411,411,412,412,115,115,115,115,115,115,115,115,413,413,413,413, - -/* block 54 */ +410,410,411,412,412,412,412,412,412,412,412,412,412,412,412,412, +412,412,412,412,412,412,412,412,412,412,412,412,412,412,412,412, +412,411,410,410,410,410,411,411,410,410,411,410,410,410,412,412, +413,413,413,413,413,413,413,413,413,413,412,412,412,412,412,412, 414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414, 414,414,414,414,414,414,414,414,414,414,414,414,414,414,414,414, -414,414,414,414,415,415,415,415,415,415,415,415,416,416,416,416, -416,416,416,416,415,415,416,416,115,115,115,417,417,417,417,417, -418,418,418,418,418,418,418,418,418,418,115,115,115,414,414,414, -419,419,419,419,419,419,419,419,419,419,420,420,420,420,420,420, -420,420,420,420,420,420,420,420,420,420,420,420,420,420,420,420, -420,420,420,420,420,420,420,420,421,421,421,421,421,421,422,422, +414,414,414,414,414,414,415,416,415,415,416,416,416,415,416,415, +415,415,416,416,116,116,116,116,116,116,116,116,417,417,417,417, + +/* block 54 */ +418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418, +418,418,418,418,418,418,418,418,418,418,418,418,418,418,418,418, +418,418,418,418,419,419,419,419,419,419,419,419,420,420,420,420, +420,420,420,420,419,419,420,420,116,116,116,421,421,421,421,421, +422,422,422,422,422,422,422,422,422,422,116,116,116,418,418,418, +423,423,423,423,423,423,423,423,423,423,424,424,424,424,424,424, +424,424,424,424,424,424,424,424,424,424,424,424,424,424,424,424, +424,424,424,424,424,424,424,424,425,425,425,425,425,425,426,426, /* block 55 */ -423,424,425,426,427,428,429,430,431,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -432,432,432,432,432,432,432,432,115,115,115,115,115,115,115,115, -110,110,110, 4,110,110,110,110,110,110,110,110,110,110,110,110, -110,433,110,110,110,110,110,110,110,434,434,434,434,110,434,434, -434,434,433,433,110,434,434,433,110,110,115,115,115,115,115,115, +427,428,429,430,431,432,433,434,435,116,116,116,116,116,116,116, +436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436, +436,436,436,436,436,436,436,436,436,436,436,436,436,436,436,436, +436,436,436,436,436,436,436,436,436,436,436,116,116,436,436,436, +437,437,437,437,437,437,437,437,116,116,116,116,116,116,116,116, +111,111,111, 4,111,111,111,111,111,111,111,111,111,111,111,111, +111,438,111,111,111,111,111,111,111,439,439,439,439,111,439,439, +439,439,438,438,111,439,439,438,111,111,116,116,116,116,116,116, /* block 56 */ - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33,123,123,123,123,123,435,107,107,107,107, -107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, -107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, -107,107,107,107,107,107,107,107,107,107,107,107,107,116,116,116, -116,116,107,107,107,107,116,116,116,116,116, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33,436,437, 33, 33, 33,438, 33, 33, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34,124,124,124,124,124,440,108,108,108,108, +108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108, +108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108, +108,108,108,108,108,108,108,108,108,108,108,108,108,117,117,117, +117,117,108,108,108,108,117,117,117,117,117, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34,441,442, 34, 34, 34,443, 34, 34, /* block 57 */ - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33,107,107,107,107,107, -107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,107, -107,107,107,107,107,107,107,107,107,107,107,107,107,107,107,116, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,115,110,110,110,110,110, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34,108,108,108,108,108, +108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,108, +108,108,108,108,108,108,108,108,108,108,108,108,108,108,108,117, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,116,111,111,111,111,111, /* block 58 */ - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, -439,440, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, +444,445, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, /* block 59 */ - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 33, 33, 33, 33, 33,441, 33, 33,442, 33, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 34, 34, 34, 34, 34,446, 34, 34,447, 34, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, /* block 60 */ -443,443,443,443,443,443,443,443,444,444,444,444,444,444,444,444, -443,443,443,443,443,443,115,115,444,444,444,444,444,444,115,115, -443,443,443,443,443,443,443,443,444,444,444,444,444,444,444,444, -443,443,443,443,443,443,443,443,444,444,444,444,444,444,444,444, -443,443,443,443,443,443,115,115,444,444,444,444,444,444,115,115, -123,443,123,443,123,443,123,443,115,444,115,444,115,444,115,444, -443,443,443,443,443,443,443,443,444,444,444,444,444,444,444,444, -445,445,446,446,446,446,447,447,448,448,449,449,450,450,115,115, +448,448,448,448,448,448,448,448,449,449,449,449,449,449,449,449, +448,448,448,448,448,448,116,116,449,449,449,449,449,449,116,116, +448,448,448,448,448,448,448,448,449,449,449,449,449,449,449,449, +448,448,448,448,448,448,448,448,449,449,449,449,449,449,449,449, +448,448,448,448,448,448,116,116,449,449,449,449,449,449,116,116, +124,448,124,448,124,448,124,448,116,449,116,449,116,449,116,449, +448,448,448,448,448,448,448,448,449,449,449,449,449,449,449,449, +450,450,451,451,451,451,452,452,453,453,454,454,455,455,116,116, /* block 61 */ -443,443,443,443,443,443,443,443,451,451,451,451,451,451,451,451, -443,443,443,443,443,443,443,443,451,451,451,451,451,451,451,451, -443,443,443,443,443,443,443,443,451,451,451,451,451,451,451,451, -443,443,123,452,123,115,123,123,444,444,453,453,454,114,455,114, -114,114,123,452,123,115,123,123,456,456,456,456,454,114,114,114, -443,443,123,123,115,115,123,123,444,444,457,457,115,114,114,114, -443,443,123,123,123,164,123,123,444,444,458,458,169,114,114,114, -115,115,123,452,123,115,123,123,459,459,460,460,454,114,114,115, +448,448,448,448,448,448,448,448,456,456,456,456,456,456,456,456, +448,448,448,448,448,448,448,448,456,456,456,456,456,456,456,456, +448,448,448,448,448,448,448,448,456,456,456,456,456,456,456,456, +448,448,124,457,124,116,124,124,449,449,458,458,459,115,460,115, +115,115,124,457,124,116,124,124,461,461,461,461,459,115,115,115, +448,448,124,124,116,116,124,124,449,449,462,462,116,115,115,115, +448,448,124,124,124,165,124,124,449,449,463,463,170,115,115,115, +116,116,124,457,124,116,124,124,464,464,465,465,459,115,115,116, /* block 62 */ - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 22,461,462, 22, 22, - 9, 9, 9, 9, 9, 9, 4, 4, 21, 25, 6, 21, 21, 25, 6, 21, - 4, 4, 4, 4, 4, 4, 4, 4,463,464, 22, 22, 22, 22, 22, 3, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 21, 25, 4, 4, 4, 4, 15, - 15, 4, 4, 4, 8, 6, 7, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 23,466,467, 23, 23, + 9, 9, 9, 9, 9, 9, 4, 4, 22, 26, 6, 22, 22, 26, 6, 22, + 4, 4, 4, 4, 4, 4, 4, 4,468,469, 23, 23, 23, 23, 23, 3, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 22, 26, 4,470, 4, 4, 15, + 15, 4, 4, 4, 8, 6, 7, 4, 4,470, 4, 4, 4, 4, 4, 4, 4, 4, 8, 4, 15, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 3, - 22, 22, 22, 22, 22,465, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 23,107,115,115, 23, 23, 23, 23, 23, 23, 8, 8, 8, 6, 7,107, + 23, 23, 23, 23, 23,471, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 24,108,116,116, 24, 24, 24, 24, 24, 24, 8, 8, 8, 6, 7,108, /* block 63 */ - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 8, 8, 8, 6, 7,115, -107,107,107,107,107,107,107,107,107,107,107,107,107,115,115,115, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 8, 8, 8, 6, 7,116, +108,108,108,108,108,108,108,108,108,108,108,108,108,116,116,116, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -110,110,110,110,110,110,110,110,110,110,110,110,110,399,399,399, -399,110,399,399,399,110,110,110,110,110,110,110,110,110,110,110, -110,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +111,111,111,111,111,111,111,111,111,111,111,111,111,403,403,403, +403,111,403,403,403,111,111,111,111,111,111,111,111,111,111,111, +111,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 64 */ - 19, 19,466, 19, 19, 19, 19,466, 19, 19,467,466,466,466,467,467, -466,466,466,467, 19,466, 19, 19, 8,466,466,466,466,466, 19, 19, - 19, 19, 19, 19,466, 19,468, 19,466, 19,469,470,466,466, 19,467, -466,466,471,466,467,434,434,434,434,467, 19, 19,467,467,466,466, - 8, 8, 8, 8, 8,466,467,467,467,467, 19, 8, 19, 19,472, 19, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, -473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, -474,474,474,474,474,474,474,474,474,474,474,474,474,474,474,474, + 19, 19,472, 19, 19, 19, 19,472, 19, 19,473,472,472,472,473,473, +472,472,472,473, 19,472, 19, 19, 8,472,472,472,472,472, 19, 19, + 19, 19, 20, 19,472, 19,474, 19,472, 19,475,476,472,472, 19,473, +472,472,477,472,473,439,439,439,439,478, 19, 19,473,473,472,472, + 8, 8, 8, 8, 8,472,473,473,473,473, 19, 8, 19, 19,479, 19, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, +481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481, /* block 65 */ -475,475,475, 30, 31,475,475,475,475, 23, 19, 19,115,115,115,115, - 8, 8, 8, 8, 8, 19, 19, 19, 19, 19, 8, 8, 19, 19, 19, 19, - 8, 19, 19, 8, 19, 19, 8, 19, 19, 19, 19, 19, 19, 19, 8, 19, +482,482,482, 31, 32,482,482,482,482, 24, 19, 19,116,116,116,116, + 8, 8, 8, 8,483, 20, 20, 20, 20, 20, 8, 8, 19, 19, 19, 19, + 8, 19, 19, 8, 19, 19, 8, 19, 19, 20, 20, 19, 19, 19, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 19, 19, 8, 19, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, @@ -2148,8 +2181,8 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ /* block 67 */ 19, 19, 19, 19, 19, 19, 19, 19, 6, 7, 6, 7, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 8, 8, 19, 19, 19, 19, 19, 19, 19, 6, 7, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 19, 19, 19, 19, + 8, 8, 19, 19, 19, 19, 19, 19, 20, 6, 7, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, @@ -2157,34 +2190,34 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, 19, 19, 19, /* block 68 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 8, 8, - 8, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 8, 8, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 19, 19, 19, 19, 20, 20, 20, 19, 19, 19, 19, 19, /* block 69 */ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 19, 19, 19, 19, 19, 19, 19,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, /* block 70 */ - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19,476,476,476,476,476,476,476,476,476,476, -476,476,476,476,476,476,476,476,476,476,476,476,476,476,476,476, -477,477,477,477,477,477,477,477,477,477,477,477,477,477,477,477, -477,477,477,477,477,477,477,477,477,477, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 19, 19, 19, 19, 19, 19,484,484,484,484,484,484,484,484,484,484, +484,484,485,484,484,484,484,484,484,484,484,484,484,484,484,484, +486,486,486,486,486,486,486,486,486,486,486,486,486,486,486,486, +486,486,486,486,486,486,486,486,486,486, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, /* block 71 */ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, @@ -2199,64 +2232,74 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ /* block 72 */ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 20, 8, 19, 19, 19, 19, 19, 19, 19, 19, + 20, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 8, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 8, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 8, 8, 8, 8, 8, 8, + 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 8,483,483,483,483, 8, /* block 73 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,478, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -479, 19,479, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 20, 20, 20, 20, 20, 20, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,483, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 74 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19,479,479, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19,478, 19, 19, 19, 19, 19, 19, + 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 75 */ - 19, 19, 19, 19, 19, 19, 19, 19,479, 19,478,478,478,478, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,479, 19, 19, 19, 6, 7, 6, 7, 6, 7, 6, 7, - 6, 7, 6, 7, 6, 7, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 20, 20, 20, 20, 20, 20, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 19, 20, 19, 20, 19, 19, 19, 19, 19, 19, 20, 19, 19, + 19, 20, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 20, 19, 19, 20, 19, 19, 19, 19, 20, 19, 20, 19, + 19, 19, 19, 20, 20, 20, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 20, 20, 20, 20, 20, 6, 7, 6, 7, 6, 7, 6, 7, + 6, 7, 6, 7, 6, 7, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, /* block 76 */ - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 19, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 8, 8, 8, 8, 8, 6, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, /* block 77 */ -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, -480,480,480,480,480,480,480,480,480,480,480,480,480,480,480,480, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, +487,487,487,487,487,487,487,487,487,487,487,487,487,487,487,487, /* block 78 */ + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8,483,483, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, + +/* block 79 */ 8, 8, 8, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, @@ -2266,1775 +2309,1875 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 65536 bytes, block = 128 */ 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 6, 7, 8, 8, -/* block 79 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +/* block 80 */ + 19, 19, 19, 19, 19, 20, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 8, 19, 19, 8, 8, 8, 8, 8, 8, 19, 19, 19, + 20, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,115,115, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19,116,116, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -/* block 80 */ +/* block 81 */ 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19,115,115, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19,116,116, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19,115, 19, 19, 19, 19, 19, 19, - 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115, 19, 19, 19, 19, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - -/* block 81 */ -481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481, -481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,481, -481,481,481,481,481,481,481,481,481,481,481,481,481,481,481,115, -482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482, -482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,482, -482,482,482,482,482,482,482,482,482,482,482,482,482,482,482,115, - 30, 31,483,484,485,486,487, 30, 31, 30, 31, 30, 31,488,489,490, -491, 33, 30, 31, 33, 30, 31, 33, 33, 33, 33, 33,107,107,492,492, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19,116, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,116, /* block 82 */ -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,160,161,160,161,160,161,160,161,160,161,160,161, -160,161,160,161,493,494,494,494,494,494,494,160,161,160,161,495, -495,495,160,161,115,115,115,115,115,496,496,496,496,497,496,496, +488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488, +488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,488, +488,488,488,488,488,488,488,488,488,488,488,488,488,488,488,116, +489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, +489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,489, +489,489,489,489,489,489,489,489,489,489,489,489,489,489,489,116, + 31, 32,490,491,492,493,494, 31, 32, 31, 32, 31, 32,495,496,497, +498, 34, 31, 32, 34, 31, 32, 34, 34, 34, 34, 34,108,108,499,499, /* block 83 */ -498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, -498,498,498,498,498,498,498,498,498,498,498,498,498,498,498,498, -498,498,498,498,498,498,115,498,115,115,115,115,115,498,115,115, -499,499,499,499,499,499,499,499,499,499,499,499,499,499,499,499, -499,499,499,499,499,499,499,499,499,499,499,499,499,499,499,499, -499,499,499,499,499,499,499,499,499,499,499,499,499,499,499,499, -499,499,499,499,499,499,499,499,115,115,115,115,115,115,115,500, -501,115,115,115,115,115,115,115,115,115,115,115,115,115,115,502, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,161,162,161,162,161,162,161,162,161,162,161,162, +161,162,161,162,500,501,501,501,501,501,501,161,162,161,162,502, +502,502,161,162,116,116,116,116,116,503,503,503,503,504,503,503, /* block 84 */ -336,336,336,336,336,336,336,336,336,336,336,336,336,336,336,336, -336,336,336,336,336,336,336,115,115,115,115,115,115,115,115,115, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,115, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,115, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,115, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,115, -192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, -192,192,192,192,192,192,192,192,192,192,192,192,192,192,192,192, +505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,505, +505,505,505,505,505,505,505,505,505,505,505,505,505,505,505,505, +505,505,505,505,505,505,116,505,116,116,116,116,116,505,116,116, +506,506,506,506,506,506,506,506,506,506,506,506,506,506,506,506, +506,506,506,506,506,506,506,506,506,506,506,506,506,506,506,506, +506,506,506,506,506,506,506,506,506,506,506,506,506,506,506,506, +506,506,506,506,506,506,506,506,116,116,116,116,116,116,116,507, +508,116,116,116,116,116,116,116,116,116,116,116,116,116,116,509, /* block 85 */ - 4, 4, 21, 25, 21, 25, 4, 4, 4, 21, 25, 4, 21, 25, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 9, 4, 4, 9, 4, 21, 25, 4, 4, - 21, 25, 6, 7, 6, 7, 6, 7, 6, 7, 4, 4, 4, 4, 4,108, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9, 9, 4, 4, 4, 4, - 9, 4, 6, 4, 4, 4, 4, 4, 4, 4,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +340,340,340,340,340,340,340,340,340,340,340,340,340,340,340,340, +340,340,340,340,340,340,340,116,116,116,116,116,116,116,116,116, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,116, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,116, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,116, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,116, +193,193,193,193,193,193,193,193,193,193,193,193,193,193,193,193, +193,193,193,193,193,193,193,193,193,193,193,193,193,193,193,193, /* block 86 */ -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,115,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,115,115,115,115,115,115,115,115,115,115,115,115, + 4, 4, 22, 26, 22, 26, 4, 4, 4, 22, 26, 4, 22, 26, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 9, 4, 4, 9, 4, 22, 26, 4, 4, + 22, 26, 6, 7, 6, 7, 6, 7, 6, 7, 4, 4, 4, 4, 4,109, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 9, 9, 4, 4, 4, 4, + 9, 4, 6, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 87 */ -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,116,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,116,116,116,116,116,116,116,116,116,116,116,116, /* block 88 */ -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,503,503,503,503,503,503,503,503,503,503, -503,503,503,503,503,503,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, /* block 89 */ - 3, 4, 4, 4, 19,504,434,505, 6, 7, 6, 7, 6, 7, 6, 7, - 6, 7, 19, 19, 6, 7, 6, 7, 6, 7, 6, 7, 9, 6, 7, 7, - 19,505,505,505,505,505,505,505,505,505,110,110,110,110,506,506, - 9,108,108,108,108,108, 19, 19,505,505,505,504,434, 4, 19, 19, -115,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,510,510,510,510,510,510,510,510,510,510, +510,510,510,510,510,510,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,116,116,116,116, /* block 90 */ -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,115,115,110,110, 14, 14,508,508,507, - 9,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509, 4,108,510,510,509, + 3, 4, 4, 4, 19,511,439,512, 6, 7, 6, 7, 6, 7, 6, 7, + 6, 7, 19, 19, 6, 7, 6, 7, 6, 7, 6, 7, 9, 6, 7, 7, + 19,512,512,512,512,512,512,512,512,512,111,111,111,111,513,513, +514,109,109,109,109,109, 19, 19,512,512,512,511,439,470, 19, 19, +116,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, /* block 91 */ -115,115,115,115,115,511,511,511,511,511,511,511,511,511,511,511, -511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511, -511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,115, -115,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,116,116,111,111, 14, 14,516,516,515, + 9,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517, 4,109,518,518,517, /* block 92 */ -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,115, - 19, 19, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -511,511,511,511,511,511,511,511,511,511,511,511,511,511,511,511, -511,511,511,511,511,511,511,511,511,511,511,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115,115, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, +116,116,116,116,116,519,519,519,519,519,519,519,519,519,519,519, +519,519,519,519,519,519,519,519,519,519,519,519,519,519,519,519, +519,519,519,519,519,519,519,519,519,519,519,519,519,519,519,519, +116,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, /* block 93 */ -513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513, -513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,115, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,116, + 19, 19, 24, 24, 24, 24, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +519,519,519,519,519,519,519,519,519,519,519,519,519,519,519,519, +519,519,519,519,519,519,519,519,519,519,519,116,116,116,116,116, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 23, 23, 23, 23, 23, 23, 23, 23, - 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, -513,513,513,513,513,513,513,513,513,513,513,513,513,513,513,513, -513,513,513,513,513,513,513,513,513,513,513,513,513,513,513, 19, + 19, 19, 19, 19,116,116,116,116,116,116,116,116,116,116,116,116, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, /* block 94 */ - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, +521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,521, +521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,116, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,115, + 19, 19, 19, 19, 19, 19, 19, 19, 24, 24, 24, 24, 24, 24, 24, 24, + 19, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, +521,521,521,521,521,521,521,521,521,521,521,521,521,521,521,521, +521,521,521,521,521,521,521,521,521,521,521,521,521,521,521, 19, /* block 95 */ -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514,514,514,514,514,514,514,514,514, -514,514,514,514,514,514,514,514, 19, 19, 19, 19, 19, 19, 19, 19, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 20, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,116, /* block 96 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +522,522,522,522,522,522,522,522, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, /* block 97 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,115,115,115,115,115,115,115,115,115,115, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, + +/* block 98 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,116,116,116,116,116,116,116,116,116,116, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -/* block 98 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - /* block 99 */ -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,517,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 100 */ -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, -516,516,516,516,516,516,516,516,516,516,516,516,516,516,516,516, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,525,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, /* block 101 */ -516,516,516,516,516,516,516,516,516,516,516,516,516,115,115,115, -518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,518, -518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,518, -518,518,518,518,518,518,518,518,518,518,518,518,518,518,518,518, -518,518,518,518,518,518,518,115,115,115,115,115,115,115,115,115, -519,519,519,519,519,519,519,519,519,519,519,519,519,519,519,519, -519,519,519,519,519,519,519,519,519,519,519,519,519,519,519,519, -519,519,519,519,519,519,519,519,520,520,520,520,520,520,521,521, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, +524,524,524,524,524,524,524,524,524,524,524,524,524,524,524,524, /* block 102 */ -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, +524,524,524,524,524,524,524,524,524,524,524,524,524,116,116,116, +526,526,526,526,526,526,526,526,526,526,526,526,526,526,526,526, +526,526,526,526,526,526,526,526,526,526,526,526,526,526,526,526, +526,526,526,526,526,526,526,526,526,526,526,526,526,526,526,526, +526,526,526,526,526,526,526,116,116,116,116,116,116,116,116,116, +527,527,527,527,527,527,527,527,527,527,527,527,527,527,527,527, +527,527,527,527,527,527,527,527,527,527,527,527,527,527,527,527, +527,527,527,527,527,527,527,527,528,528,528,528,528,528,529,529, /* block 103 */ -522,522,522,522,522,522,522,522,522,522,522,522,523,524,524,524, -522,522,522,522,522,522,522,522,522,522,522,522,522,522,522,522, -525,525,525,525,525,525,525,525,525,525,522,522,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -187,188,187,188,187,188,187,188,187,188,526,527,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,187,188,528,192, -193,193,193,529,192,192,192,192,192,192,192,192,192,192,529,436, - -/* block 104 */ -187,188,187,188,187,188,187,188,187,188,187,188,187,188,187,188, -187,188,187,188,187,188,187,188,187,188,187,188,436,436,192,192, 530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, 530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, 530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, 530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,531,531,531,531,531,531,531,531,531,531, -532,532,533,533,533,533,533,533,115,115,115,115,115,115,115,115, +530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, +530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, +530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, +530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, + +/* block 104 */ +530,530,530,530,530,530,530,530,530,530,530,530,531,532,532,532, +530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, +533,533,533,533,533,533,533,533,533,533,530,530,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +188,189,188,189,188,189,188,189,188,189,534,535,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,536,193, +194,194,194,537,193,193,193,193,193,193,193,193,193,193,537,441, /* block 105 */ - 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 14, 14,108,108,108,108,108,108,108,108,108, - 14, 14, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, -107, 33, 33, 33, 33, 33, 33, 33, 33, 30, 31, 30, 31,534, 30, 31, +188,189,188,189,188,189,188,189,188,189,188,189,188,189,188,189, +188,189,188,189,188,189,188,189,188,189,188,189,441,441,193,193, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,539,539,539,539,539,539,539,539,539,539, +540,540,541,541,541,541,541,541,116,116,116,116,116,116,116,116, /* block 106 */ - 30, 31, 30, 31, 30, 31, 30, 31,108, 14, 14, 30, 31,535, 33, 20, - 30, 31, 30, 31, 33, 33, 30, 31, 30, 31, 30, 31, 30, 31, 30, 31, - 30, 31, 30, 31, 30, 31, 30, 31, 30, 31,536,537,538,539,536,115, -540,541,542,543, 30, 31, 30, 31,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115, 20,107,107, 33, 20, 20, 20, 20, 20, + 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, 14,109,109,109,109,109,109,109,109,109, + 14, 14, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 34, 34, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, +108, 34, 34, 34, 34, 34, 34, 34, 34, 31, 32, 31, 32,542, 31, 32, /* block 107 */ -544,544,545,544,544,544,545,544,544,544,544,545,544,544,544,544, -544,544,544,544,544,544,544,544,544,544,544,544,544,544,544,544, -544,544,544,546,546,545,545,546,547,547,547,547,115,115,115,115, - 23, 23, 23, 23, 23, 23, 19, 19, 5, 19,115,115,115,115,115,115, -548,548,548,548,548,548,548,548,548,548,548,548,548,548,548,548, -548,548,548,548,548,548,548,548,548,548,548,548,548,548,548,548, -548,548,548,548,548,548,548,548,548,548,548,548,548,548,548,548, -548,548,548,548,549,549,549,549,115,115,115,115,115,115,115,115, + 31, 32, 31, 32, 31, 32, 31, 32,109, 14, 14, 31, 32,543, 34, 21, + 31, 32, 31, 32, 34, 34, 31, 32, 31, 32, 31, 32, 31, 32, 31, 32, + 31, 32, 31, 32, 31, 32, 31, 32, 31, 32,544,545,546,547,544, 34, +548,549,550,551, 31, 32, 31, 32, 31, 32,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116, 21,108,108, 34, 21, 21, 21, 21, 21, /* block 108 */ -550,550,551,551,551,551,551,551,551,551,551,551,551,551,551,551, -551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551, -551,551,551,551,551,551,551,551,551,551,551,551,551,551,551,551, -551,551,551,551,550,550,550,550,550,550,550,550,550,550,550,550, -550,550,550,550,552,552,115,115,115,115,115,115,115,115,553,553, -554,554,554,554,554,554,554,554,554,554,115,115,115,115,115,115, -238,238,238,238,238,238,238,238,238,238,238,238,238,238,238,238, -238,238,240,240,240,240,240,240,242,242,242,240,242,240,115,115, +552,552,553,552,552,552,553,552,552,552,552,553,552,552,552,552, +552,552,552,552,552,552,552,552,552,552,552,552,552,552,552,552, +552,552,552,554,554,553,553,554,555,555,555,555,116,116,116,116, + 24, 24, 24, 24, 24, 24, 19, 19, 5, 19,116,116,116,116,116,116, +556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556, +556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556, +556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556, +556,556,556,556,557,557,557,557,116,116,116,116,116,116,116,116, /* block 109 */ -555,555,555,555,555,555,555,555,555,555,556,556,556,556,556,556, -556,556,556,556,556,556,556,556,556,556,556,556,556,556,556,556, -556,556,556,556,556,556,557,557,557,557,557,557,557,557, 4,558, +558,558,559,559,559,559,559,559,559,559,559,559,559,559,559,559, 559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559, -559,559,559,559,559,559,559,560,560,560,560,560,560,560,560,560, -560,560,561,561,115,115,115,115,115,115,115,115,115,115,115,562, -333,333,333,333,333,333,333,333,333,333,333,333,333,333,333,333, -333,333,333,333,333,333,333,333,333,333,333,333,333,115,115,115, +559,559,559,559,559,559,559,559,559,559,559,559,559,559,559,559, +559,559,559,559,558,558,558,558,558,558,558,558,558,558,558,558, +558,558,558,558,560,560,116,116,116,116,116,116,116,116,561,561, +562,562,562,562,562,562,562,562,562,562,116,116,116,116,116,116, +240,240,240,240,240,240,240,240,240,240,240,240,240,240,240,240, +240,240,242,242,242,242,242,242,244,244,244,242,244,242,242,240, /* block 110 */ -563,563,563,564,565,565,565,565,565,565,565,565,565,565,565,565, -565,565,565,565,565,565,565,565,565,565,565,565,565,565,565,565, -565,565,565,565,565,565,565,565,565,565,565,565,565,565,565,565, -565,565,565,563,564,564,563,563,563,563,564,564,563,564,564,564, -564,566,566,566,566,566,566,566,566,566,566,566,566,566,115,108, -567,567,567,567,567,567,567,567,567,567,115,115,115,115,566,566, -323,323,323,323,323,325,568,323,323,323,323,323,323,323,323,323, -327,327,327,327,327,327,327,327,327,327,323,323,323,323,323,115, +563,563,563,563,563,563,563,563,563,563,564,564,564,564,564,564, +564,564,564,564,564,564,564,564,564,564,564,564,564,564,564,564, +564,564,564,564,564,564,565,565,565,565,565,565,565,565, 4,566, +567,567,567,567,567,567,567,567,567,567,567,567,567,567,567,567, +567,567,567,567,567,567,567,568,568,568,568,568,568,568,568,568, +568,568,569,569,116,116,116,116,116,116,116,116,116,116,116,570, +337,337,337,337,337,337,337,337,337,337,337,337,337,337,337,337, +337,337,337,337,337,337,337,337,337,337,337,337,337,116,116,116, /* block 111 */ -569,569,569,569,569,569,569,569,569,569,569,569,569,569,569,569, -569,569,569,569,569,569,569,569,569,569,569,569,569,569,569,569, -569,569,569,569,569,569,569,569,569,570,570,570,570,570,570,571, -571,570,570,571,571,570,570,115,115,115,115,115,115,115,115,115, -569,569,569,570,569,569,569,569,569,569,569,569,570,571,115,115, -572,572,572,572,572,572,572,572,572,572,115,115,573,573,573,573, -323,323,323,323,323,323,323,323,323,323,323,323,323,323,323,323, -568,323,323,323,323,323,323,329,329,329,323,324,325,324,323,323, +571,571,571,572,573,573,573,573,573,573,573,573,573,573,573,573, +573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573, +573,573,573,573,573,573,573,573,573,573,573,573,573,573,573,573, +573,573,573,571,572,572,571,571,571,571,572,572,571,572,572,572, +572,574,574,574,574,574,574,574,574,574,574,574,574,574,116,109, +575,575,575,575,575,575,575,575,575,575,116,116,116,116,574,574, +327,327,327,327,327,329,576,327,327,327,327,327,327,327,327,327, +331,331,331,331,331,331,331,331,331,331,327,327,327,327,327,116, /* block 112 */ -574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574, -574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574, -574,574,574,574,574,574,574,574,574,574,574,574,574,574,574,574, -575,574,575,575,575,574,574,575,575,574,574,574,574,574,575,575, -574,575,574,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,574,574,576,577,577, -578,578,578,578,578,578,578,578,578,578,578,579,580,580,579,579, -581,581,578,582,582,579,580,115,115,115,115,115,115,115,115,115, +577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,577, +577,577,577,577,577,577,577,577,577,577,577,577,577,577,577,577, +577,577,577,577,577,577,577,577,577,578,578,578,578,578,578,579, +579,578,578,579,579,578,578,116,116,116,116,116,116,116,116,116, +577,577,577,578,577,577,577,577,577,577,577,577,578,579,116,116, +580,580,580,580,580,580,580,580,580,580,116,116,581,581,581,581, +327,327,327,327,327,327,327,327,327,327,327,327,327,327,327,327, +576,327,327,327,327,327,327,333,333,333,327,328,329,328,327,327, /* block 113 */ -115,336,336,336,336,336,336,115,115,336,336,336,336,336,336,115, -115,336,336,336,336,336,336,115,115,115,115,115,115,115,115,115, -336,336,336,336,336,336,336,115,336,336,336,336,336,336,336,115, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, 33, - 33, 33, 33,583, 33, 33, 33, 33, 33, 33, 33, 14,107,107,107,107, - 33, 33, 33, 33, 33,123,115,115,115,115,115,115,115,115,115,115, -584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584, +582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582, +582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582, +582,582,582,582,582,582,582,582,582,582,582,582,582,582,582,582, +583,582,583,583,583,582,582,583,583,582,582,582,582,582,583,583, +582,583,582,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,582,582,584,585,585, +586,586,586,586,586,586,586,586,586,586,586,587,588,588,587,587, +589,589,586,590,590,587,588,116,116,116,116,116,116,116,116,116, /* block 114 */ -584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584, -584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584, -584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584, -584,584,584,584,584,584,584,584,584,584,584,584,584,584,584,584, -578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578, -578,578,578,578,578,578,578,578,578,578,578,578,578,578,578,578, -578,578,578,579,579,580,579,579,580,579,579,581,579,580,115,115, -585,585,585,585,585,585,585,585,585,585,115,115,115,115,115,115, +116,340,340,340,340,340,340,116,116,340,340,340,340,340,340,116, +116,340,340,340,340,340,340,116,116,116,116,116,116,116,116,116, +340,340,340,340,340,340,340,116,340,340,340,340,340,340,340,116, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, 34, + 34, 34, 34,591, 34, 34, 34, 34, 34, 34, 34, 14,108,108,108,108, + 34, 34, 34, 34, 34,124,116,116,116,116,116,116,116,116,116,116, +592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592, /* block 115 */ -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, +592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592, +592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592, +592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592, +592,592,592,592,592,592,592,592,592,592,592,592,592,592,592,592, +586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586, +586,586,586,586,586,586,586,586,586,586,586,586,586,586,586,586, +586,586,586,587,587,588,587,587,588,587,587,589,587,588,116,116, +593,593,593,593,593,593,593,593,593,593,116,116,116,116,116,116, /* block 116 */ -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, /* block 117 */ -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, /* block 118 */ -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, /* block 119 */ -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, /* block 120 */ -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, /* block 121 */ -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -586,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,586,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,586,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, /* block 122 */ -587,587,587,587,587,587,587,587,586,587,587,587,587,587,587,587, -587,587,587,587,587,587,587,587,587,587,587,587,587,587,587,587, -587,587,587,587,115,115,115,115,115,115,115,115,115,115,115,115, -334,334,334,334,334,334,334,334,334,334,334,334,334,334,334,334, -334,334,334,334,334,334,334,115,115,115,115,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,335,335,335,335, -335,335,335,335,335,335,335,335,335,335,335,335,115,115,115,115, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +594,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,594,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,594,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, /* block 123 */ -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, -588,588,588,588,588,588,588,588,588,588,588,588,588,588,588,588, +595,595,595,595,595,595,595,595,594,595,595,595,595,595,595,595, +595,595,595,595,595,595,595,595,595,595,595,595,595,595,595,595, +595,595,595,595,116,116,116,116,116,116,116,116,116,116,116,116, +338,338,338,338,338,338,338,338,338,338,338,338,338,338,338,338, +338,338,338,338,338,338,338,116,116,116,116,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,339,339,339,339, +339,339,339,339,339,339,339,339,339,339,339,339,116,116,116,116, /* block 124 */ -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, +596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, /* block 125 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,115,115, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, /* block 126 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,116,116, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, /* block 127 */ - 33, 33, 33, 33, 33, 33, 33,115,115,115,115,115,115,115,115,115, -115,115,115,200,200,200,200,200,115,115,115,115,115,207,204,207, -207,207,207,207,207,207,207,207,207,590,207,207,207,207,207,207, -207,207,207,207,207,207,207,115,207,207,207,207,207,115,207,115, -207,207,115,207,207,115,207,207,207,207,207,207,207,207,207,207, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 128 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,591,591,591,591,591,591,591,591,591,591,591,591,591,591, -591,591,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, + 34, 34, 34, 34, 34, 34, 34,116,116,116,116,116,116,116,116,116, +116,116,116,200,200,200,200,200,116,116,116,116,116,208,205,208, +208,208,208,208,208,208,208,208,208,598,208,208,208,208,208,208, +208,208,208,208,208,208,208,116,208,208,208,208,208,116,208,116, +208,208,116,208,208,116,208,208,208,208,208,208,208,208,208,208, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 129 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,599,599,599,599,599,599,599,599,599,599,599,599,599,599, +599,599,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 130 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216, 7, 6, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 131 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -115,115,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -216,216,216,216,216,216,216,216,216,216,216,216,212,213,115,115, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217, 7, 6, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, /* block 132 */ -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, - 4, 4, 4, 4, 4, 4, 4, 6, 7, 4,115,115,115,115,115,115, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,192,192, - 4, 9, 9, 15, 15, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, - 7, 6, 7, 6, 7, 4, 4, 6, 7, 4, 4, 4, 4, 15, 15, 15, - 4, 4, 4,115, 4, 4, 4, 4, 9, 6, 7, 6, 7, 6, 7, 4, - 4, 4, 8, 9, 8, 8, 8,115, 4, 5, 4, 4,115,115,115,115, -216,216,216,216,216,115,216,216,216,216,216,216,216,216,216,216, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +116,116,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +217,217,217,217,217,217,217,217,217,217,217,217,213,214,116,116, /* block 133 */ -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,115,115, 22, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, + 4, 4, 4, 4, 4, 4, 4, 6, 7, 4,116,116,116,116,116,116, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,193,193, + 4, 9, 9, 15, 15, 6, 7, 6, 7, 6, 7, 6, 7, 6, 7, 6, + 7, 6, 7, 6, 7, 4, 4, 6, 7, 4, 4, 4, 4, 15, 15, 15, + 4, 4, 4,116, 4, 4, 4, 4, 9, 6, 7, 6, 7, 6, 7, 4, + 4, 4, 8, 9, 8, 8, 8,116, 4, 5, 4, 4,116,116,116,116, +217,217,217,217,217,116,217,217,217,217,217,217,217,217,217,217, /* block 134 */ -115, 4, 4, 4, 5, 4, 4, 4, 6, 7, 4, 8, 4, 9, 4, 4, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,116,116, 23, + +/* block 135 */ +116, 4, 4, 4, 5, 4, 4, 4, 6, 7, 4, 8, 4, 9, 4, 4, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 4, 4, 8, 8, 8, 4, 4, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 6, 4, 7, 14, 15, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 6, 8, 7, 8, 6, - 7, 4, 6, 7, 4, 4,509,509,509,509,509,509,509,509,509,509, -108,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, - -/* block 135 */ -509,509,509,509,509,509,509,509,509,509,509,509,509,509,509,509, -509,509,509,509,509,509,509,509,509,509,509,509,509,509,592,592, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,512, -512,512,512,512,512,512,512,512,512,512,512,512,512,512,512,115, -115,115,512,512,512,512,512,512,115,115,512,512,512,512,512,512, -115,115,512,512,512,512,512,512,115,115,512,512,512,115,115,115, - 5, 5, 8, 14, 19, 5, 5,115, 19, 8, 8, 8, 8, 19, 19,115, -465,465,465,465,465,465,465,465,465, 22, 22, 22, 19, 19,115,115, + 7, 4, 6, 7, 4, 4,517,517,517,517,517,517,517,517,517,517, +109,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, /* block 136 */ -593,593,593,593,593,593,593,593,593,593,593,593,115,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,115,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,115,593,593,115,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,115,115, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,517,517, +517,517,517,517,517,517,517,517,517,517,517,517,517,517,600,600, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,520, +520,520,520,520,520,520,520,520,520,520,520,520,520,520,520,116, +116,116,520,520,520,520,520,520,116,116,520,520,520,520,520,520, +116,116,520,520,520,520,520,520,116,116,520,520,520,116,116,116, + 5, 5, 8, 14, 19, 5, 5,116, 19, 8, 8, 8, 8, 19, 19,116, +471,471,471,471,471,471,471,471,471, 23, 23, 23, 19, 19,116,116, /* block 137 */ -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,593,593,593,593,593, -593,593,593,593,593,593,593,593,593,593,593,115,115,115,115,115, +601,601,601,601,601,601,601,601,601,601,601,601,116,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,116,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,116,601,601,116,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,116,116, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 138 */ - 4, 4, 4,115,115,115,115, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23,115,115,115, 19, 19, 19, 19, 19, 19, 19, 19, 19, -594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,594, -594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,594, -594,594,594,594,594,594,594,594,594,594,594,594,594,594,594,594, -594,594,594,594,594,595,595,595,595,596,596,596,596,596,596,596, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, +601,601,601,601,601,601,601,601,601,601,601,116,116,116,116,116, /* block 139 */ -596,596,596,596,596,596,596,596,596,596,595,595,596,596,596,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, -596,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,110,115,115, + 4, 4, 4,116,116,116,116, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24,116,116,116, 19, 19, 19, 19, 19, 19, 19, 19, 19, +602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602, +602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602, +602,602,602,602,602,602,602,602,602,602,602,602,602,602,602,602, +602,602,602,602,602,603,603,603,603,604,604,604,604,604,604,604, /* block 140 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +604,604,604,604,604,604,604,604,604,604,603,603,604,604,604,116, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,116,116,116,116, +604,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,111,116,116, /* block 141 */ -597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, -597,597,597,597,597,597,597,597,597,597,597,597,597,115,115,115, -598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598, -598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598, -598,598,598,598,598,598,598,598,598,598,598,598,598,598,598,598, -598,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -110, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 142 */ -599,599,599,599,599,599,599,599,599,599,599,599,599,599,599,599, -599,599,599,599,599,599,599,599,599,599,599,599,599,599,599,599, -600,600,600,600,115,115,115,115,115,115,115,115,115,599,599,599, -601,601,601,601,601,601,601,601,601,601,601,601,601,601,601,601, -601,602,601,601,601,601,601,601,601,601,602,115,115,115,115,115, -603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,603, -603,603,603,603,603,603,603,603,603,603,603,603,603,603,603,603, -603,603,603,603,603,603,604,604,604,604,604,115,115,115,115,115, +605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605, +605,605,605,605,605,605,605,605,605,605,605,605,605,116,116,116, +606,606,606,606,606,606,606,606,606,606,606,606,606,606,606,606, +606,606,606,606,606,606,606,606,606,606,606,606,606,606,606,606, +606,606,606,606,606,606,606,606,606,606,606,606,606,606,606,606, +606,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +111, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,116,116,116,116, /* block 143 */ -605,605,605,605,605,605,605,605,605,605,605,605,605,605,605,605, -605,605,605,605,605,605,605,605,605,605,605,605,605,605,115,606, 607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,607, 607,607,607,607,607,607,607,607,607,607,607,607,607,607,607,607, -607,607,607,607,115,115,115,115,607,607,607,607,607,607,607,607, -608,609,609,609,609,609,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - -/* block 144 */ -610,610,610,610,610,610,610,610,610,610,610,610,610,610,610,610, -610,610,610,610,610,610,610,610,610,610,610,610,610,610,610,610, -610,610,610,610,610,610,610,610,611,611,611,611,611,611,611,611, +608,608,608,608,116,116,116,116,116,116,116,116,116,607,607,607, +609,609,609,609,609,609,609,609,609,609,609,609,609,609,609,609, +609,610,609,609,609,609,609,609,609,609,610,116,116,116,116,116, 611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611, 611,611,611,611,611,611,611,611,611,611,611,611,611,611,611,611, -612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612, -612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612, -612,612,612,612,612,612,612,612,612,612,612,612,612,612,612,612, +611,611,611,611,611,611,612,612,612,612,612,116,116,116,116,116, -/* block 145 */ +/* block 144 */ 613,613,613,613,613,613,613,613,613,613,613,613,613,613,613,613, -613,613,613,613,613,613,613,613,613,613,613,613,613,613,115,115, -614,614,614,614,614,614,614,614,614,614,115,115,115,115,115,115, +613,613,613,613,613,613,613,613,613,613,613,613,613,613,116,614, 615,615,615,615,615,615,615,615,615,615,615,615,615,615,615,615, 615,615,615,615,615,615,615,615,615,615,615,615,615,615,615,615, -615,615,615,615,115,115,115,115,616,616,616,616,616,616,616,616, -616,616,616,616,616,616,616,616,616,616,616,616,616,616,616,616, -616,616,616,616,616,616,616,616,616,616,616,616,115,115,115,115, +615,615,615,615,116,116,116,116,615,615,615,615,615,615,615,615, +616,617,617,617,617,617,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, -/* block 146 */ -617,617,617,617,617,617,617,617,617,617,617,617,617,617,617,617, -617,617,617,617,617,617,617,617,617,617,617,617,617,617,617,617, -617,617,617,617,617,617,617,617,115,115,115,115,115,115,115,115, -618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,618, +/* block 145 */ 618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,618, 618,618,618,618,618,618,618,618,618,618,618,618,618,618,618,618, -618,618,618,618,115,115,115,115,115,115,115,115,115,115,115,619, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - -/* block 147 */ -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, +618,618,618,618,618,618,618,618,619,619,619,619,619,619,619,619, +619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,619, +619,619,619,619,619,619,619,619,619,619,619,619,619,619,619,619, 620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, 620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, 620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, +/* block 146 */ +621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621, +621,621,621,621,621,621,621,621,621,621,621,621,621,621,116,116, +622,622,622,622,622,622,622,622,622,622,116,116,116,116,116,116, +623,623,623,623,623,623,623,623,623,623,623,623,623,623,623,623, +623,623,623,623,623,623,623,623,623,623,623,623,623,623,623,623, +623,623,623,623,116,116,116,116,624,624,624,624,624,624,624,624, +624,624,624,624,624,624,624,624,624,624,624,624,624,624,624,624, +624,624,624,624,624,624,624,624,624,624,624,624,116,116,116,116, + +/* block 147 */ +625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625, +625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625, +625,625,625,625,625,625,625,625,116,116,116,116,116,116,116,116, +626,626,626,626,626,626,626,626,626,626,626,626,626,626,626,626, +626,626,626,626,626,626,626,626,626,626,626,626,626,626,626,626, +626,626,626,626,626,626,626,626,626,626,626,626,626,626,626,626, +626,626,626,626,116,116,116,116,116,116,116,116,116,116,116,627, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + /* block 148 */ -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,620,115,115,115,115,115,115,115,115,115, -620,620,620,620,620,620,620,620,620,620,620,620,620,620,620,620, -620,620,620,620,620,620,115,115,115,115,115,115,115,115,115,115, -620,620,620,620,620,620,620,620,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, /* block 149 */ -621,621,621,621,621,621,115,115,621,115,621,621,621,621,621,621, -621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621, -621,621,621,621,621,621,621,621,621,621,621,621,621,621,621,621, -621,621,621,621,621,621,115,621,621,115,115,115,621,115,115,621, -622,622,622,622,622,622,622,622,622,622,622,622,622,622,622,622, -622,622,622,622,622,622,115,623,624,624,624,624,624,624,624,624, -625,625,625,625,625,625,625,625,625,625,625,625,625,625,625,625, -625,625,625,625,625,625,625,626,626,627,627,627,627,627,627,627, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,628,116,116,116,116,116,116,116,116,116, +628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, +628,628,628,628,628,628,116,116,116,116,116,116,116,116,116,116, +628,628,628,628,628,628,628,628,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 150 */ -628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,628, -628,628,628,628,628,628,628,628,628,628,628,628,628,628,628,115, -115,115,115,115,115,115,115,629,629,629,629,629,629,629,629,629, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +629,629,629,629,629,629,116,116,629,116,629,629,629,629,629,629, +629,629,629,629,629,629,629,629,629,629,629,629,629,629,629,629, +629,629,629,629,629,629,629,629,629,629,629,629,629,629,629,629, +629,629,629,629,629,629,116,629,629,116,116,116,629,116,116,629, 630,630,630,630,630,630,630,630,630,630,630,630,630,630,630,630, -630,630,630,115,630,630,115,115,115,115,115,631,631,631,631,631, +630,630,630,630,630,630,116,631,632,632,632,632,632,632,632,632, +633,633,633,633,633,633,633,633,633,633,633,633,633,633,633,633, +633,633,633,633,633,633,633,634,634,635,635,635,635,635,635,635, /* block 151 */ -632,632,632,632,632,632,632,632,632,632,632,632,632,632,632,632, -632,632,632,632,632,632,633,633,633,633,633,633,115,115,115,634, -635,635,635,635,635,635,635,635,635,635,635,635,635,635,635,635, -635,635,635,635,635,635,635,635,635,635,115,115,115,115,115,636, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +636,636,636,636,636,636,636,636,636,636,636,636,636,636,636,636, +636,636,636,636,636,636,636,636,636,636,636,636,636,636,636,116, +116,116,116,116,116,116,116,637,637,637,637,637,637,637,637,637, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +638,638,638,638,638,638,638,638,638,638,638,638,638,638,638,638, +638,638,638,116,638,638,116,116,116,116,116,639,639,639,639,639, /* block 152 */ -637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,637, -637,637,637,637,637,637,637,637,637,637,637,637,637,637,637,637, -638,638,638,638,638,638,638,638,638,638,638,638,638,638,638,638, -638,638,638,638,638,638,638,638,115,115,115,115,639,639,638,638, -639,639,639,639,639,639,639,639,639,639,639,639,639,639,639,639, -115,115,639,639,639,639,639,639,639,639,639,639,639,639,639,639, -639,639,639,639,639,639,639,639,639,639,639,639,639,639,639,639, -639,639,639,639,639,639,639,639,639,639,639,639,639,639,639,639, +640,640,640,640,640,640,640,640,640,640,640,640,640,640,640,640, +640,640,640,640,640,640,641,641,641,641,641,641,116,116,116,642, +643,643,643,643,643,643,643,643,643,643,643,643,643,643,643,643, +643,643,643,643,643,643,643,643,643,643,116,116,116,116,116,644, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 153 */ -640,641,641,641,115,641,641,115,115,115,115,115,641,641,641,641, -640,640,640,640,115,640,640,640,115,640,640,640,640,640,640,640, -640,640,640,640,640,640,640,640,640,640,640,640,640,640,640,640, -640,640,640,640,115,115,115,115,641,641,641,115,115,115,115,641, -642,642,642,642,642,642,642,642,115,115,115,115,115,115,115,115, -643,643,643,643,643,643,643,643,643,115,115,115,115,115,115,115, -644,644,644,644,644,644,644,644,644,644,644,644,644,644,644,644, -644,644,644,644,644,644,644,644,644,644,644,644,644,645,645,646, +645,645,645,645,645,645,645,645,645,645,645,645,645,645,645,645, +645,645,645,645,645,645,645,645,645,645,645,645,645,645,645,645, +646,646,646,646,646,646,646,646,646,646,646,646,646,646,646,646, +646,646,646,646,646,646,646,646,116,116,116,116,647,647,646,646, +647,647,647,647,647,647,647,647,647,647,647,647,647,647,647,647, +116,116,647,647,647,647,647,647,647,647,647,647,647,647,647,647, +647,647,647,647,647,647,647,647,647,647,647,647,647,647,647,647, +647,647,647,647,647,647,647,647,647,647,647,647,647,647,647,647, /* block 154 */ -647,647,647,647,647,647,647,647,647,647,647,647,647,647,647,647, -647,647,647,647,647,647,647,647,647,647,647,647,647,648,648,648, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -649,649,649,649,649,649,649,649,650,649,649,649,649,649,649,649, -649,649,649,649,649,649,649,649,649,649,649,649,649,649,649,649, -649,649,649,649,649,651,651,115,115,115,115,652,652,652,652,652, -653,653,653,653,653,653,653,115,115,115,115,115,115,115,115,115, +648,649,649,649,116,649,649,116,116,116,116,116,649,649,649,649, +648,648,648,648,116,648,648,648,116,648,648,648,648,648,648,648, +648,648,648,648,648,648,648,648,648,648,648,648,648,648,648,648, +648,648,648,648,648,648,116,116,649,649,649,116,116,116,116,649, +650,650,650,650,650,650,650,650,650,116,116,116,116,116,116,116, +651,651,651,651,651,651,651,651,651,116,116,116,116,116,116,116, +652,652,652,652,652,652,652,652,652,652,652,652,652,652,652,652, +652,652,652,652,652,652,652,652,652,652,652,652,652,653,653,654, /* block 155 */ -654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654, -654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654, -654,654,654,654,654,654,654,654,654,654,654,654,654,654,654,654, -654,654,654,654,654,654,115,115,115,655,655,655,655,655,655,655, -656,656,656,656,656,656,656,656,656,656,656,656,656,656,656,656, -656,656,656,656,656,656,115,115,657,657,657,657,657,657,657,657, -658,658,658,658,658,658,658,658,658,658,658,658,658,658,658,658, -658,658,658,115,115,115,115,115,659,659,659,659,659,659,659,659, +655,655,655,655,655,655,655,655,655,655,655,655,655,655,655,655, +655,655,655,655,655,655,655,655,655,655,655,655,655,656,656,656, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +657,657,657,657,657,657,657,657,658,657,657,657,657,657,657,657, +657,657,657,657,657,657,657,657,657,657,657,657,657,657,657,657, +657,657,657,657,657,659,659,116,116,116,116,660,660,660,660,660, +661,661,661,661,661,661,661,116,116,116,116,116,116,116,116,116, /* block 156 */ -660,660,660,660,660,660,660,660,660,660,660,660,660,660,660,660, -660,660,115,115,115,115,115,115,115,661,661,661,661,115,115,115, -115,115,115,115,115,115,115,115,115,662,662,662,662,662,662,662, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662, +662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662, +662,662,662,662,662,662,662,662,662,662,662,662,662,662,662,662, +662,662,662,662,662,662,116,116,116,663,663,663,663,663,663,663, +664,664,664,664,664,664,664,664,664,664,664,664,664,664,664,664, +664,664,664,664,664,664,116,116,665,665,665,665,665,665,665,665, +666,666,666,666,666,666,666,666,666,666,666,666,666,666,666,666, +666,666,666,116,116,116,116,116,667,667,667,667,667,667,667,667, /* block 157 */ -663,663,663,663,663,663,663,663,663,663,663,663,663,663,663,663, -663,663,663,663,663,663,663,663,663,663,663,663,663,663,663,663, -663,663,663,663,663,663,663,663,663,663,663,663,663,663,663,663, -663,663,663,663,663,663,663,663,663,663,663,663,663,663,663,663, -663,663,663,663,663,663,663,663,663,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +668,668,668,668,668,668,668,668,668,668,668,668,668,668,668,668, +668,668,116,116,116,116,116,116,116,669,669,669,669,116,116,116, +116,116,116,116,116,116,116,116,116,670,670,670,670,670,670,670, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 158 */ -664,664,664,664,664,664,664,664,664,664,664,664,664,664,664,664, -664,664,664,664,664,664,664,664,664,664,664,664,664,664,664,664, -664,664,664,664,664,664,664,664,664,664,664,664,664,664,664,664, -664,664,664,115,115,115,115,115,115,115,115,115,115,115,115,115, -665,665,665,665,665,665,665,665,665,665,665,665,665,665,665,665, -665,665,665,665,665,665,665,665,665,665,665,665,665,665,665,665, -665,665,665,665,665,665,665,665,665,665,665,665,665,665,665,665, -665,665,665,115,115,115,115,115,115,115,666,666,666,666,666,666, +671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671, +671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671, +671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671, +671,671,671,671,671,671,671,671,671,671,671,671,671,671,671,671, +671,671,671,671,671,671,671,671,671,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 159 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -667,667,667,667,667,667,667,667,667,667,667,667,667,667,667,667, -667,667,667,667,667,667,667,667,667,667,667,667,667,667,667,115, +672,672,672,672,672,672,672,672,672,672,672,672,672,672,672,672, +672,672,672,672,672,672,672,672,672,672,672,672,672,672,672,672, +672,672,672,672,672,672,672,672,672,672,672,672,672,672,672,672, +672,672,672,116,116,116,116,116,116,116,116,116,116,116,116,116, +673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673, +673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673, +673,673,673,673,673,673,673,673,673,673,673,673,673,673,673,673, +673,673,673,116,116,116,116,116,116,116,674,674,674,674,674,674, /* block 160 */ -668,669,668,670,670,670,670,670,670,670,670,670,670,670,670,670, -670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670, -670,670,670,670,670,670,670,670,670,670,670,670,670,670,670,670, -670,670,670,670,670,670,670,670,669,669,669,669,669,669,669,669, -669,669,669,669,669,669,669,671,671,671,671,671,671,671,115,115, -115,115,672,672,672,672,672,672,672,672,672,672,672,672,672,672, -672,672,672,672,672,672,673,673,673,673,673,673,673,673,673,673, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,669, +675,675,675,675,675,675,675,675,675,675,675,675,675,675,675,675, +675,675,675,675,675,675,675,675,675,675,675,675,675,675,675,675, +675,675,675,675,676,676,676,676,116,116,116,116,116,116,116,116, +677,677,677,677,677,677,677,677,677,677,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 161 */ -674,674,675,676,676,676,676,676,676,676,676,676,676,676,676,676, -676,676,676,676,676,676,676,676,676,676,676,676,676,676,676,676, -676,676,676,676,676,676,676,676,676,676,676,676,676,676,676,676, -675,675,675,674,674,674,674,675,675,674,674,677,677,678,677,677, -677,677,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -679,679,679,679,679,679,679,679,679,679,679,679,679,679,679,679, -679,679,679,679,679,679,679,679,679,115,115,115,115,115,115,115, -680,680,680,680,680,680,680,680,680,680,115,115,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,678, +678,678,678,678,678,678,678,678,678,678,678,678,678,678,678,116, /* block 162 */ -681,681,681,682,682,682,682,682,682,682,682,682,682,682,682,682, -682,682,682,682,682,682,682,682,682,682,682,682,682,682,682,682, -682,682,682,682,682,682,682,681,681,681,681,681,683,681,681,681, -681,681,681,681,681,115,684,684,684,684,684,684,684,684,684,684, -685,685,685,685,115,115,115,115,115,115,115,115,115,115,115,115, -686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686, -686,686,686,686,686,686,686,686,686,686,686,686,686,686,686,686, -686,686,686,687,688,688,686,115,115,115,115,115,115,115,115,115, +679,679,679,679,679,679,679,679,679,679,679,679,679,679,679,679, +679,679,679,679,679,679,679,679,679,679,679,679,679,680,680,680, +680,680,680,680,680,680,680,679,116,116,116,116,116,116,116,116, +681,681,681,681,681,681,681,681,681,681,681,681,681,681,681,681, +681,681,681,681,681,681,682,682,682,682,682,682,682,682,682,682, +682,683,683,683,683,684,684,684,684,684,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 163 */ -689,689,690,691,691,691,691,691,691,691,691,691,691,691,691,691, -691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691, -691,691,691,691,691,691,691,691,691,691,691,691,691,691,691,691, -691,691,691,690,690,690,689,689,689,689,689,689,689,689,689,690, -690,691,692,692,691,693,693,693,693,693,689,689,689,693,115,115, -694,694,694,694,694,694,694,694,694,694,691,693,691,693,693,693, -115,695,695,695,695,695,695,695,695,695,695,695,695,695,695,695, -695,695,695,695,695,115,115,115,115,115,115,115,115,115,115,115, +685,686,685,687,687,687,687,687,687,687,687,687,687,687,687,687, +687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687, +687,687,687,687,687,687,687,687,687,687,687,687,687,687,687,687, +687,687,687,687,687,687,687,687,686,686,686,686,686,686,686,686, +686,686,686,686,686,686,686,688,688,688,688,688,688,688,116,116, +116,116,689,689,689,689,689,689,689,689,689,689,689,689,689,689, +689,689,689,689,689,689,690,690,690,690,690,690,690,690,690,690, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,686, /* block 164 */ +691,691,692,693,693,693,693,693,693,693,693,693,693,693,693,693, +693,693,693,693,693,693,693,693,693,693,693,693,693,693,693,693, +693,693,693,693,693,693,693,693,693,693,693,693,693,693,693,693, +692,692,692,691,691,691,691,692,692,691,691,694,694,695,694,694, +694,694,116,116,116,116,116,116,116,116,116,116,116,695,116,116, 696,696,696,696,696,696,696,696,696,696,696,696,696,696,696,696, -696,696,115,696,696,696,696,696,696,696,696,696,696,696,696,696, -696,696,696,696,696,696,696,696,696,696,696,696,697,697,697,698, -698,698,697,697,698,697,698,698,699,699,699,699,699,699,698,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +696,696,696,696,696,696,696,696,696,116,116,116,116,116,116,116, +697,697,697,697,697,697,697,697,697,697,116,116,116,116,116,116, /* block 165 */ -700,700,700,700,700,700,700,115,700,115,700,700,700,700,115,700, -700,700,700,700,700,700,700,700,700,700,700,700,700,700,115,700, -700,700,700,700,700,700,700,700,700,701,115,115,115,115,115,115, -702,702,702,702,702,702,702,702,702,702,702,702,702,702,702,702, -702,702,702,702,702,702,702,702,702,702,702,702,702,702,702,702, -702,702,702,702,702,702,702,702,702,702,702,702,702,702,702,703, -704,704,704,703,703,703,703,703,703,703,703,115,115,115,115,115, -705,705,705,705,705,705,705,705,705,705,115,115,115,115,115,115, +698,698,698,699,699,699,699,699,699,699,699,699,699,699,699,699, +699,699,699,699,699,699,699,699,699,699,699,699,699,699,699,699, +699,699,699,699,699,699,699,698,698,698,698,698,700,698,698,698, +698,698,698,698,698,116,701,701,701,701,701,701,701,701,701,701, +702,702,702,702,699,700,700,116,116,116,116,116,116,116,116,116, +703,703,703,703,703,703,703,703,703,703,703,703,703,703,703,703, +703,703,703,703,703,703,703,703,703,703,703,703,703,703,703,703, +703,703,703,704,705,705,703,116,116,116,116,116,116,116,116,116, /* block 166 */ -706,706,707,707,115,708,708,708,708,708,708,708,708,115,115,708, -708,115,115,708,708,708,708,708,708,708,708,708,708,708,708,708, -708,708,708,708,708,708,708,708,708,115,708,708,708,708,708,708, -708,115,708,708,115,708,708,708,708,708,115,115,706,708,709,707, -706,707,707,707,707,115,115,707,707,115,115,707,707,707,115,115, -708,115,115,115,115,115,115,709,115,115,115,115,115,708,708,708, -708,708,707,707,115,115,706,706,706,706,706,706,706,115,115,115, -706,706,706,706,706,115,115,115,115,115,115,115,115,115,115,115, +706,706,707,708,708,708,708,708,708,708,708,708,708,708,708,708, +708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708, +708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708, +708,708,708,707,707,707,706,706,706,706,706,706,706,706,706,707, +707,708,709,709,708,710,710,710,710,706,706,706,706,710,116,116, +711,711,711,711,711,711,711,711,711,711,708,710,708,710,710,710, +116,712,712,712,712,712,712,712,712,712,712,712,712,712,712,712, +712,712,712,712,712,116,116,116,116,116,116,116,116,116,116,116, /* block 167 */ -710,710,710,710,710,710,710,710,710,710,710,710,710,710,710,710, -710,710,710,710,710,710,710,710,710,710,710,710,710,710,710,710, -710,710,710,710,710,710,710,710,710,710,710,710,710,710,710,710, -710,710,710,710,710,711,711,711,712,712,712,712,712,712,712,712, -711,711,712,712,712,711,712,710,710,710,710,713,713,713,713,713, -714,714,714,714,714,714,714,714,714,714,115,713,115,713,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +713,713,713,713,713,713,713,713,713,713,713,713,713,713,713,713, +713,713,116,713,713,713,713,713,713,713,713,713,713,713,713,713, +713,713,713,713,713,713,713,713,713,713,713,713,714,714,714,715, +715,715,714,714,715,714,715,715,716,716,716,716,716,716,715,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 168 */ -715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715, -715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715, -715,715,715,715,715,715,715,715,715,715,715,715,715,715,715,715, -716,717,717,718,718,718,718,718,718,717,718,717,717,716,717,718, -718,717,718,718,715,715,719,715,115,115,115,115,115,115,115,115, -720,720,720,720,720,720,720,720,720,720,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +717,717,717,717,717,717,717,116,717,116,717,717,717,717,116,717, +717,717,717,717,717,717,717,717,717,717,717,717,717,717,116,717, +717,717,717,717,717,717,717,717,717,718,116,116,116,116,116,116, +719,719,719,719,719,719,719,719,719,719,719,719,719,719,719,719, +719,719,719,719,719,719,719,719,719,719,719,719,719,719,719,719, +719,719,719,719,719,719,719,719,719,719,719,719,719,719,719,720, +721,721,721,720,720,720,720,720,720,720,720,116,116,116,116,116, +722,722,722,722,722,722,722,722,722,722,116,116,116,116,116,116, /* block 169 */ -721,721,721,721,721,721,721,721,721,721,721,721,721,721,721,721, -721,721,721,721,721,721,721,721,721,721,721,721,721,721,721,721, -721,721,721,721,721,721,721,721,721,721,721,721,721,721,721,722, -723,723,724,724,724,724,115,115,723,723,723,723,724,724,723,724, -724,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725, -725,725,725,725,725,725,725,725,721,721,721,721,724,724,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +723,723,724,724,116,725,725,725,725,725,725,725,725,116,116,725, +725,116,116,725,725,725,725,725,725,725,725,725,725,725,725,725, +725,725,725,725,725,725,725,725,725,116,725,725,725,725,725,725, +725,116,725,725,116,725,725,725,725,725,116,111,723,725,726,724, +723,724,724,724,724,116,116,724,724,116,116,724,724,724,116,116, +725,116,116,116,116,116,116,726,116,116,116,116,116,725,725,725, +725,725,724,724,116,116,723,723,723,723,723,723,723,116,116,116, +723,723,723,723,723,116,116,116,116,116,116,116,116,116,116,116, /* block 170 */ -726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, -726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, -726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, -727,727,727,728,728,728,728,728,728,728,728,727,727,728,727,728, -728,729,729,729,726,115,115,115,115,115,115,115,115,115,115,115, -730,730,730,730,730,730,730,730,730,730,115,115,115,115,115,115, -369,369,369,369,369,369,369,369,369,369,369,369,369,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +727,727,727,727,727,727,727,727,727,727,727,727,727,727,727,727, +727,727,727,727,727,727,727,727,727,727,727,727,727,727,727,727, +727,727,727,727,727,727,727,727,727,727,727,727,727,727,727,727, +727,727,727,727,727,728,728,728,729,729,729,729,729,729,729,729, +728,728,729,729,729,728,729,727,727,727,727,730,730,730,730,730, +731,731,731,731,731,731,731,731,731,731,116,730,116,730,729,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 171 */ -731,731,731,731,731,731,731,731,731,731,731,731,731,731,731,731, -731,731,731,731,731,731,731,731,731,731,731,731,731,731,731,731, -731,731,731,731,731,731,731,731,731,731,731,732,733,732,733,733, -732,732,732,732,732,732,733,732,115,115,115,115,115,115,115,115, -734,734,734,734,734,734,734,734,734,734,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +732,732,732,732,732,732,732,732,732,732,732,732,732,732,732,732, +732,732,732,732,732,732,732,732,732,732,732,732,732,732,732,732, +732,732,732,732,732,732,732,732,732,732,732,732,732,732,732,732, +733,734,734,735,735,735,735,735,735,734,735,734,734,733,734,735, +735,734,735,735,732,732,736,732,116,116,116,116,116,116,116,116, +737,737,737,737,737,737,737,737,737,737,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 172 */ -735,735,735,735,735,735,735,735,735,735,735,735,735,735,735,735, -735,735,735,735,735,735,735,735,735,735,115,115,115,736,736,736, -737,737,736,736,736,736,737,736,736,736,736,736,115,115,115,115, -738,738,738,738,738,738,738,738,738,738,739,739,740,740,740,741, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +738,738,738,738,738,738,738,738,738,738,738,738,738,738,738,738, +738,738,738,738,738,738,738,738,738,738,738,738,738,738,738,738, +738,738,738,738,738,738,738,738,738,738,738,738,738,738,738,739, +740,740,741,741,741,741,116,116,740,740,740,740,741,741,740,741, +741,742,742,742,742,742,742,742,742,742,742,742,742,742,742,742, +742,742,742,742,742,742,742,742,738,738,738,738,741,741,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 173 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -742,742,742,742,742,742,742,742,742,742,742,742,742,742,742,742, -742,742,742,742,742,742,742,742,742,742,742,742,742,742,742,742, 743,743,743,743,743,743,743,743,743,743,743,743,743,743,743,743, 743,743,743,743,743,743,743,743,743,743,743,743,743,743,743,743, -744,744,744,744,744,744,744,744,744,744,745,745,745,745,745,745, -745,745,745,115,115,115,115,115,115,115,115,115,115,115,115,746, +743,743,743,743,743,743,743,743,743,743,743,743,743,743,743,743, +744,744,744,745,745,745,745,745,745,745,745,744,744,745,744,745, +745,746,746,746,743,116,116,116,116,116,116,116,116,116,116,116, +747,747,747,747,747,747,747,747,747,747,116,116,116,116,116,116, +373,373,373,373,373,373,373,373,373,373,373,373,373,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 174 */ -747,748,748,748,748,748,748,749,749,748,748,747,747,747,747,747, -747,747,747,747,747,747,747,747,747,747,747,747,747,747,747,747, -747,747,747,747,747,747,747,747,747,747,747,747,747,747,747,747, -747,747,747,748,748,748,748,748,748,749,750,748,748,748,748,751, -751,751,751,751,751,751,751,748,115,115,115,115,115,115,115,115, -752,753,753,753,753,753,753,754,754,753,753,753,752,752,752,752, -752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752, -752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752, +748,748,748,748,748,748,748,748,748,748,748,748,748,748,748,748, +748,748,748,748,748,748,748,748,748,748,748,748,748,748,748,748, +748,748,748,748,748,748,748,748,748,748,748,749,750,749,750,750, +749,749,749,749,749,749,750,749,116,116,116,116,116,116,116,116, +751,751,751,751,751,751,751,751,751,751,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 175 */ -752,752,752,752,115,115,755,755,755,755,753,753,753,753,753,753, -753,753,753,753,753,753,753,754,753,753,756,756,756,115,756,756, -756,756,756,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -757,757,757,757,757,757,757,757,757,757,757,757,757,757,757,757, -757,757,757,757,757,757,757,757,757,757,757,757,757,757,757,757, -757,757,757,757,757,757,757,757,757,757,757,757,757,757,757,757, -757,757,757,757,757,757,757,757,757,115,115,115,115,115,115,115, +752,752,752,752,752,752,752,752,752,752,752,752,752,752,752,752, +752,752,752,752,752,752,752,752,752,752,752,116,116,753,753,753, +754,754,753,753,753,753,754,753,753,753,753,753,116,116,116,116, +755,755,755,755,755,755,755,755,755,755,756,756,757,757,757,758, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 176 */ -758,758,758,758,758,758,758,758,758,115,758,758,758,758,758,758, -758,758,758,758,758,758,758,758,758,758,758,758,758,758,758,758, -758,758,758,758,758,758,758,758,758,758,758,758,758,758,758,759, -760,760,760,760,760,760,760,115,760,760,760,760,760,760,759,760, -758,761,761,761,761,761,115,115,115,115,115,115,115,115,115,115, -762,762,762,762,762,762,762,762,762,762,763,763,763,763,763,763, -763,763,763,763,763,763,763,763,763,763,763,763,763,115,115,115, -764,764,765,765,765,765,765,765,765,765,765,765,765,765,765,765, +759,759,759,759,759,759,759,759,759,759,759,759,759,759,759,759, +759,759,759,759,759,759,759,759,759,759,759,759,759,759,759,759, +759,759,759,759,759,759,759,759,759,759,759,759,760,760,760,761, +761,761,761,761,761,761,761,761,760,761,761,762,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 177 */ -765,765,765,765,765,765,765,765,765,765,765,765,765,765,765,765, -115,115,766,766,766,766,766,766,766,766,766,766,766,766,766,766, -766,766,766,766,766,766,766,766,115,767,766,766,766,766,766,766, -766,767,766,766,767,766,766,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763, +763,763,763,763,763,763,763,763,763,763,763,763,763,763,763,763, +764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764, +764,764,764,764,764,764,764,764,764,764,764,764,764,764,764,764, +765,765,765,765,765,765,765,765,765,765,766,766,766,766,766,766, +766,766,766,116,116,116,116,116,116,116,116,116,116,116,116,767, /* block 178 */ -768,768,768,768,768,768,768,115,768,768,115,768,768,768,768,768, +768,769,769,769,769,769,769,769,769,769,769,768,768,768,768,768, 768,768,768,768,768,768,768,768,768,768,768,768,768,768,768,768, 768,768,768,768,768,768,768,768,768,768,768,768,768,768,768,768, -768,769,769,769,769,769,769,115,115,115,769,115,769,769,115,769, -769,769,769,769,769,769,770,769,115,115,115,115,115,115,115,115, -771,771,771,771,771,771,771,771,771,771,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +768,768,768,769,769,769,769,769,769,770,771,769,769,769,769,772, +772,772,772,772,772,772,772,769,116,116,116,116,116,116,116,116, +773,774,774,774,774,774,774,775,775,774,774,774,773,773,773,773, +773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, +773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, /* block 179 */ -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, +773,773,773,773,116,116,776,776,776,776,774,774,774,774,774,774, +774,774,774,774,774,774,774,775,774,774,777,777,777,773,777,777, +777,777,777,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +778,778,778,778,778,778,778,778,778,778,778,778,778,778,778,778, +778,778,778,778,778,778,778,778,778,778,778,778,778,778,778,778, +778,778,778,778,778,778,778,778,778,778,778,778,778,778,778,778, +778,778,778,778,778,778,778,778,778,116,116,116,116,116,116,116, /* block 180 */ -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +779,779,779,779,779,779,779,779,779,116,779,779,779,779,779,779, +779,779,779,779,779,779,779,779,779,779,779,779,779,779,779,779, +779,779,779,779,779,779,779,779,779,779,779,779,779,779,779,780, +781,781,781,781,781,781,781,116,781,781,781,781,781,781,780,781, +779,782,782,782,782,782,116,116,116,116,116,116,116,116,116,116, +783,783,783,783,783,783,783,783,783,783,784,784,784,784,784,784, +784,784,784,784,784,784,784,784,784,784,784,784,784,116,116,116, +785,785,786,786,786,786,786,786,786,786,786,786,786,786,786,786, /* block 181 */ -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,773, -773,773,773,773,773,773,773,773,773,773,773,773,773,773,773,115, -774,774,774,774,774,115,115,115,115,115,115,115,115,115,115,115, +786,786,786,786,786,786,786,786,786,786,786,786,786,786,786,786, +116,116,787,787,787,787,787,787,787,787,787,787,787,787,787,787, +787,787,787,787,787,787,787,787,116,788,787,787,787,787,787,787, +787,788,787,787,788,787,787,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 182 */ -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,772,772,772,772,772,772,772,772,772,772,772,772, -772,772,772,772,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +789,789,789,789,789,789,789,116,789,789,116,789,789,789,789,789, +789,789,789,789,789,789,789,789,789,789,789,789,789,789,789,789, +789,789,789,789,789,789,789,789,789,789,789,789,789,789,789,789, +789,790,790,790,790,790,790,116,116,116,790,116,790,790,116,790, +790,790,790,790,790,790,791,790,116,116,116,116,116,116,116,116, +792,792,792,792,792,792,792,792,792,792,116,116,116,116,116,116, +793,793,793,793,793,793,116,793,793,116,793,793,793,793,793,793, +793,793,793,793,793,793,793,793,793,793,793,793,793,793,793,793, /* block 183 */ -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, +793,793,793,793,793,793,793,793,793,793,794,794,794,794,794,116, +795,795,116,794,794,795,794,795,793,116,116,116,116,116,116,116, +796,796,796,796,796,796,796,796,796,796,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 184 */ -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,775, -775,775,775,775,775,775,775,775,775,775,775,775,775,775,775,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, +797,797,797,798,798,799,799,800,800,116,116,116,116,116,116,116, /* block 185 */ -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, /* block 186 */ -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,776,776,776,776,776,776,776,776,776, -776,776,776,776,776,776,776,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 187 */ -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,802, +802,802,802,802,802,802,802,802,802,802,802,802,802,802,802,116, +803,803,803,803,803,116,116,116,116,116,116,116,116,116,116,116, /* block 188 */ -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,530,530,530,530,530,530,530, -530,530,530,530,530,530,530,530,530,115,115,115,115,115,115,115, -777,777,777,777,777,777,777,777,777,777,777,777,777,777,777,777, -777,777,777,777,777,777,777,777,777,777,777,777,777,777,777,115, -778,778,778,778,778,778,778,778,778,778,115,115,115,115,779,779, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,801,801,801,801,801,801,801,801,801,801,801,801, +801,801,801,801,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 189 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -780,780,780,780,780,780,780,780,780,780,780,780,780,780,780,780, -780,780,780,780,780,780,780,780,780,780,780,780,780,780,115,115, -781,781,781,781,781,782,115,115,115,115,115,115,115,115,115,115, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, /* block 190 */ -783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783, -783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783, -783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783, -784,784,784,784,784,784,784,785,785,785,785,785,786,786,786,786, -787,787,787,787,785,786,115,115,115,115,115,115,115,115,115,115, -788,788,788,788,788,788,788,788,788,788,115,789,789,789,789,789, -789,789,115,783,783,783,783,783,783,783,783,783,783,783,783,783, -783,783,783,783,783,783,783,783,115,115,115,115,115,783,783,783, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, +804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 191 */ -783,783,783,783,783,783,783,783,783,783,783,783,783,783,783,783, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, /* block 192 */ -790,790,790,790,790,790,790,790,790,790,790,790,790,790,790,790, -790,790,790,790,790,790,790,790,790,790,790,790,790,790,790,790, -790,790,790,790,790,790,790,790,790,790,790,790,790,790,790,790, -790,790,790,790,790,790,790,790,790,790,790,790,790,790,790,790, -790,790,790,790,790,115,115,115,115,115,115,115,115,115,115,115, -790,791,791,791,791,791,791,791,791,791,791,791,791,791,791,791, -791,791,791,791,791,791,791,791,791,791,791,791,791,791,791,791, -791,791,791,791,791,791,791,791,791,791,791,791,791,791,791,115, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, +805,805,805,805,805,805,805,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 193 */ -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,792, -792,792,792,793,793,793,793,793,793,793,793,793,793,793,793,793, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -794,795,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, /* block 194 */ -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,538,538,538,538,538,538,538, +538,538,538,538,538,538,538,538,538,116,116,116,116,116,116,116, +806,806,806,806,806,806,806,806,806,806,806,806,806,806,806,806, +806,806,806,806,806,806,806,806,806,806,806,806,806,806,806,116, +807,807,807,807,807,807,807,807,807,807,116,116,116,116,808,808, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 195 */ -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +809,809,809,809,809,809,809,809,809,809,809,809,809,809,809,809, +809,809,809,809,809,809,809,809,809,809,809,809,809,809,116,116, +810,810,810,810,810,811,116,116,116,116,116,116,116,116,116,116, /* block 196 */ -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,796,796,796,796,796,796,796,796,796,796,796,796,796, -796,796,796,115,115,115,115,115,115,115,115,115,115,115,115,115, +812,812,812,812,812,812,812,812,812,812,812,812,812,812,812,812, +812,812,812,812,812,812,812,812,812,812,812,812,812,812,812,812, +812,812,812,812,812,812,812,812,812,812,812,812,812,812,812,812, +813,813,813,813,813,813,813,814,814,814,814,814,815,815,815,815, +816,816,816,816,814,815,116,116,116,116,116,116,116,116,116,116, +817,817,817,817,817,817,817,817,817,817,116,818,818,818,818,818, +818,818,116,812,812,812,812,812,812,812,812,812,812,812,812,812, +812,812,812,812,812,812,812,812,116,116,116,116,116,812,812,812, /* block 197 */ -509,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, +812,812,812,812,812,812,812,812,812,812,812,812,812,812,812,812, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 198 */ -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819, +819,819,819,819,819,819,819,819,819,819,819,819,819,819,819,819, +820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, +820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, /* block 199 */ -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,507, -507,507,507,507,507,507,507,507,507,507,507,507,507,507,507,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, +821,821,821,821,821,821,821,821,821,821,821,821,821,821,821,821, +821,821,821,821,821,821,821,822,822,822,822,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 200 */ -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, +823,823,823,823,823,823,823,823,823,823,823,823,823,823,823,823, +823,823,823,823,823,823,823,823,823,823,823,823,823,823,823,823, +823,823,823,823,823,823,823,823,823,823,823,823,823,823,823,823, +823,823,823,823,823,823,823,823,823,823,823,823,823,823,823,823, +823,823,823,823,823,116,116,116,116,116,116,116,116,116,116,116, +823,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824, +824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,824, +824,824,824,824,824,824,824,824,824,824,824,824,824,824,824,116, /* block 201 */ -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,797,797,797,797, -797,797,797,797,797,797,797,797,797,797,797,797,115,115,115,115, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,825, +825,825,825,826,826,826,826,826,826,826,826,826,826,826,826,826, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +827,828,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 202 */ -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,798,798,798,798,798, -798,798,798,798,798,798,798,798,798,798,798,115,115,115,115,115, -798,798,798,798,798,798,798,798,798,798,798,798,798,115,115,115, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, /* block 203 */ -798,798,798,798,798,798,798,798,798,115,115,115,115,115,115,115, -798,798,798,798,798,798,798,798,798,798,115,115,799,800,800,801, - 22, 22, 22, 22,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 204 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,829,829,829,829,829,829,829,829,829,829,829,829,829, +829,829,829,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 205 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19,115,115, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19,802,433,110,110,110, 19, 19, 19,433,802,802, -802,802,802, 22, 22, 22, 22, 22, 22, 22, 22,110,110,110,110,110, +517,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, /* block 206 */ -110,110,110, 19, 19,110,110,110,110,110,110,110, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,110,110,110,110, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, /* block 207 */ -596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, -596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, -596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, -596,596,596,596,596,596,596,596,596,596,596,596,596,596,596,596, -596,596,803,803,803,596,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, +515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, /* block 208 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, /* block 209 */ -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,467,467, -467,467,467,467,467,115,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,830,830,830,830, +830,830,830,830,830,830,830,830,830,830,830,830,116,116,116,116, /* block 210 */ -466,466,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,466,115,466,466, -115,115,466,115,115,466,466,115,115,466,466,466,466,115,466,466, -466,466,466,466,466,466,467,467,467,467,115,467,115,467,467,467, -467,467,467,467,115,467,467,467,467,467,467,467,467,467,467,467, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,831,831,831,831,831, +831,831,831,831,831,831,831,831,831,831,831,116,116,116,116,116, +831,831,831,831,831,831,831,831,831,831,831,831,831,116,116,116, /* block 211 */ -467,467,467,467,466,466,115,466,466,466,466,115,115,466,466,466, -466,466,466,466,466,115,466,466,466,466,466,466,466,115,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,466,466,115,466,466,466,466,115, -466,466,466,466,466,115,466,115,115,115,466,466,466,466,466,466, -466,115,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, +831,831,831,831,831,831,831,831,831,116,116,116,116,116,116,116, +831,831,831,831,831,831,831,831,831,831,116,116,832,833,833,834, + 23, 23, 23, 23,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 212 */ -466,466,466,466,466,466,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19,116,116,116,116,116,116,116,116,116,116, /* block 213 */ -467,467,467,467,467,467,467,467,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19,116,116, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19,835,438,111,111,111, 19, 19, 19,438,835,835, +835,835,835, 23, 23, 23, 23, 23, 23, 23, 23,111,111,111,111,111, /* block 214 */ -466,466,466,466,466,466,466,466,466,466,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,115,115,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466, 8,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467, 8,467,467,467,467, -467,467,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466, 8,467,467,467,467, +111,111,111, 19, 19,111,111,111,111,111,111,111, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,111,111,111,111, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 215 */ -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467, 8,467,467,467,467,467,467,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466, 8,467,467,467,467,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, 8, -467,467,467,467,467,467,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, 8, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, +604,604,604,604,604,604,604,604,604,604,604,604,604,604,604,604, +604,604,604,604,604,604,604,604,604,604,604,604,604,604,604,604, +604,604,604,604,604,604,604,604,604,604,604,604,604,604,604,604, +604,604,604,604,604,604,604,604,604,604,604,604,604,604,604,604, +604,604,836,836,836,604,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 216 */ -467,467,467,467,467,467,467,467,467, 8,467,467,467,467,467,467, -466,466,466,466,466,466,466,466,466,466,466,466,466,466,466,466, -466,466,466,466,466,466,466,466,466, 8,467,467,467,467,467,467, -467,467,467,467,467,467,467,467,467,467,467,467,467,467,467,467, -467,467,467, 8,467,467,467,467,467,467,466,467,115,115, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, - 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24,116,116,116,116,116,116,116,116,116,116,116,116, /* block 217 */ -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, -804,804,804,804,804,804,804,804,804,804,804,804,804,804,804,804, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19,116,116,116,116,116,116,116,116,116, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24,116,116,116,116,116,116,116, /* block 218 */ -805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -805,805,805,805,805,805,805,804,804,804,804,805,805,805,805,805, -805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -805,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -805,805,805,805,805,805,805,805,805,805,805,805,805,804,804,804, -804,804,804,804,804,805,804,804,804,804,804,804,804,804,804,804, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,473,473, +473,473,473,473,473,116,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, /* block 219 */ -804,804,804,804,805,804,804,806,806,806,806,806,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,805,805,805,805,805, -115,805,805,805,805,805,805,805,805,805,805,805,805,805,805,805, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +472,472,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,472,116,472,472, +116,116,472,116,116,472,472,116,116,472,472,472,472,116,472,472, +472,472,472,472,472,472,473,473,473,473,116,473,116,473,473,473, +473,473,473,473,116,473,473,473,473,473,473,473,473,473,473,473, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, /* block 220 */ -807,807,807,807,807,807,807,115,807,807,807,807,807,807,807,807, -807,807,807,807,807,807,807,807,807,115,115,807,807,807,807,807, -807,807,115,807,807,115,807,807,807,807,807,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +473,473,473,473,472,472,116,472,472,472,472,116,116,472,472,472, +472,472,472,472,472,116,472,472,472,472,472,472,472,116,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,472,472,116,472,472,472,472,116, +472,472,472,472,472,116,472,116,116,116,472,472,472,472,472,472, +472,116,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, /* block 221 */ -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, +472,472,472,472,472,472,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, /* block 222 */ -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,808,808,808,808,808,808,808,808,808,808,808, -808,808,808,808,808,115,115,809,809,809,809,809,809,809,809,809, -810,810,810,810,810,810,810,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +473,473,473,473,473,473,473,473,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, /* block 223 */ -811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,811, -811,811,811,811,811,811,811,811,811,811,811,811,811,811,811,811, -811,811,812,812,812,812,812,812,812,812,812,812,812,812,812,812, -812,812,812,812,812,812,812,812,812,812,812,812,812,812,812,812, -812,812,812,812,813,813,813,813,813,813,813,115,115,115,115,115, -814,814,814,814,814,814,814,814,814,814,115,115,115,115,815,815, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +472,472,472,472,472,472,472,472,472,472,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,116,116,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472, 8,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473, 8,473,473,473,473, +473,473,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472, 8,473,473,473,473, /* block 224 */ -216,216,216,216,115,216,216,216,216,216,216,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,216,216,216,216, -115,216,216,115,216,115,115,216,115,216,216,216,216,216,216,216, -216,216,216,115,216,216,216,216,115,216,115,216,115,115,115,115, -115,115,216,115,115,115,115,216,115,216,115,216,115,216,216,216, -115,216,216,115,216,115,115,216,115,216,115,216,115,216,115,216, -115,216,216,115,216,115,115,216,216,216,216,115,216,216,216,216, -216,216,216,115,216,216,216,216,115,216,216,216,216,115,216,115, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473, 8,473,473,473,473,473,473,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472, 8,473,473,473,473,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, 8, +473,473,473,473,473,473,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, 8, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, /* block 225 */ -216,216,216,216,216,216,216,216,216,216,115,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,115,115,115,115, -115,216,216,216,115,216,216,216,216,216,115,216,216,216,216,216, -216,216,216,216,216,216,216,216,216,216,216,216,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -210,210,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +473,473,473,473,473,473,473,473,473, 8,473,473,473,473,473,473, +472,472,472,472,472,472,472,472,472,472,472,472,472,472,472,472, +472,472,472,472,472,472,472,472,472, 8,473,473,473,473,473,473, +473,473,473,473,473,473,473,473,473,473,473,473,473,473,473,473, +473,473,473, 8,473,473,473,473,473,473,472,473,116,116, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, + 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, /* block 226 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, +837,837,837,837,837,837,837,837,837,837,837,837,837,837,837,837, /* block 227 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115, -115, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -115, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -115, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115, +838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +838,838,838,838,838,838,838,837,837,837,837,838,838,838,838,838, +838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +838,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +838,838,838,838,838,838,838,838,838,838,838,838,838,837,837,837, +837,837,837,837,837,838,837,837,837,837,837,837,837,837,837,837, /* block 228 */ - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +837,837,837,837,838,837,837,839,839,839,839,839,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,838,838,838,838,838, +116,838,838,838,838,838,838,838,838,838,838,838,838,838,838,838, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 229 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,816,816,816,816,816,816,816,816,816,816, -816,816,816,816,816,816,816,816,816,816,816,816,816,816,816,816, +840,840,840,840,840,840,840,116,840,840,840,840,840,840,840,840, +840,840,840,840,840,840,840,840,840,116,116,840,840,840,840,840, +840,840,116,840,840,116,840,840,840,840,840,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 230 */ -817, 19, 19,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115, - 19, 19,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, /* block 231 */ - 19, 19, 19, 19, 19, 19, 19, 19,479, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,479, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19,479, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,841,841,841,841,841,841,841,841,841,841,841, +841,841,841,841,841,116,116,842,842,842,842,842,842,842,842,842, +843,843,843,843,843,843,843,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 232 */ - 19, 19, 19, 19, 19,478, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19,479, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,479, 19, 19, 19,479, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19,478,478,478, 19, 19,478, 19, 19,478,478,478, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,479, 19,479, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,818,818,818,818,818, +844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,844, +844,844,844,844,844,844,844,844,844,844,844,844,844,844,844,844, +844,844,845,845,845,845,845,845,845,845,845,845,845,845,845,845, +845,845,845,845,845,845,845,845,845,845,845,845,845,845,845,845, +845,845,845,845,846,846,846,846,846,846,846,116,116,116,116,116, +847,847,847,847,847,847,847,847,847,847,116,116,116,116,848,848, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 233 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19,478,478, 19, 19,478,478,478,478,478,478,478,478,478,478, -478, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19,819,819,819,819, 19, 19, 19, 19,478, 19, -478,478,478,478,478,478,478,478,478, 19, 19, 19,478, 19, 19, 19, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, /* block 234 */ - 19,478,478,478, 19,478,478,478, 19, 19, 19,479, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,478, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,479,479, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 19, 24, 24, 24, + 5, 24, 24, 24, 24,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 235 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19,479, 19, 19, 19, 19,479, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,478,478, 19, 19, 19, 19,478, 19, 19, 19, 19, 19, +217,217,217,217,116,217,217,217,217,217,217,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,217,217,217,217, +116,217,217,116,217,116,116,217,116,217,217,217,217,217,217,217, +217,217,217,116,217,217,217,217,116,217,116,217,116,116,116,116, +116,116,217,116,116,116,116,217,116,217,116,217,116,217,217,217, +116,217,217,116,217,116,116,217,116,217,116,217,116,217,116,217, +116,217,217,116,217,116,116,217,217,217,217,116,217,217,217,217, +217,217,217,116,217,217,217,217,116,217,217,217,217,116,217,116, /* block 236 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, -478, 19, 19, 19, 19,478,478, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19,479, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +217,217,217,217,217,217,217,217,217,217,116,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,116,116,116,116, +116,217,217,217,116,217,217,217,217,217,116,217,217,217,217,217, +217,217,217,217,217,217,217,217,217,217,217,217,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +211,211,116,116,116,116,116,116,116,116,116,116,116,116,116,116, /* block 237 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19,478,478,478, 19, 19, 19,478,478,478,478,478, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 238 */ -479, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19,479, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19,478, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,478,478,478, 19, 19, 19, 19, 19, 19, 19, 19, 19, -478, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,478, 19, 19, 19, - 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20,849,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849, +849, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +849, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, +849, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20,849,849,849,849,849,849,849,849,849,849, /* block 239 */ + 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,849,849,849, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115,115, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849, + 20, 20, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, /* block 240 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, + 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,850,850,850,850,850,850,850,850,850,850, +850,850,850,850,850,850,850,850,850,850,850,850,850,850,850,850, /* block 241 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, +851, 20, 20,849,849,849,849,849,849,849,849,849,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, + 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849,849,849,849, + 20, 20,849,849,849,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, /* block 242 */ - 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, /* block 243 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19,478,478,478,478,478, 19,478,478, - 19, 19, 19, 19, 19, 19,478, 19, 19, 19, 19, 19, 19, 19, 19, 19, -478,478,478,478,478,478,478,478,478,478, 19, 19, 19,478,478,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 244 */ - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, - 19,478,478,478,478,478,478,478,478,478,478,478,478,478, 19, 19, - 19, 19, 19, 19, 19, 19, 19,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,852,852,852,852,852, /* block 245 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 19, + 19, 19, 19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 246 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,115,115,115,115,115,115,115,115,115,115,115, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, /* block 247 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,115,115, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849,849,849,849,849,849, /* block 248 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19,849,849,849,849,849,849,849,849,849,849,849,849, /* block 249 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 20, 20, 20, 20,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, /* block 250 */ -515,515,515,515,515,515,515,515,515,515,515,515,515,515,515,515, -515,515,515,515,515,515,515,515,515,515,515,515,515,515,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, -115,115,115,115,115,115,115,115,115,115,115,115,115,115,115,115, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, /* block 251 */ -465, 22,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, -820,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, + 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849,849,849,849,849, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, /* block 252 */ -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 19, 20, 20, 20,849, + 20, 20, 20, 20, 20, 20, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20,849,849, 20, 20, 20, 20,849,849,849, 20,849, 20, 20, 20, 20, /* block 253 */ -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20,849,849,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849,849,849,849,849,849, + 20, 20, 20,849,849,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, /* block 254 */ -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -110,110,110,110,110,110,110,110,110,110,110,110,110,110,110,110, -465,465,465,465,465,465,465,465,465,465,465,465,465,465,465,465, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, + 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, /* block 255 */ -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,589,589, -589,589,589,589,589,589,589,589,589,589,589,589,589,589,115,115, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,849,849, +849,849,849,849,849,849,849,849,849,849,849,849,849,849,116,116, + +/* block 256 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + +/* block 257 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,116,116,116,116,116,116,116,116,116,116,116, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, + +/* block 258 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,116,116, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, + +/* block 259 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, + +/* block 260 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + +/* block 261 */ +523,523,523,523,523,523,523,523,523,523,523,523,523,523,523,523, +523,523,523,523,523,523,523,523,523,523,523,523,523,523,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, +116,116,116,116,116,116,116,116,116,116,116,116,116,116,116,116, + +/* block 262 */ +471, 23,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, +853,853,853,853,853,853,853,853,853,853,853,853,853,853,853,853, + +/* block 263 */ +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, + +/* block 264 */ +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, + +/* block 265 */ +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +111,111,111,111,111,111,111,111,111,111,111,111,111,111,111,111, +471,471,471,471,471,471,471,471,471,471,471,471,471,471,471,471, + +/* block 266 */ +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,597,597, +597,597,597,597,597,597,597,597,597,597,597,597,597,597,116,116, }; diff --git a/thirdparty/pcre2/src/pcre2_ucp.h b/thirdparty/pcre2/src/pcre2_ucp.h index defba4c10e..0c330edcb2 100644 --- a/thirdparty/pcre2/src/pcre2_ucp.h +++ b/thirdparty/pcre2/src/pcre2_ucp.h @@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language. Written by Philip Hazel Original API code Copyright (c) 1997-2012 University of Cambridge - New API code Copyright (c) 2016 University of Cambridge + New API code Copyright (c) 2016-2018 University of Cambridge ----------------------------------------------------------------------------- Redistribution and use in source and binary forms, with or without @@ -100,27 +100,25 @@ enum { ucp_Zs /* Space separator */ }; -/* These are grapheme break properties. */ +/* These are grapheme break properties. The Extended Pictographic property +comes from the emoji-data.txt file. */ enum { - ucp_gbCR, /* 0 */ - ucp_gbLF, /* 1 */ - ucp_gbControl, /* 2 */ - ucp_gbExtend, /* 3 */ - ucp_gbPrepend, /* 4 */ - ucp_gbSpacingMark, /* 5 */ - ucp_gbL, /* 6 Hangul syllable type L */ - ucp_gbV, /* 7 Hangul syllable type V */ - ucp_gbT, /* 8 Hangul syllable type T */ - ucp_gbLV, /* 9 Hangul syllable type LV */ - ucp_gbLVT, /* 10 Hangul syllable type LVT */ - ucp_gbRegionalIndicator, /* 11 */ - ucp_gbOther, /* 12 */ - ucp_gbE_Base, /* 13 */ - ucp_gbE_Modifier, /* 14 */ - ucp_gbE_Base_GAZ, /* 15 */ - ucp_gbZWJ, /* 16 */ - ucp_gbGlue_After_Zwj /* 17 */ + ucp_gbCR, /* 0 */ + ucp_gbLF, /* 1 */ + ucp_gbControl, /* 2 */ + ucp_gbExtend, /* 3 */ + ucp_gbPrepend, /* 4 */ + ucp_gbSpacingMark, /* 5 */ + ucp_gbL, /* 6 Hangul syllable type L */ + ucp_gbV, /* 7 Hangul syllable type V */ + ucp_gbT, /* 8 Hangul syllable type T */ + ucp_gbLV, /* 9 Hangul syllable type LV */ + ucp_gbLVT, /* 10 Hangul syllable type LVT */ + ucp_gbRegionalIndicator, /* 11 */ + ucp_gbOther, /* 12 */ + ucp_gbZWJ, /* 13 */ + ucp_gbExtended_Pictographic /* 14 */ }; /* These are the script identifications. */ @@ -274,7 +272,15 @@ enum { ucp_Masaram_Gondi, ucp_Nushu, ucp_Soyombo, - ucp_Zanabazar_Square + ucp_Zanabazar_Square, + /* New for Unicode 11.0.0 */ + ucp_Dogra, + ucp_Gunjala_Gondi, + ucp_Hanifi_Rohingya, + ucp_Makasar, + ucp_Medefaidrin, + ucp_Old_Sogdian, + ucp_Sogdian }; #endif /* PCRE2_UCP_H_IDEMPOTENT_GUARD */ diff --git a/thirdparty/pcre2/src/sljit/sljitConfigInternal.h b/thirdparty/pcre2/src/sljit/sljitConfigInternal.h index e13282c842..f5703e8e7f 100644 --- a/thirdparty/pcre2/src/sljit/sljitConfigInternal.h +++ b/thirdparty/pcre2/src/sljit/sljitConfigInternal.h @@ -66,7 +66,7 @@ SLJIT_RETURN_ADDRESS_OFFSET : a return instruction always adds this offset to the return address Other macros: - SLJIT_FUNC : calling convention attribute for both calling JIT form C and C calling back from JIT + SLJIT_FUNC : calling convention attribute for both calling JIT from C and C calling back from JIT SLJIT_W(number) : defining 64 bit constants on 64 bit architectures (compiler independent helper) */ @@ -147,17 +147,23 @@ #define SLJIT_CONFIG_UNSUPPORTED 1 #endif -#else /* !_WIN32 */ +#else /* _WIN32 */ #if defined(_M_X64) || defined(__x86_64__) #define SLJIT_CONFIG_X86_64 1 +#elif (defined(_M_ARM) && _M_ARM >= 7 && defined(_M_ARMT)) || defined(__thumb2__) +#define SLJIT_CONFIG_ARM_THUMB2 1 +#elif (defined(_M_ARM) && _M_ARM >= 7) +#define SLJIT_CONFIG_ARM_V7 1 #elif defined(_ARM_) #define SLJIT_CONFIG_ARM_V5 1 +#elif defined(_M_ARM64) || defined(__aarch64__) +#define SLJIT_CONFIG_ARM_64 1 #else #define SLJIT_CONFIG_X86_32 1 #endif -#endif /* !WIN32 */ +#endif /* !_WIN32 */ #endif /* SLJIT_CONFIG_AUTO */ #if (defined SLJIT_CONFIG_UNSUPPORTED && SLJIT_CONFIG_UNSUPPORTED) @@ -324,6 +330,11 @@ sparc_cache_flush((from), (to)) #define SLJIT_CACHE_FLUSH_OWN_IMPL 1 +#elif defined _WIN32 + +#define SLJIT_CACHE_FLUSH(from, to) \ + FlushInstructionCache(GetCurrentProcess(), (char*)(from), (char*)(to) - (char*)(from)) + #else /* Calls __ARM_NR_cacheflush on ARM-Linux. */ @@ -371,12 +382,18 @@ typedef int sljit_sw; #define SLJIT_64BIT_ARCHITECTURE 1 #define SLJIT_WORD_SHIFT 3 #ifdef _WIN32 +#ifdef __GNUC__ +/* These types do not require windows.h */ +typedef unsigned long long sljit_uw; +typedef long long sljit_sw; +#else typedef unsigned __int64 sljit_uw; typedef __int64 sljit_sw; -#else +#endif +#else /* !_WIN32 */ typedef unsigned long int sljit_uw; typedef long int sljit_sw; -#endif +#endif /* _WIN32 */ #endif typedef sljit_uw sljit_p; @@ -590,7 +607,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_sw sljit_exec_offset(void* ptr); #define SLJIT_NUMBER_OF_REGISTERS 26 #define SLJIT_NUMBER_OF_SAVED_REGISTERS 10 -#define SLJIT_LOCALS_OFFSET_BASE (2 * sizeof(sljit_sw)) +#define SLJIT_LOCALS_OFFSET_BASE 0 #elif (defined SLJIT_CONFIG_PPC && SLJIT_CONFIG_PPC) diff --git a/thirdparty/pcre2/src/sljit/sljitExecAllocator.c b/thirdparty/pcre2/src/sljit/sljitExecAllocator.c index f5009788f6..7c18578618 100644 --- a/thirdparty/pcre2/src/sljit/sljitExecAllocator.c +++ b/thirdparty/pcre2/src/sljit/sljitExecAllocator.c @@ -99,7 +99,14 @@ static SLJIT_INLINE void* alloc_chunk(sljit_uw size) void *retval; #ifdef MAP_ANON - retval = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0); + + int flags = MAP_PRIVATE | MAP_ANON; + +#ifdef MAP_JIT + flags |= MAP_JIT; +#endif + + retval = mmap(NULL, size, PROT_READ | PROT_WRITE | PROT_EXEC, flags, -1, 0); #else if (dev_zero < 0) { if (open_dev_zero()) diff --git a/thirdparty/pcre2/src/sljit/sljitLir.c b/thirdparty/pcre2/src/sljit/sljitLir.c index 5e435f0154..5bdddc10cf 100644 --- a/thirdparty/pcre2/src/sljit/sljitLir.c +++ b/thirdparty/pcre2/src/sljit/sljitLir.c @@ -26,6 +26,13 @@ #include "sljitLir.h" +#ifdef _WIN32 + +/* For SLJIT_CACHE_FLUSH, which can expand to FlushInstructionCache. */ +#include <windows.h> + +#endif /* _WIN32 */ + #if !(defined SLJIT_STD_MACROS_DEFINED && SLJIT_STD_MACROS_DEFINED) /* These libraries are needed for the macros below. */ @@ -2178,7 +2185,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem(struct sljit_compiler *compil #endif -#if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) +#if !(defined SLJIT_CONFIG_X86 && SLJIT_CONFIG_X86) \ + && !(defined SLJIT_CONFIG_ARM_64 && SLJIT_CONFIG_ARM_64) SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_local_base(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw offset) { diff --git a/thirdparty/pcre2/src/sljit/sljitLir.h b/thirdparty/pcre2/src/sljit/sljitLir.h index 920f6d4f78..e71890cf7b 100644 --- a/thirdparty/pcre2/src/sljit/sljitLir.h +++ b/thirdparty/pcre2/src/sljit/sljitLir.h @@ -138,7 +138,7 @@ of sljitConfigInternal.h */ be specified as scratch registers and the fifth one as saved register on the CPU above and any user code which requires four scratch registers can run unmodified. The SLJIT compiler automatically saves - the content of the two extra scrath register on the stack. Scratch + the content of the two extra scratch register on the stack. Scratch registers can also be preserved by saving their value on the stack but this needs to be done manually. @@ -746,7 +746,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fast_return(struct sljit_compiler be mixed. The only exception is SLJIT_MOV32 and SLJIT_MOVU32 whose source register can hold any 32 or 64 bit value, and it is converted to a 32 bit compatible format first. This conversion is free (no instructions are - emitted) on most CPUs. A 32 bit value can also be coverted to a 64 bit + emitted) on most CPUs. A 32 bit value can also be converted to a 64 bit value by SLJIT_MOV_S32 (sign extension) or SLJIT_MOV_U32 (zero extension). Note: memory addressing always uses 64 bit values on 64 bit systems so @@ -773,8 +773,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fast_return(struct sljit_compiler */ #define SLJIT_F32_OP SLJIT_I32_OP -/* Many CPUs (x86, ARM, PPC) has status flags which can be set according - to the result of an operation. Other CPUs (MIPS) does not have status +/* Many CPUs (x86, ARM, PPC) have status flags which can be set according + to the result of an operation. Other CPUs (MIPS) do not have status flags, and results must be stored in registers. To cover both architecture types efficiently only two flags are defined by SLJIT: @@ -810,14 +810,14 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fast_return(struct sljit_compiler Using these flags can reduce the number of emitted instructions. E.g. a fast loop can be implemented by decreasing a counter register and set the - zero flag to jump back if the counter register is not reached zero. + zero flag to jump back if the counter register has not reached zero. Motivation: although CPUs can set a large number of flags, usually their values are ignored or only one of them is used. Emulating a large number of flags on systems without flag register is complicated so SLJIT instructions must specify the flag they want to use and only that flag will be emulated. The last arithmetic instruction can be repeated if - multiple flags needs to be checked. + multiple flags need to be checked. */ /* Set Zero status flag. */ @@ -884,7 +884,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile /* Starting index of opcodes for sljit_emit_op1. */ #define SLJIT_OP1_BASE 32 -/* The MOV instruction transfer data from source to destination. +/* The MOV instruction transfers data from source to destination. MOV instruction suffixes: @@ -1156,7 +1156,7 @@ SLJIT_API_FUNC_ATTRIBUTE struct sljit_label* sljit_emit_label(struct sljit_compi #define SLJIT_FAST_CALL 25 /* Called function must be declared with the SLJIT_FUNC attribute. */ #define SLJIT_CALL 26 - /* Called function must be decalred with cdecl attribute. + /* Called function must be declared with cdecl attribute. This is the default attribute for C functions. */ #define SLJIT_CALL_CDECL 27 @@ -1210,7 +1210,7 @@ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_label(struct sljit_jump *jump, struct sl /* Set the destination address of the jump to this label. */ SLJIT_API_FUNC_ATTRIBUTE void sljit_set_target(struct sljit_jump *jump, sljit_uw target); -/* Emit an indirect jump or fast call. Both direct and indirect form +/* Emit an indirect jump or fast call. Direct form: set src to SLJIT_IMM() and srcw to the address Indirect form: any other valid addressing mode type must be between SLJIT_JUMP and SLJIT_FAST_CALL @@ -1274,7 +1274,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_cmov(struct sljit_compiler *compil #define SLJIT_MEM_POST 0x1000 /* Emit a single memory load or store with update instruction. When the - requested instruction from is not supported by the CPU, it returns + requested instruction form is not supported by the CPU, it returns with SLJIT_ERR_UNSUPPORTED instead of emulating the instruction. This allows specializing tight loops based on the supported instruction forms (see SLJIT_MEM_SUPP flag). diff --git a/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c b/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c index 8a437bd6a0..27af741487 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeARM_64.c @@ -37,14 +37,14 @@ typedef sljit_u32 sljit_ins; #define TMP_REG1 (SLJIT_NUMBER_OF_REGISTERS + 2) #define TMP_REG2 (SLJIT_NUMBER_OF_REGISTERS + 3) #define TMP_LR (SLJIT_NUMBER_OF_REGISTERS + 4) -#define TMP_SP (SLJIT_NUMBER_OF_REGISTERS + 5) +#define TMP_FP (SLJIT_NUMBER_OF_REGISTERS + 5) #define TMP_FREG1 (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1) #define TMP_FREG2 (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) /* r18 - platform register, currently not used */ static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 8] = { - 31, 0, 1, 2, 3, 4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17, 8, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 29, 9, 10, 30, 31 + 31, 0, 1, 2, 3, 4, 5, 6, 7, 11, 12, 13, 14, 15, 16, 17, 8, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 31, 9, 10, 30, 29 }; static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { @@ -68,6 +68,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define ADC 0x9a000000 #define ADD 0x8b000000 +#define ADDE 0x8b200000 #define ADDI 0x91000000 #define AND 0x8a000000 #define ANDI 0x92000000 @@ -96,7 +97,8 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define FSUB 0x1e603800 #define LDRI 0xf9400000 #define LDP 0xa9400000 -#define LDP_PST 0xa8c00000 +#define LDP_PRE 0xa9c00000 +#define LDR_PRE 0xf8400c00 #define LSLV 0x9ac02000 #define LSRV 0x9ac02400 #define MADD 0x9b000000 @@ -873,73 +875,51 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size)); set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size); - saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 0); - local_size += saved_regs_size + SLJIT_LOCALS_OFFSET; + saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 2); + if (saved_regs_size & 0x8) + saved_regs_size += sizeof(sljit_sw); + local_size = (local_size + 15) & ~0xf; - compiler->local_size = local_size; - - if (local_size <= (63 * sizeof(sljit_sw))) { - FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR) - | RN(TMP_SP) | ((-(local_size >> 3) & 0x7f) << 15))); - FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10))); - offs = (local_size - saved_regs_size) << (15 - 3); - } else { - offs = 0 << 15; - if (saved_regs_size & 0x8) { - offs = 1 << 15; - saved_regs_size += sizeof(sljit_sw); - } - local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; - if (saved_regs_size > 0) - FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); - } + compiler->local_size = local_size + saved_regs_size; + + FAIL_IF(push_inst(compiler, STP_PRE | RT(TMP_FP) | RT2(TMP_LR) + | RN(SLJIT_SP) | ((-(saved_regs_size >> 3) & 0x7f) << 15))); + +#ifdef _WIN32 + if (local_size >= 4096) + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(SLJIT_SP) | (1 << 10) | (1 << 22))); + else if (local_size > 256) + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(SLJIT_SP) | (local_size << 10))); +#endif tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; prev = -1; + offs = 2 << 15; for (i = SLJIT_S0; i >= tmp; i--) { if (prev == -1) { - if (!(offs & (1 << 15))) { - prev = i; - continue; - } - FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); - offs += 1 << 15; + prev = i; continue; } - FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); + FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(SLJIT_SP) | offs)); offs += 2 << 15; prev = -1; } for (i = scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { if (prev == -1) { - if (!(offs & (1 << 15))) { - prev = i; - continue; - } - FAIL_IF(push_inst(compiler, STRI | RT(i) | RN(TMP_SP) | (offs >> 5))); - offs += 1 << 15; + prev = i; continue; } - FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); + FAIL_IF(push_inst(compiler, STP | RT(prev) | RT2(i) | RN(SLJIT_SP) | offs)); offs += 2 << 15; prev = -1; } - SLJIT_ASSERT(prev == -1); + if (prev != -1) + FAIL_IF(push_inst(compiler, STRI | RT(prev) | RN(SLJIT_SP) | (offs >> 5))); - if (compiler->local_size > (63 * sizeof(sljit_sw))) { - /* The local_size is already adjusted by the saved registers. */ - if (local_size > 0xfff) { - FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22))); - local_size &= 0xfff; - } - if (local_size) - FAIL_IF(push_inst(compiler, SUBI | RD(TMP_SP) | RN(TMP_SP) | (local_size << 10))); - FAIL_IF(push_inst(compiler, STP_PRE | 29 | RT2(TMP_LR) - | RN(TMP_SP) | ((-(16 >> 3) & 0x7f) << 15))); - FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_SP) | (0 << 10))); - } + + FAIL_IF(push_inst(compiler, ADDI | RD(TMP_FP) | RN(SLJIT_SP) | (0 << 10))); args = get_arg_count(arg_types); @@ -950,6 +930,64 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi if (args >= 3) FAIL_IF(push_inst(compiler, ORR | RD(SLJIT_S2) | RN(TMP_ZERO) | RM(SLJIT_R2))); +#ifdef _WIN32 + if (local_size >= 4096) { + if (local_size < 4 * 4096) { + /* No need for a loop. */ + if (local_size >= 2 * 4096) { + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(TMP_REG1) | (1 << 10) | (1 << 22))); + local_size -= 4096; + } + + if (local_size >= 2 * 4096) { + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(TMP_REG1) | (1 << 10) | (1 << 22))); + local_size -= 4096; + } + + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + local_size -= 4096; + } + else { + FAIL_IF(push_inst(compiler, MOVZ | RD(TMP_REG2) | (((local_size >> 12) - 1) << 5))); + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(TMP_REG1) | (1 << 10) | (1 << 22))); + FAIL_IF(push_inst(compiler, SUBI | (1 << 29) | RD(TMP_REG2) | RN(TMP_REG2) | (1 << 10))); + FAIL_IF(push_inst(compiler, B_CC | ((((sljit_ins) -3) & 0x7ffff) << 5) | 0x1 /* not-equal */)); + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + + local_size &= 0xfff; + } + + if (local_size > 256) { + FAIL_IF(push_inst(compiler, SUBI | RD(TMP_REG1) | RN(TMP_REG1) | (local_size << 10))); + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + } + else if (local_size > 0) + FAIL_IF(push_inst(compiler, LDR_PRE | RT(TMP_ZERO) | RN(TMP_REG1) | ((-local_size & 0x1ff) << 12))); + + FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_REG1) | (0 << 10))); + } + else if (local_size > 256) { + FAIL_IF(push_inst(compiler, LDRI | RT(TMP_ZERO) | RN(TMP_REG1))); + FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(TMP_REG1) | (0 << 10))); + } + else if (local_size > 0) + FAIL_IF(push_inst(compiler, LDR_PRE | RT(TMP_ZERO) | RN(SLJIT_SP) | ((-local_size & 0x1ff) << 12))); + +#else /* !_WIN32 */ + + /* The local_size does not include saved registers size. */ + if (local_size > 0xfff) { + FAIL_IF(push_inst(compiler, SUBI | RD(SLJIT_SP) | RN(SLJIT_SP) | ((local_size >> 12) << 10) | (1 << 22))); + local_size &= 0xfff; + } + if (local_size != 0) + FAIL_IF(push_inst(compiler, SUBI | RD(SLJIT_SP) | RN(SLJIT_SP) | (local_size << 10))); + +#endif /* _WIN32 */ + return SLJIT_SUCCESS; } @@ -957,13 +995,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_set_context(struct sljit_compiler *comp sljit_s32 options, sljit_s32 arg_types, sljit_s32 scratches, sljit_s32 saveds, sljit_s32 fscratches, sljit_s32 fsaveds, sljit_s32 local_size) { + sljit_s32 saved_regs_size; + CHECK_ERROR(); CHECK(check_sljit_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size)); set_set_context(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size); - local_size += GET_SAVED_REGISTERS_SIZE(scratches, saveds, 0) + SLJIT_LOCALS_OFFSET; - local_size = (local_size + 15) & ~0xf; - compiler->local_size = local_size; + saved_regs_size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 2); + if (saved_regs_size & 0x8) + saved_regs_size += sizeof(sljit_sw); + + compiler->local_size = saved_regs_size + ((local_size + 15) & ~0xf); return SLJIT_SUCCESS; } @@ -977,71 +1019,59 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return(struct sljit_compiler *comp FAIL_IF(emit_mov_before_return(compiler, op, src, srcw)); - local_size = compiler->local_size; + saved_regs_size = GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 2); + if (saved_regs_size & 0x8) + saved_regs_size += sizeof(sljit_sw); - saved_regs_size = GET_SAVED_REGISTERS_SIZE(compiler->scratches, compiler->saveds, 0); - if (local_size <= (63 * sizeof(sljit_sw))) - offs = (local_size - saved_regs_size) << (15 - 3); + local_size = compiler->local_size - saved_regs_size; + + /* Load LR as early as possible. */ + if (local_size == 0) + FAIL_IF(push_inst(compiler, LDP | RT(TMP_FP) | RT2(TMP_LR) | RN(SLJIT_SP))); + else if (local_size < 63 * sizeof(sljit_sw)) { + FAIL_IF(push_inst(compiler, LDP_PRE | RT(TMP_FP) | RT2(TMP_LR) + | RN(SLJIT_SP) | (local_size << (15 - 3)))); + } else { - FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) - | RN(TMP_SP) | (((16 >> 3) & 0x7f) << 15))); - offs = 0 << 15; - if (saved_regs_size & 0x8) { - offs = 1 << 15; - saved_regs_size += sizeof(sljit_sw); - } - local_size -= saved_regs_size + SLJIT_LOCALS_OFFSET; if (local_size > 0xfff) { - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | ((local_size >> 12) << 10) | (1 << 22))); + FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(SLJIT_SP) | ((local_size >> 12) << 10) | (1 << 22))); local_size &= 0xfff; } if (local_size) - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (local_size << 10))); + FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(SLJIT_SP) | (local_size << 10))); + + FAIL_IF(push_inst(compiler, LDP | RT(TMP_FP) | RT2(TMP_LR) | RN(SLJIT_SP))); } tmp = compiler->saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - compiler->saveds) : SLJIT_FIRST_SAVED_REG; prev = -1; + offs = 2 << 15; for (i = SLJIT_S0; i >= tmp; i--) { if (prev == -1) { - if (!(offs & (1 << 15))) { - prev = i; - continue; - } - FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); - offs += 1 << 15; + prev = i; continue; } - FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); + FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(SLJIT_SP) | offs)); offs += 2 << 15; prev = -1; } for (i = compiler->scratches; i >= SLJIT_FIRST_SAVED_REG; i--) { if (prev == -1) { - if (!(offs & (1 << 15))) { - prev = i; - continue; - } - FAIL_IF(push_inst(compiler, LDRI | RT(i) | RN(TMP_SP) | (offs >> 5))); - offs += 1 << 15; + prev = i; continue; } - FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(TMP_SP) | offs)); + FAIL_IF(push_inst(compiler, LDP | RT(prev) | RT2(i) | RN(SLJIT_SP) | offs)); offs += 2 << 15; prev = -1; } - SLJIT_ASSERT(prev == -1); + if (prev != -1) + FAIL_IF(push_inst(compiler, LDRI | RT(prev) | RN(SLJIT_SP) | (offs >> 5))); - if (compiler->local_size <= (63 * sizeof(sljit_sw))) { - FAIL_IF(push_inst(compiler, LDP_PST | 29 | RT2(TMP_LR) - | RN(TMP_SP) | (((local_size >> 3) & 0x7f) << 15))); - } else if (saved_regs_size > 0) { - FAIL_IF(push_inst(compiler, ADDI | RD(TMP_SP) | RN(TMP_SP) | (saved_regs_size << 10))); - } - - FAIL_IF(push_inst(compiler, RET | RN(TMP_LR))); - return SLJIT_SUCCESS; + /* These two can be executed in parallel. */ + FAIL_IF(push_inst(compiler, ADDI | RD(SLJIT_SP) | RN(SLJIT_SP) | (saved_regs_size << 10))); + return push_inst(compiler, RET | RN(TMP_LR)); } /* --------------------------------------------------------------------- */ @@ -1856,6 +1886,46 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_fmem(struct sljit_compiler *compil return push_inst(compiler, inst | VT(freg) | RN(mem & REG_MASK) | ((memw & 0x1ff) << 12)); } +SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_get_local_base(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw offset) +{ + sljit_s32 dst_reg; + sljit_ins ins; + + CHECK_ERROR(); + CHECK(check_sljit_get_local_base(compiler, dst, dstw, offset)); + + SLJIT_ASSERT (SLJIT_LOCALS_OFFSET_BASE == 0); + + dst_reg = FAST_IS_REG(dst) ? dst : TMP_REG1; + + if (offset <= 0xffffff && offset >= -0xffffff) { + ins = ADDI; + if (offset < 0) { + offset = -offset; + ins = SUBI; + } + + if (offset <= 0xfff) + FAIL_IF(push_inst(compiler, ins | RD(dst_reg) | RN(SLJIT_SP) | (offset << 10))); + else { + FAIL_IF(push_inst(compiler, ins | RD(dst_reg) | RN(SLJIT_SP) | ((offset & 0xfff000) >> (12 - 10)) | (1 << 22))); + + offset &= 0xfff; + if (offset != 0) + FAIL_IF(push_inst(compiler, ins | RD(dst_reg) | RN(dst_reg) | (offset << 10))); + } + } + else { + FAIL_IF(load_immediate (compiler, dst_reg, offset)); + /* Add extended register form. */ + FAIL_IF(push_inst(compiler, ADDE | (0x3 << 13) | RD(dst_reg) | RN(SLJIT_SP) | RM(dst_reg))); + } + + if (SLJIT_UNLIKELY(dst & SLJIT_MEM)) + return emit_op_mem(compiler, WORD_SIZE | STORE, dst_reg, dst, dstw, TMP_REG1); + return SLJIT_SUCCESS; +} + SLJIT_API_FUNC_ATTRIBUTE struct sljit_const* sljit_emit_const(struct sljit_compiler *compiler, sljit_s32 dst, sljit_sw dstw, sljit_sw init_value) { struct sljit_const *const_; diff --git a/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c b/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c index 75e7a38b5f..d7024b6d7d 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeARM_T2_32.c @@ -110,6 +110,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define ASRSI 0x1000 #define ASR_W 0xfa40f000 #define ASR_WI 0xea4f0020 +#define BCC 0xd000 #define BICI 0xf0200000 #define BKPT 0xbe00 #define BLX 0x4780 @@ -125,6 +126,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define EORS 0x4040 #define EOR_W 0xea800000 #define IT 0xbf00 +#define LDRI 0xf8500800 #define LSLS 0x4080 #define LSLSI 0x0000 #define LSL_W 0xfa00f000 @@ -158,6 +160,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define SBCI 0xf1600000 #define SBCS 0x4180 #define SBC_W 0xeb600000 +#define SDIV 0xfb90f0f0 #define SMULL 0xfb800000 #define STR_SP 0x9000 #define SUBS 0x1a00 @@ -172,6 +175,7 @@ static const sljit_u8 freg_map[SLJIT_NUMBER_OF_FLOAT_REGISTERS + 3] = { #define SXTH 0xb200 #define SXTH_W 0xfa0ff080 #define TST 0x4200 +#define UDIV 0xfbb0f0f0 #define UMULL 0xfba00000 #define UXTB 0xb2c0 #define UXTB_W 0xfa5ff080 @@ -339,8 +343,8 @@ static SLJIT_INLINE void set_jump_instruction(struct sljit_jump *jump, sljit_sw /* Really complex instruction form for branches. */ s = (diff >> 23) & 0x1; - j1 = (~(diff >> 21) ^ s) & 0x1; - j2 = (~(diff >> 22) ^ s) & 0x1; + j1 = (~(diff >> 22) ^ s) & 0x1; + j2 = (~(diff >> 21) ^ s) & 0x1; jump_inst[0] = 0xf000 | (s << 10) | COPY_BITS(diff, 11, 0, 10); jump_inst[1] = (j1 << 13) | (j2 << 11) | (diff & 0x7ff); @@ -520,6 +524,8 @@ static sljit_s32 load_immediate(struct sljit_compiler *compiler, sljit_s32 dst, { sljit_uw tmp; + /* MOVS cannot be used since it destroy flags. */ + if (imm >= 0x10000) { tmp = get_imm(imm); if (tmp != INVALID_IMM) @@ -1032,6 +1038,9 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi { sljit_s32 args, size, i, tmp; sljit_ins push = 0; +#ifdef _WIN32 + sljit_uw imm; +#endif CHECK_ERROR(); CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size)); @@ -1052,12 +1061,25 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi size = GET_SAVED_REGISTERS_SIZE(scratches, saveds, 1); local_size = ((size + local_size + 7) & ~7) - size; compiler->local_size = local_size; + +#ifdef _WIN32 + if (local_size >= 256) { + if (local_size > 4096) + imm = get_imm(4096); + else + imm = get_imm(local_size & ~0xff); + + SLJIT_ASSERT(imm != INVALID_IMM); + FAIL_IF(push_inst32(compiler, SUB_WI | RD4(TMP_REG1) | RN4(SLJIT_SP) | imm)); + } +#else if (local_size > 0) { if (local_size <= (127 << 2)) FAIL_IF(push_inst16(compiler, SUB_SP | (local_size >> 2))); else FAIL_IF(emit_op_imm(compiler, SLJIT_SUB | ARG2_IMM, SLJIT_SP, SLJIT_SP, local_size)); } +#endif args = get_arg_count(arg_types); @@ -1068,6 +1090,61 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi if (args >= 3) FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(SLJIT_S2, SLJIT_R2))); +#ifdef _WIN32 + if (local_size >= 256) { + if (local_size > 4096) { + imm = get_imm(4096); + SLJIT_ASSERT(imm != INVALID_IMM); + + if (local_size < 4 * 4096) { + if (local_size > 2 * 4096) { + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | RT4(TMP_REG2) | RN4(TMP_REG1))); + FAIL_IF(push_inst32(compiler, SUB_WI | RD4(TMP_REG1) | RN4(TMP_REG1) | imm)); + local_size -= 4096; + } + + if (local_size > 2 * 4096) { + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | RT4(TMP_REG2) | RN4(TMP_REG1))); + FAIL_IF(push_inst32(compiler, SUB_WI | RD4(TMP_REG1) | RN4(TMP_REG1) | imm)); + local_size -= 4096; + } + + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | RT4(TMP_REG2) | RN4(TMP_REG1))); + local_size -= 4096; + + SLJIT_ASSERT(local_size > 0); + } + else { + FAIL_IF(load_immediate(compiler, SLJIT_R3, (local_size >> 12) - 1)); + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | RT4(TMP_REG2) | RN4(TMP_REG1))); + FAIL_IF(push_inst32(compiler, SUB_WI | RD4(TMP_REG1) | RN4(TMP_REG1) | imm)); + SLJIT_ASSERT(reg_map[SLJIT_R3] < 7); + FAIL_IF(push_inst16(compiler, SUBSI8 | RDN3(SLJIT_R3) | 1)); + FAIL_IF(push_inst16(compiler, BCC | (0x1 << 8) /* not-equal */ | (-7 & 0xff))); + + local_size &= 0xfff; + + if (local_size != 0) + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | RT4(TMP_REG2) | RN4(TMP_REG1))); + } + + if (local_size >= 256) { + imm = get_imm(local_size & ~0xff); + SLJIT_ASSERT(imm != INVALID_IMM); + + FAIL_IF(push_inst32(compiler, SUB_WI | RD4(TMP_REG1) | RN4(TMP_REG1) | imm)); + } + } + + local_size &= 0xff; + FAIL_IF(push_inst32(compiler, LDRI | 0x400 | (local_size > 0 ? 0x100 : 0) | RT4(TMP_REG2) | RN4(TMP_REG1) | local_size)); + + FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(SLJIT_SP, TMP_REG1))); + } + else if (local_size > 0) + FAIL_IF(push_inst32(compiler, LDRI | 0x500 | RT4(TMP_REG1) | RN4(SLJIT_SP) | local_size)); +#endif + return SLJIT_SUCCESS; } @@ -1119,11 +1196,16 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_return(struct sljit_compiler *comp /* Operators */ /* --------------------------------------------------------------------- */ +#if !(defined __ARM_FEATURE_IDIV) && !(defined __ARM_ARCH_EXT_IDIV__) + #ifdef __cplusplus extern "C" { #endif -#if defined(__GNUC__) +#ifdef _WIN32 +extern unsigned long long __rt_udiv(unsigned int denominator, unsigned int numerator); +extern long long __rt_sdiv(int denominator, int numerator); +#elif defined(__GNUC__) extern unsigned int __aeabi_uidivmod(unsigned int numerator, int unsigned denominator); extern int __aeabi_idivmod(int numerator, int denominator); #else @@ -1134,10 +1216,14 @@ extern int __aeabi_idivmod(int numerator, int denominator); } #endif +#endif /* !__ARM_FEATURE_IDIV && !__ARM_ARCH_EXT_IDIV__ */ + SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compiler, sljit_s32 op) { +#if !(defined __ARM_FEATURE_IDIV) && !(defined __ARM_ARCH_EXT_IDIV__) sljit_sw saved_reg_list[3]; sljit_sw saved_reg_count; +#endif CHECK_ERROR(); CHECK(check_sljit_emit_op0(compiler, op)); @@ -1155,6 +1241,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile | (reg_map[SLJIT_R0] << 12) | (reg_map[SLJIT_R0] << 16) | reg_map[SLJIT_R1]); +#if (defined __ARM_FEATURE_IDIV) || (defined __ARM_ARCH_EXT_IDIV__) + case SLJIT_DIVMOD_UW: + case SLJIT_DIVMOD_SW: + FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(TMP_REG1, SLJIT_R0))); + FAIL_IF(push_inst32(compiler, (op == SLJIT_DIVMOD_UW ? UDIV : SDIV) | RD4(SLJIT_R0) | RN4(SLJIT_R0) | RM4(SLJIT_R1))); + FAIL_IF(push_inst32(compiler, MUL | RD4(SLJIT_R1) | RN4(SLJIT_R0) | RM4(SLJIT_R1))); + return push_inst32(compiler, SUB_W | RD4(SLJIT_R1) | RN4(TMP_REG1) | RM4(SLJIT_R1)); + case SLJIT_DIV_UW: + case SLJIT_DIV_SW: + return push_inst32(compiler, (op == SLJIT_DIV_UW ? UDIV : SDIV) | RD4(SLJIT_R0) | RN4(SLJIT_R0) | RM4(SLJIT_R1)); +#else /* !__ARM_FEATURE_IDIV && !__ARM_ARCH_EXT_IDIV__ */ case SLJIT_DIVMOD_UW: case SLJIT_DIVMOD_SW: case SLJIT_DIV_UW: @@ -1183,7 +1280,13 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile } } -#if defined(__GNUC__) +#ifdef _WIN32 + FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(TMP_REG1, SLJIT_R0))); + FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(SLJIT_R0, SLJIT_R1))); + FAIL_IF(push_inst16(compiler, MOV | SET_REGS44(SLJIT_R1, TMP_REG1))); + FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, + ((op | 0x2) == SLJIT_DIV_UW ? SLJIT_FUNC_OFFSET(__rt_udiv) : SLJIT_FUNC_OFFSET(__rt_sdiv)))); +#elif defined(__GNUC__) FAIL_IF(sljit_emit_ijump(compiler, SLJIT_FAST_CALL, SLJIT_IMM, ((op | 0x2) == SLJIT_DIV_UW ? SLJIT_FUNC_OFFSET(__aeabi_uidivmod) : SLJIT_FUNC_OFFSET(__aeabi_idivmod)))); #else @@ -1203,6 +1306,7 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_op0(struct sljit_compiler *compile | (saved_reg_list[0] << 12) /* ldr rX, [sp], #8/16 */); } return SLJIT_SUCCESS; +#endif /* __ARM_FEATURE_IDIV || __ARM_ARCH_EXT_IDIV__ */ } return SLJIT_SUCCESS; diff --git a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c index 9f9e157a05..094c9923bc 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_32.c @@ -448,7 +448,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t sljit_ins ins = NOP; sljit_u8 offsets[4]; - SLJIT_ASSERT(reg_map[TMP_REG3] == 4 && freg_map[TMP_FREG1] == 12); + SLJIT_ASSERT(reg_map[TMP_REG1] == 4 && freg_map[TMP_FREG1] == 12); arg_types >>= SLJIT_DEF_SHIFT; @@ -516,7 +516,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t else if (arg_count != word_arg_count) ins = ADDU | S(word_arg_count) | TA(0) | DA(4 + (offsets[arg_count - 1] >> 2)); else if (arg_count == 1) - ins = ADDU | S(SLJIT_R0) | TA(0) | D(TMP_REG3); + ins = ADDU | S(SLJIT_R0) | TA(0) | DA(4); arg_count--; word_arg_count--; diff --git a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c index ff6f048659..f841aef5dd 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_64.c @@ -547,7 +547,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t sljit_ins prev_ins = NOP; sljit_ins ins = NOP; - SLJIT_ASSERT(reg_map[TMP_REG3] == 4 && freg_map[TMP_FREG1] == 12); + SLJIT_ASSERT(reg_map[TMP_REG1] == 4 && freg_map[TMP_FREG1] == 12); arg_types >>= SLJIT_DEF_SHIFT; @@ -591,7 +591,7 @@ static sljit_s32 call_with_args(struct sljit_compiler *compiler, sljit_s32 arg_t if (arg_count != word_arg_count) ins = DADDU | S(word_arg_count) | TA(0) | D(arg_count); else if (arg_count == 1) - ins = DADDU | S(SLJIT_R0) | TA(0) | D(TMP_REG3); + ins = DADDU | S(SLJIT_R0) | TA(0) | DA(4); arg_count--; word_arg_count--; break; diff --git a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c index e108433f70..894e21304b 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeMIPS_common.c @@ -57,14 +57,14 @@ typedef sljit_u32 sljit_ins; #define RETURN_ADDR_REG 31 /* Flags are kept in volatile registers. */ -#define EQUAL_FLAG 31 +#define EQUAL_FLAG 3 #define OTHER_FLAG 1 #define TMP_FREG1 (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 1) #define TMP_FREG2 (SLJIT_NUMBER_OF_FLOAT_REGISTERS + 2) static const sljit_u8 reg_map[SLJIT_NUMBER_OF_REGISTERS + 5] = { - 0, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29, 3, 25, 4 + 0, 2, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 24, 23, 22, 21, 20, 19, 18, 17, 16, 29, 4, 25, 31 }; #if (defined SLJIT_CONFIG_MIPS_32 && SLJIT_CONFIG_MIPS_32) @@ -612,16 +612,17 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi /* Frequent case. */ FAIL_IF(push_inst(compiler, ADDIU_W | S(SLJIT_SP) | T(SLJIT_SP) | IMM(-local_size), DR(SLJIT_SP))); base = S(SLJIT_SP); + offs = local_size - (sljit_sw)sizeof(sljit_sw); } else { - FAIL_IF(load_immediate(compiler, DR(TMP_REG1), local_size)); + FAIL_IF(load_immediate(compiler, DR(OTHER_FLAG), local_size)); FAIL_IF(push_inst(compiler, ADDU_W | S(SLJIT_SP) | TA(0) | D(TMP_REG2), DR(TMP_REG2))); - FAIL_IF(push_inst(compiler, SUBU_W | S(SLJIT_SP) | T(TMP_REG1) | D(SLJIT_SP), DR(SLJIT_SP))); + FAIL_IF(push_inst(compiler, SUBU_W | S(SLJIT_SP) | T(OTHER_FLAG) | D(SLJIT_SP), DR(SLJIT_SP))); base = S(TMP_REG2); local_size = 0; + offs = -(sljit_sw)sizeof(sljit_sw); } - offs = local_size - (sljit_sw)(sizeof(sljit_sw)); FAIL_IF(push_inst(compiler, STACK_STORE | base | TA(RETURN_ADDR_REG) | IMM(offs), MOVABLE_INS)); tmp = saveds < SLJIT_NUMBER_OF_SAVED_REGISTERS ? (SLJIT_S0 + 1 - saveds) : SLJIT_FIRST_SAVED_REG; @@ -805,7 +806,8 @@ static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sl if ((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA)) { tmp_ar = reg_ar; delay_slot = reg_ar; - } else { + } + else { tmp_ar = DR(TMP_REG1); delay_slot = MOVABLE_INS; } @@ -881,11 +883,39 @@ static sljit_s32 getput_arg(struct sljit_compiler *compiler, sljit_s32 flags, sl static SLJIT_INLINE sljit_s32 emit_op_mem(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg_ar, sljit_s32 arg, sljit_sw argw) { + sljit_s32 tmp_ar, base, delay_slot; + if (getput_arg_fast(compiler, flags, reg_ar, arg, argw)) return compiler->error; - compiler->cache_arg = 0; - compiler->cache_argw = 0; - return getput_arg(compiler, flags, reg_ar, arg, argw, 0, 0); + + if ((flags & MEM_MASK) <= GPR_REG && (flags & LOAD_DATA)) { + tmp_ar = reg_ar; + delay_slot = reg_ar; + } + else { + tmp_ar = DR(TMP_REG1); + delay_slot = MOVABLE_INS; + } + base = arg & REG_MASK; + + if (SLJIT_UNLIKELY(arg & OFFS_REG_MASK)) { + argw &= 0x3; + + if (SLJIT_UNLIKELY(argw)) { + FAIL_IF(push_inst(compiler, SLL_W | T(OFFS_REG(arg)) | DA(tmp_ar) | SH_IMM(argw), tmp_ar)); + FAIL_IF(push_inst(compiler, ADDU_W | S(base) | TA(tmp_ar) | DA(tmp_ar), tmp_ar)); + } + else + FAIL_IF(push_inst(compiler, ADDU_W | S(base) | T(OFFS_REG(arg)) | DA(tmp_ar), tmp_ar)); + return push_inst(compiler, data_transfer_insts[flags & MEM_MASK] | SA(tmp_ar) | TA(reg_ar), delay_slot); + } + + FAIL_IF(load_immediate(compiler, tmp_ar, argw)); + + if (base != 0) + FAIL_IF(push_inst(compiler, ADDU_W | S(base) | TA(tmp_ar) | DA(tmp_ar), tmp_ar)); + + return push_inst(compiler, data_transfer_insts[flags & MEM_MASK] | SA(tmp_ar) | TA(reg_ar), delay_slot); } static SLJIT_INLINE sljit_s32 emit_op_mem2(struct sljit_compiler *compiler, sljit_s32 flags, sljit_s32 reg, sljit_s32 arg1, sljit_sw arg1w, sljit_s32 arg2, sljit_sw arg2w) diff --git a/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c b/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c index 8a83e273a4..074e64b9f2 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeX86_32.c @@ -123,34 +123,38 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi #if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL) if (args > 0) { - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | reg_map[SLJIT_R2]; + inst[0] = MOV_r_rm; + inst[1] = MOD_REG | (reg_map[SLJIT_S0] << 3) | reg_map[SLJIT_R2]; + inst += 2; } if (args > 1) { - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S1] << 3) | reg_map[SLJIT_R1]; + inst[0] = MOV_r_rm; + inst[1] = MOD_REG | (reg_map[SLJIT_S1] << 3) | reg_map[SLJIT_R1]; + inst += 2; } if (args > 2) { - *inst++ = MOV_r_rm; - *inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 0x4 /* esp */; - *inst++ = 0x24; - *inst++ = sizeof(sljit_sw) * (3 + 2); /* saveds >= 3 as well. */ + inst[0] = MOV_r_rm; + inst[1] = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | 0x4 /* esp */; + inst[2] = 0x24; + inst[3] = sizeof(sljit_sw) * (3 + 2); /* saveds >= 3 as well. */ } #else if (args > 0) { - *inst++ = MOV_r_rm; - *inst++ = MOD_DISP8 | (reg_map[SLJIT_S0] << 3) | reg_map[TMP_REG1]; - *inst++ = sizeof(sljit_sw) * 2; + inst[0] = MOV_r_rm; + inst[1] = MOD_DISP8 | (reg_map[SLJIT_S0] << 3) | reg_map[TMP_REG1]; + inst[2] = sizeof(sljit_sw) * 2; + inst += 3; } if (args > 1) { - *inst++ = MOV_r_rm; - *inst++ = MOD_DISP8 | (reg_map[SLJIT_S1] << 3) | reg_map[TMP_REG1]; - *inst++ = sizeof(sljit_sw) * 3; + inst[0] = MOV_r_rm; + inst[1] = MOD_DISP8 | (reg_map[SLJIT_S1] << 3) | reg_map[TMP_REG1]; + inst[2] = sizeof(sljit_sw) * 3; + inst += 3; } if (args > 2) { - *inst++ = MOV_r_rm; - *inst++ = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | reg_map[TMP_REG1]; - *inst++ = sizeof(sljit_sw) * 4; + inst[0] = MOV_r_rm; + inst[1] = MOD_DISP8 | (reg_map[SLJIT_S2] << 3) | reg_map[TMP_REG1]; + inst[2] = sizeof(sljit_sw) * 4; } #endif @@ -170,17 +174,36 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi compiler->local_size = local_size; #ifdef _WIN32 - if (local_size > 1024) { -#if (defined SLJIT_X86_32_FASTCALL && SLJIT_X86_32_FASTCALL) - FAIL_IF(emit_do_imm(compiler, MOV_r_i32 + reg_map[SLJIT_R0], local_size)); -#else - /* Space for a single argument. This amount is excluded when the stack is allocated below. */ - local_size -= sizeof(sljit_sw); - FAIL_IF(emit_do_imm(compiler, MOV_r_i32 + reg_map[SLJIT_R0], local_size)); - FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), - SLJIT_SP, 0, SLJIT_SP, 0, SLJIT_IMM, sizeof(sljit_sw))); -#endif - FAIL_IF(sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARG1(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_grow_stack))); + if (local_size > 0) { + if (local_size <= 4 * 4096) { + if (local_size > 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096); + if (local_size > 2 * 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096 * 2); + if (local_size > 3 * 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096 * 3); + } + else { + EMIT_MOV(compiler, SLJIT_R0, 0, SLJIT_SP, 0); + EMIT_MOV(compiler, SLJIT_R1, 0, SLJIT_IMM, (local_size - 1) >> 12); + + SLJIT_ASSERT (reg_map[SLJIT_R0] == 0); + + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_R0), -4096); + FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), + SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 4096)); + FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), + SLJIT_R1, 0, SLJIT_R1, 0, SLJIT_IMM, 1)); + + inst = (sljit_u8*)ensure_buf(compiler, 1 + 2); + FAIL_IF(!inst); + + INC_SIZE(2); + inst[0] = JNE_i8; + inst[1] = (sljit_s8) -16; + } + + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -local_size); } #endif diff --git a/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c b/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c index 635ebd087c..8506565614 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeX86_64.c @@ -83,6 +83,8 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi CHECK(check_sljit_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size)); set_emit_enter(compiler, options, arg_types, scratches, saveds, fscratches, fsaveds, local_size); + compiler->mode32 = 0; + #ifdef _WIN64 /* Two/four register slots for parameters plus space for xmm6 register if needed. */ if (fscratches >= 6 || fsaveds >= 1) @@ -126,35 +128,39 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi #ifndef _WIN64 if (args > 0) { - *inst++ = REX_W; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x7 /* rdi */; + inst[0] = REX_W; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x7 /* rdi */; + inst += 3; } if (args > 1) { - *inst++ = REX_W | REX_R; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_lmap[SLJIT_S1] << 3) | 0x6 /* rsi */; + inst[0] = REX_W | REX_R; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_lmap[SLJIT_S1] << 3) | 0x6 /* rsi */; + inst += 3; } if (args > 2) { - *inst++ = REX_W | REX_R; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_lmap[SLJIT_S2] << 3) | 0x2 /* rdx */; + inst[0] = REX_W | REX_R; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_lmap[SLJIT_S2] << 3) | 0x2 /* rdx */; } #else if (args > 0) { - *inst++ = REX_W; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x1 /* rcx */; + inst[0] = REX_W; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_map[SLJIT_S0] << 3) | 0x1 /* rcx */; + inst += 3; } if (args > 1) { - *inst++ = REX_W; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S1] << 3) | 0x2 /* rdx */; + inst[0] = REX_W; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_map[SLJIT_S1] << 3) | 0x2 /* rdx */; + inst += 3; } if (args > 2) { - *inst++ = REX_W | REX_B; - *inst++ = MOV_r_rm; - *inst++ = MOD_REG | (reg_map[SLJIT_S2] << 3) | 0x0 /* r8 */; + inst[0] = REX_W | REX_B; + inst[1] = MOV_r_rm; + inst[2] = MOD_REG | (reg_map[SLJIT_S2] << 3) | 0x0 /* r8 */; } #endif } @@ -163,58 +169,42 @@ SLJIT_API_FUNC_ATTRIBUTE sljit_s32 sljit_emit_enter(struct sljit_compiler *compi compiler->local_size = local_size; #ifdef _WIN64 - if (local_size > 1024) { - /* Allocate stack for the callback, which grows the stack. */ - inst = (sljit_u8*)ensure_buf(compiler, 1 + 4 + (3 + sizeof(sljit_s32))); - FAIL_IF(!inst); - INC_SIZE(4 + (3 + sizeof(sljit_s32))); - *inst++ = REX_W; - *inst++ = GROUP_BINARY_83; - *inst++ = MOD_REG | SUB | reg_map[SLJIT_SP]; - /* Allocated size for registers must be divisible by 8. */ - SLJIT_ASSERT(!(saved_register_size & 0x7)); - /* Aligned to 16 byte. */ - if (saved_register_size & 0x8) { - *inst++ = 5 * sizeof(sljit_sw); - local_size -= 5 * sizeof(sljit_sw); - } else { - *inst++ = 4 * sizeof(sljit_sw); - local_size -= 4 * sizeof(sljit_sw); - } - /* Second instruction */ - SLJIT_ASSERT(reg_map[SLJIT_R0] < 8); - *inst++ = REX_W; - *inst++ = MOV_rm_i32; - *inst++ = MOD_REG | reg_lmap[SLJIT_R0]; - sljit_unaligned_store_s32(inst, local_size); -#if (defined SLJIT_VERBOSE && SLJIT_VERBOSE) \ - || (defined SLJIT_ARGUMENT_CHECKS && SLJIT_ARGUMENT_CHECKS) - compiler->skip_checks = 1; -#endif - FAIL_IF(sljit_emit_icall(compiler, SLJIT_CALL, SLJIT_ARG1(SW), SLJIT_IMM, SLJIT_FUNC_OFFSET(sljit_grow_stack))); - } -#endif - if (local_size > 0) { - if (local_size <= 127) { - inst = (sljit_u8*)ensure_buf(compiler, 1 + 4); - FAIL_IF(!inst); - INC_SIZE(4); - *inst++ = REX_W; - *inst++ = GROUP_BINARY_83; - *inst++ = MOD_REG | SUB | reg_map[SLJIT_SP]; - *inst++ = local_size; + if (local_size <= 4 * 4096) { + if (local_size > 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096); + if (local_size > 2 * 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096 * 2); + if (local_size > 3 * 4096) + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -4096 * 3); } else { - inst = (sljit_u8*)ensure_buf(compiler, 1 + 7); + EMIT_MOV(compiler, SLJIT_R0, 0, SLJIT_SP, 0); + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_IMM, (local_size - 1) >> 12); + + SLJIT_ASSERT (reg_map[SLJIT_R0] == 0); + + EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_MEM1(SLJIT_R0), -4096); + FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), + SLJIT_R0, 0, SLJIT_R0, 0, SLJIT_IMM, 4096)); + FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), + TMP_REG1, 0, TMP_REG1, 0, SLJIT_IMM, 1)); + + inst = (sljit_u8*)ensure_buf(compiler, 1 + 2); FAIL_IF(!inst); - INC_SIZE(7); - *inst++ = REX_W; - *inst++ = GROUP_BINARY_81; - *inst++ = MOD_REG | SUB | reg_map[SLJIT_SP]; - sljit_unaligned_store_s32(inst, local_size); - inst += sizeof(sljit_s32); + + INC_SIZE(2); + inst[0] = JNE_i8; + inst[1] = (sljit_s8) -19; } + + EMIT_MOV(compiler, TMP_REG1, 0, SLJIT_MEM1(SLJIT_SP), -local_size); + } +#endif + + if (local_size > 0) { + FAIL_IF(emit_non_cum_binary(compiler, BINARY_OPCODE(SUB), + SLJIT_SP, 0, SLJIT_SP, 0, SLJIT_IMM, local_size)); } #ifdef _WIN64 diff --git a/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c b/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c index ab7b36adb2..6f02ee3e8b 100644 --- a/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c +++ b/thirdparty/pcre2/src/sljit/sljitNativeX86_common.c @@ -669,23 +669,6 @@ static SLJIT_INLINE sljit_s32 emit_sse2_store(struct sljit_compiler *compiler, static SLJIT_INLINE sljit_s32 emit_sse2_load(struct sljit_compiler *compiler, sljit_s32 single, sljit_s32 dst, sljit_s32 src, sljit_sw srcw); -#ifdef _WIN32 -#include <malloc.h> - -static void SLJIT_FUNC sljit_grow_stack(sljit_sw local_size) -{ - /* Workaround for calling the internal _chkstk() function on Windows. - This function touches all 4k pages belongs to the requested stack space, - which size is passed in local_size. This is necessary on Windows where - the stack can only grow in 4k steps. However, this function just burn - CPU cycles if the stack is large enough. However, you don't know it in - advance, so it must always be called. I think this is a bad design in - general even if it has some reasons. */ - *(volatile sljit_s32*)alloca(local_size) = 0; -} - -#endif - #if (defined SLJIT_CONFIG_X86_32 && SLJIT_CONFIG_X86_32) #include "sljitNativeX86_32.c" #else diff --git a/thirdparty/tinyexr/tinyexr.h b/thirdparty/tinyexr/tinyexr.h index b3a7ee00c2..3c19391850 100644 --- a/thirdparty/tinyexr/tinyexr.h +++ b/thirdparty/tinyexr/tinyexr.h @@ -274,6 +274,12 @@ extern int LoadEXR(float **out_rgba, int *width, int *height, const char *filename, const char **err); // @deprecated { to be removed. } +// Simple wrapper API for ParseEXRHeaderFromFile. +// checking given file is a EXR file(by just look up header) +// @return TINYEXR_SUCCEES for EXR image, TINYEXR_ERROR_INVALID_HEADER for others +extern int IsEXR(const char *filename); + +// @deprecated { to be removed. } // Saves single-frame OpenEXR image. Assume EXR image contains RGB(A) channels. // components must be 1(Grayscale), 3(RGB) or 4(RGBA). // Input image format is: `float x width x height`, or `float x RGB(A) x width x @@ -6998,6 +7004,10 @@ static void swap2(unsigned short *val) { #endif } +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wunused-function" +#endif static void cpy4(int *dst_val, const int *src_val) { unsigned char *dst = reinterpret_cast<unsigned char *>(dst_val); const unsigned char *src = reinterpret_cast<const unsigned char *>(src_val); @@ -7028,6 +7038,10 @@ static void cpy4(float *dst_val, const float *src_val) { dst[3] = src[3]; } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + static void swap4(unsigned int *val) { #ifdef MINIZ_LITTLE_ENDIAN (void)val; @@ -8840,7 +8854,8 @@ static bool getCode(int po, int rlc, long long &c, int &lc, const char *&in, if (out + cs > oe) return false; // Bounds check for safety - if ((out - 1) <= ob) return false; + // Issue 100. + if ((out - 1) < ob) return false; unsigned short s = out[-1]; while (cs-- > 0) *out++ = s; @@ -10721,6 +10736,15 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header, int data_width = exr_header->data_window[2] - exr_header->data_window[0] + 1; int data_height = exr_header->data_window[3] - exr_header->data_window[1] + 1; + if ((data_width < 0) || (data_height < 0)) { + if (err) { + std::stringstream ss; + ss << "Invalid data width or data height: " << data_width << ", " << data_height << std::endl; + (*err) += ss.str(); + } + return TINYEXR_ERROR_INVALID_DATA; + } + size_t num_blocks = offsets.size(); std::vector<size_t> channel_offset_list; @@ -10816,6 +10840,17 @@ static int DecodeChunk(EXRImage *exr_image, const EXRHeader *exr_header, } } else { // scanline format + // Don't allow too large image(256GB * pixel_data_size or more). Workaround for #104. + size_t data_len = size_t(data_width) * size_t(data_height) * size_t(num_channels); + if ((data_len == 0) || (data_len >= 0x4000000000)) { + if (err) { + std::stringstream ss; + ss << "Image data size is zero or too large: width = " << data_width << ", height = " << data_height << ", channels = " << num_channels << std::endl; + (*err) += ss.str(); + } + return TINYEXR_ERROR_INVALID_DATA; + } + exr_image->images = tinyexr::AllocateImage( num_channels, exr_header->channels, exr_header->requested_pixel_types, data_width, data_height); @@ -11155,7 +11190,6 @@ int LoadEXR(float **out_rgba, int *width, int *height, const char *filename, static_cast<size_t>(exr_image.height))); if (exr_header.tiled) { - // todo.implement this for (int it = 0; it < exr_image.num_tiles; it++) { for (int j = 0; j < exr_header.tile_size_y; j++) { @@ -11284,6 +11318,17 @@ int LoadEXR(float **out_rgba, int *width, int *height, const char *filename, return TINYEXR_SUCCESS; } +int IsEXR(const char *filename) { + EXRVersion exr_version; + + int ret = ParseEXRVersionFromFile(&exr_version, filename); + if (ret != TINYEXR_SUCCESS) { + return TINYEXR_ERROR_INVALID_HEADER; + } + + return TINYEXR_SUCCESS; +} + int ParseEXRHeaderFromMemory(EXRHeader *exr_header, const EXRVersion *version, const unsigned char *memory, size_t size, const char **err) { @@ -11380,75 +11425,128 @@ int LoadEXRFromMemory(float **out_rgba, int *width, int *height, } } - if (idxR == -1) { - tinyexr::SetErrorMessage("R channel not found", err); - - // @todo { free exr_image } - return TINYEXR_ERROR_INVALID_DATA; - } - - if (idxG == -1) { - tinyexr::SetErrorMessage("G channel not found", err); - // @todo { free exr_image } - return TINYEXR_ERROR_INVALID_DATA; - } + // TODO(syoyo): Refactor removing same code as used in LoadEXR(). + if (exr_header.num_channels == 1) { + // Grayscale channel only. - if (idxB == -1) { - tinyexr::SetErrorMessage("B channel not found", err); - // @todo { free exr_image } - return TINYEXR_ERROR_INVALID_DATA; - } + (*out_rgba) = reinterpret_cast<float *>( + malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) * + static_cast<size_t>(exr_image.height))); - (*out_rgba) = reinterpret_cast<float *>( - malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) * - static_cast<size_t>(exr_image.height))); + if (exr_header.tiled) { - if (exr_header.tiled) { - for (int it = 0; it < exr_image.num_tiles; it++) { - for (int j = 0; j < exr_header.tile_size_y; j++) - for (int i = 0; i < exr_header.tile_size_x; i++) { - const int ii = - exr_image.tiles[it].offset_x * exr_header.tile_size_x + i; - const int jj = - exr_image.tiles[it].offset_y * exr_header.tile_size_y + j; - const int idx = ii + jj * exr_image.width; + for (int it = 0; it < exr_image.num_tiles; it++) { + for (int j = 0; j < exr_header.tile_size_y; j++) { + for (int i = 0; i < exr_header.tile_size_x; i++) { + const int ii = + exr_image.tiles[it].offset_x * exr_header.tile_size_x + i; + const int jj = + exr_image.tiles[it].offset_y * exr_header.tile_size_y + j; + const int idx = ii + jj * exr_image.width; - // out of region check. - if (ii >= exr_image.width) { - continue; - } - if (jj >= exr_image.height) { - continue; - } - const int srcIdx = i + j * exr_header.tile_size_x; - unsigned char **src = exr_image.tiles[it].images; - (*out_rgba)[4 * idx + 0] = - reinterpret_cast<float **>(src)[idxR][srcIdx]; - (*out_rgba)[4 * idx + 1] = - reinterpret_cast<float **>(src)[idxG][srcIdx]; - (*out_rgba)[4 * idx + 2] = - reinterpret_cast<float **>(src)[idxB][srcIdx]; - if (idxA != -1) { + // out of region check. + if (ii >= exr_image.width) { + continue; + } + if (jj >= exr_image.height) { + continue; + } + const int srcIdx = i + j * exr_header.tile_size_x; + unsigned char **src = exr_image.tiles[it].images; + (*out_rgba)[4 * idx + 0] = + reinterpret_cast<float **>(src)[0][srcIdx]; + (*out_rgba)[4 * idx + 1] = + reinterpret_cast<float **>(src)[0][srcIdx]; + (*out_rgba)[4 * idx + 2] = + reinterpret_cast<float **>(src)[0][srcIdx]; (*out_rgba)[4 * idx + 3] = - reinterpret_cast<float **>(src)[idxA][srcIdx]; - } else { - (*out_rgba)[4 * idx + 3] = 1.0; + reinterpret_cast<float **>(src)[0][srcIdx]; } } + } + } else { + for (int i = 0; i < exr_image.width * exr_image.height; i++) { + const float val = reinterpret_cast<float **>(exr_image.images)[0][i]; + (*out_rgba)[4 * i + 0] = val; + (*out_rgba)[4 * i + 1] = val; + (*out_rgba)[4 * i + 2] = val; + (*out_rgba)[4 * i + 3] = val; + } } + } else { - for (int i = 0; i < exr_image.width * exr_image.height; i++) { - (*out_rgba)[4 * i + 0] = - reinterpret_cast<float **>(exr_image.images)[idxR][i]; - (*out_rgba)[4 * i + 1] = - reinterpret_cast<float **>(exr_image.images)[idxG][i]; - (*out_rgba)[4 * i + 2] = - reinterpret_cast<float **>(exr_image.images)[idxB][i]; - if (idxA != -1) { - (*out_rgba)[4 * i + 3] = - reinterpret_cast<float **>(exr_image.images)[idxA][i]; - } else { - (*out_rgba)[4 * i + 3] = 1.0; + // TODO(syoyo): Support non RGBA image. + + if (idxR == -1) { + tinyexr::SetErrorMessage("R channel not found", err); + + // @todo { free exr_image } + return TINYEXR_ERROR_INVALID_DATA; + } + + if (idxG == -1) { + tinyexr::SetErrorMessage("G channel not found", err); + // @todo { free exr_image } + return TINYEXR_ERROR_INVALID_DATA; + } + + if (idxB == -1) { + tinyexr::SetErrorMessage("B channel not found", err); + // @todo { free exr_image } + return TINYEXR_ERROR_INVALID_DATA; + } + + (*out_rgba) = reinterpret_cast<float *>( + malloc(4 * sizeof(float) * static_cast<size_t>(exr_image.width) * + static_cast<size_t>(exr_image.height))); + + if (exr_header.tiled) { + for (int it = 0; it < exr_image.num_tiles; it++) { + for (int j = 0; j < exr_header.tile_size_y; j++) + for (int i = 0; i < exr_header.tile_size_x; i++) { + const int ii = + exr_image.tiles[it].offset_x * exr_header.tile_size_x + i; + const int jj = + exr_image.tiles[it].offset_y * exr_header.tile_size_y + j; + const int idx = ii + jj * exr_image.width; + + // out of region check. + if (ii >= exr_image.width) { + continue; + } + if (jj >= exr_image.height) { + continue; + } + const int srcIdx = i + j * exr_header.tile_size_x; + unsigned char **src = exr_image.tiles[it].images; + (*out_rgba)[4 * idx + 0] = + reinterpret_cast<float **>(src)[idxR][srcIdx]; + (*out_rgba)[4 * idx + 1] = + reinterpret_cast<float **>(src)[idxG][srcIdx]; + (*out_rgba)[4 * idx + 2] = + reinterpret_cast<float **>(src)[idxB][srcIdx]; + if (idxA != -1) { + (*out_rgba)[4 * idx + 3] = + reinterpret_cast<float **>(src)[idxA][srcIdx]; + } else { + (*out_rgba)[4 * idx + 3] = 1.0; + } + } + } + } else { + for (int i = 0; i < exr_image.width * exr_image.height; i++) { + (*out_rgba)[4 * i + 0] = + reinterpret_cast<float **>(exr_image.images)[idxR][i]; + (*out_rgba)[4 * i + 1] = + reinterpret_cast<float **>(exr_image.images)[idxG][i]; + (*out_rgba)[4 * i + 2] = + reinterpret_cast<float **>(exr_image.images)[idxB][i]; + if (idxA != -1) { + (*out_rgba)[4 * i + 3] = + reinterpret_cast<float **>(exr_image.images)[idxA][i]; + } else { + (*out_rgba)[4 * i + 3] = 1.0; + } } } } |