diff -Nru tiled-qt-1.2.1+dfsg.1/debian/changelog tiled-qt-1.2.4+dfsg.1/debian/changelog
--- tiled-qt-1.2.1+dfsg.1/debian/changelog	2018-11-27 22:41:14.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/debian/changelog	2019-07-07 17:25:13.000000000 +0000
@@ -1,3 +1,9 @@
+tiled-qt (1.2.4+dfsg.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Ying-Chun Liu (PaulLiu) <paulliu@debian.org>  Mon, 08 Jul 2019 01:25:13 +0800
+
 tiled-qt (1.2.1+dfsg.1-1) unstable; urgency=low
 
   * New upstream release
diff -Nru tiled-qt-1.2.1+dfsg.1/debian/copyright tiled-qt-1.2.4+dfsg.1/debian/copyright
--- tiled-qt-1.2.1+dfsg.1/debian/copyright	2018-11-27 20:19:33.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/debian/copyright	2019-07-07 17:25:13.000000000 +0000
@@ -54,6 +54,16 @@
            2004-2006 Adam Turk <aturk@biggeruniverse.com>
 License: LGPL-2.1+
 
+Files: docs/map.xsd docs/map.dtd
+Copyright: 2016 Tiled Developers (mapeditor.org)
+           2016 Olivier.Beaton@quadir.net
+	   2016 Asser Fahrenholz
+License: CC-BY-3.0
+
+Files: docs/reference/tmx-map-format.rst
+Copyright: 2016 Tiled Developers (mapeditor.org)
+License: CC-BY-SA-3.0
+
 Files: debian/*
 Copyright: 2010 Ying-Chun Liu (PaulLiu) <paulliu@debian.org>
 License: GPL-2+
@@ -114,3 +124,778 @@
  .
  On Debian systems, the full text of the GNU Lesser General Public License
  version 2.1 can be found in the file `/usr/share/common-licenses/LGPL-2.1'.
+
+License: CC-BY-3.0
+ Creative Commons Attribution 3.0 License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS
+ OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR
+ "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER
+ APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS
+ PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU
+ ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE.
+ TO THE EXTENT THIS LICENSE MAY BE CONSIDERED TO BE A
+ CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE
+ IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1.   Definitions
+ .
+   a) "Adaptation" means a work based upon
+      the Work, or upon the Work and other pre-existing works,
+      such as a translation, adaptation, derivative work,
+      arrangement of music or other alterations of a literary
+      or artistic work, or phonogram or performance and
+      includes cinematographic adaptations or any other form in
+      which the Work may be recast, transformed, or adapted
+      including in any form recognizably derived from the
+      original, except that a work that constitutes a
+      Collection will not be considered an Adaptation for the
+      purpose of this License. For the avoidance of doubt,
+      where the Work is a musical work, performance or
+      phonogram, the synchronization of the Work in
+      timed-relation with a moving image ("synching") will be
+      considered an Adaptation for the purpose of this
+      License.
+ .
+   b) "Collection"</strong> means a collection of
+      literary or artistic works, such as encyclopedias and
+      anthologies, or performances, phonograms or broadcasts,
+      or other works or subject matter other than works listed
+      in Section 1(f) below, which, by reason of the selection
+      and arrangement of their contents, constitute
+      intellectual creations, in which the Work is included in
+      its entirety in unmodified form along with one or more
+      other contributions, each constituting separate and
+      independent works in themselves, which together are
+      assembled into a collective whole. A work that
+      constitutes a Collection will not be considered an
+      Adaptation (as defined above) for the purposes of this
+      License.
+ .
+   c) "Distribute" means to make available
+      to the public the original and copies of the Work or
+      Adaptation, as appropriate, through sale or other
+      transfer of ownership.
+ .
+   d) "Licensor" means the individual,
+      individuals, entity or entities that offer(s) the Work
+      under the terms of this License.
+ .
+   e) "Original Author" means, in the case
+      of a literary or artistic work, the individual,
+      individuals, entity or entities who created the Work or
+      if no individual or entity can be identified, the
+      publisher; and in addition (i) in the case of a
+      performance the actors, singers, musicians, dancers, and
+      other persons who act, sing, deliver, declaim, play in,
+      interpret or otherwise perform literary or artistic works
+      or expressions of folklore; (ii) in the case of a
+      phonogram the producer being the person or legal entity
+      who first fixes the sounds of a performance or other
+      sounds; and, (iii) in the case of broadcasts, the
+      organization that transmits the broadcast.
+ .
+   f) "Work" means the literary and/or
+      artistic work offered under the terms of this License
+      including without limitation any production in the
+      literary, scientific and artistic domain, whatever may be
+      the mode or form of its expression including digital
+      form, such as a book, pamphlet and other writing; a
+      lecture, address, sermon or other work of the same
+      nature; a dramatic or dramatico-musical work; a
+      choreographic work or entertainment in dumb show; a
+      musical composition with or without words; a
+      cinematographic work to which are assimilated works
+      expressed by a process analogous to cinematography; a
+      work of drawing, painting, architecture, sculpture,
+      engraving or lithography; a photographic work to which
+      are assimilated works expressed by a process analogous to
+      photography; a work of applied art; an illustration, map,
+      plan, sketch or three-dimensional work relative to
+      geography, topography, architecture or science; a
+      performance; a broadcast; a phonogram; a compilation of
+      data to the extent it is protected as a copyrightable
+      work; or a work performed by a variety or circus
+      performer to the extent it is not otherwise considered a
+      literary or artistic work.
+ .
+   g) "You"</strong> means an individual or entity
+      exercising rights under this License who has not
+      previously violated the terms of this License with
+      respect to the Work, or who has received express
+      permission from the Licensor to exercise rights under
+      this License despite a previous violation.
+ .
+   h) "Publicly Perform" means to perform
+      public recitations of the Work and to communicate to the
+      public those public recitations, by any means or process,
+      including by wire or wireless means or public digital
+      performances; to make available to the public Works in
+      such a way that members of the public may access these
+      Works from a place and at a place individually chosen by
+      them; to perform the Work to the public by any means or
+      process and the communication to the public of the
+      performances of the Work, including by public digital
+      performance; to broadcast and rebroadcast the Work by any
+      means including signs, sounds or images.
+ .
+   i) "Reproduce" means to make copies of
+      the Work by any means including without limitation by
+      sound or visual recordings and the right of fixation and
+      reproducing fixations of the Work, including storage of a
+      protected performance or phonogram in digital form or
+      other electronic medium.
+ .
+ 2.   Fair Dealing Rights. Nothing in this
+      License is intended to reduce, limit, or restrict any uses
+      free from copyright or rights arising from limitations or
+      exceptions that are provided for in connection with the
+      copyright protection under copyright law or other
+      applicable laws.
+ .
+ 3.   License Grant. Subject to the terms
+      and conditions of this License, Licensor hereby grants You
+      a worldwide, royalty-free, non-exclusive, perpetual (for
+      the duration of the applicable copyright) license to
+      exercise the rights in the Work as stated below:</p>
+ .
+   a) to Reproduce the Work, to incorporate the Work into
+      one or more Collections, and to Reproduce the Work as
+      incorporated in the Collections;
+ .
+   b) to create and Reproduce Adaptations provided that any
+      such Adaptation, including any translation in any medium,
+      takes reasonable steps to clearly label, demarcate or
+      otherwise identify that changes were made to the original
+      Work. For example, a translation could be marked "The
+      original work was translated from English to Spanish," or
+      a modification could indicate "The original work has been
+      modified.";
+ .
+   c) to Distribute and Publicly Perform the Work including
+      as incorporated in Collections; and,
+ .
+   d) to Distribute and Publicly Perform Adaptations.
+ .
+   e) For the avoidance of doubt:
+ .
+      i) Non-waivable Compulsory License
+         Schemes. In those jurisdictions in which the
+         right to collect royalties through any statutory or
+         compulsory licensing scheme cannot be waived, the
+         Licensor reserves the exclusive right to collect such
+         royalties for any exercise by You of the rights
+         granted under this License;
+ .
+     ii) Waivable Compulsory License
+         Schemes. In those jurisdictions in which the
+         right to collect royalties through any statutory or
+         compulsory licensing scheme can be waived, the
+         Licensor waives the exclusive right to collect such
+         royalties for any exercise by You of the rights
+         granted under this License; and,
+ .
+    iii) Voluntary License Schemes. The
+         Licensor waives the right to collect royalties,
+         whether individually or, in the event that the
+         Licensor is a member of a collecting society that
+         administers voluntary licensing schemes, via that
+         society, from any exercise by You of the rights
+         granted under this License.
+ .
+      The above rights may be exercised in all media and
+      formats whether now known or hereafter devised. The above
+      rights include the right to make such modifications as are
+      technically necessary to exercise the rights in other media
+      and formats. Subject to Section 8(f), all rights not
+      expressly granted by Licensor are hereby reserved.
+ .
+ 4.   Restrictions. The license granted in
+      Section 3 above is expressly made subject to and limited by
+      the following restrictions:
+ .
+   a) You may Distribute or Publicly Perform the Work only
+      under the terms of this License. You must include a copy
+      of, or the Uniform Resource Identifier (URI) for, this
+      License with every copy of the Work You Distribute or
+      Publicly Perform. You may not offer or impose any terms
+      on the Work that restrict the terms of this License or
+      the ability of the recipient of the Work to exercise the
+      rights granted to that recipient under the terms of the
+      License. You may not sublicense the Work. You must keep
+      intact all notices that refer to this License and to the
+      disclaimer of warranties with every copy of the Work You
+      Distribute or Publicly Perform. When You Distribute or
+      Publicly Perform the Work, You may not impose any
+      effective technological measures on the Work that
+      restrict the ability of a recipient of the Work from You
+      to exercise the rights granted to that recipient under
+      the terms of the License. This Section 4(a) applies to
+      the Work as incorporated in a Collection, but this does
+      not require the Collection apart from the Work itself to
+      be made subject to the terms of this License. If You
+      create a Collection, upon notice from any Licensor You
+      must, to the extent practicable, remove from the
+      Collection any credit as required by Section 4(b), as
+      requested. If You create an Adaptation, upon notice from
+      any Licensor You must, to the extent practicable, remove
+      from the Adaptation any credit as required by Section
+      4(b), as requested.
+ .
+   b) If You Distribute, or Publicly Perform the Work or
+      any Adaptations or Collections, You must, unless a
+      request has been made pursuant to Section 4(a), keep
+      intact all copyright notices for the Work and provide,
+      reasonable to the medium or means You are utilizing: (i)
+      the name of the Original Author (or pseudonym, if
+      applicable) if supplied, and/or if the Original Author
+      and/or Licensor designate another party or parties (e.g.,
+      a sponsor institute, publishing entity, journal) for
+      attribution ("Attribution Parties") in Licensor's
+      copyright notice, terms of service or by other reasonable
+      means, the name of such party or parties; (ii) the title
+      of the Work if supplied; (iii) to the extent reasonably
+      practicable, the URI, if any, that Licensor specifies to
+      be associated with the Work, unless such URI does not
+      refer to the copyright notice or licensing information
+      for the Work; and (iv) , consistent with Section 3(b), in
+      the case of an Adaptation, a credit identifying the use
+      of the Work in the Adaptation (e.g., "French translation
+      of the Work by Original Author," or "Screenplay based on
+      original Work by Original Author"). The credit required
+      by this Section 4 (b) may be implemented in any
+      reasonable manner; provided, however, that in the case of
+      a Adaptation or Collection, at a minimum such credit will
+      appear, if a credit for all contributing authors of the
+      Adaptation or Collection appears, then as part of these
+      credits and in a manner at least as prominent as the
+      credits for the other contributing authors. For the
+      avoidance of doubt, You may only use the credit required
+      by this Section for the purpose of attribution in the
+      manner set out above and, by exercising Your rights under
+      this License, You may not implicitly or explicitly assert
+      or imply any connection with, sponsorship or endorsement
+      by the Original Author, Licensor and/or Attribution
+      Parties, as appropriate, of You or Your use of the Work,
+      without the separate, express prior written permission of
+      the Original Author, Licensor and/or Attribution
+      Parties.
+ .
+   c) Except as otherwise agreed in writing by the Licensor
+      or as may be otherwise permitted by applicable law, if
+      You Reproduce, Distribute or Publicly Perform the Work
+      either by itself or as part of any Adaptations or
+      Collections, You must not distort, mutilate, modify or
+      take other derogatory action in relation to the Work
+      which would be prejudicial to the Original Author's honor
+      or reputation. Licensor agrees that in those
+      jurisdictions (e.g. Japan), in which any exercise of the
+      right granted in Section 3(b) of this License (the right
+      to make Adaptations) would be deemed to be a distortion,
+      mutilation, modification or other derogatory action
+      prejudicial to the Original Author's honor and
+      reputation, the Licensor will waive or not assert, as
+      appropriate, this Section, to the fullest extent
+      permitted by the applicable national law, to enable You
+      to reasonably exercise Your right under Section 3(b) of
+      this License (right to make Adaptations) but not
+      otherwise.
+ .
+ 5.   Representations, Warranties and
+      Disclaimer
+ .
+      UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN
+      WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO
+      REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE
+      WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING,
+      WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+      FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE
+      ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE
+      PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE.
+      SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED
+      WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6.   Limitation on Liability. EXCEPT TO
+      THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL
+      LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY
+      SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY
+      DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK,
+      EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF
+      SUCH DAMAGES.
+ .
+ 7.   Termination
+ .
+   a) This License and the rights granted hereunder will
+      terminate automatically upon any breach by You of the
+      terms of this License. Individuals or entities who have
+      received Adaptations or Collections from You under this
+      License, however, will not have their licenses terminated
+      provided such individuals or entities remain in full
+      compliance with those licenses. Sections 1, 2, 5, 6, 7,
+      and 8 will survive any termination of this License.</li>
+ .
+   b) Subject to the above terms and conditions, the
+      license granted here is perpetual (for the duration of
+      the applicable copyright in the Work). Notwithstanding
+      the above, Licensor reserves the right to release the
+      Work under different license terms or to stop
+      distributing the Work at any time; provided, however that
+      any such election will not serve to withdraw this License
+      (or any other license that has been, or is required to
+      be, granted under the terms of this License), and this
+      License will continue in full force and effect unless
+      terminated as stated above.
+ .
+ 8.   Miscellaneous
+ .
+   a) Each time You Distribute or Publicly Perform the Work
+      or a Collection, the Licensor offers to the recipient a
+      license to the Work on the same terms and conditions as
+      the license granted to You under this License.
+ .
+   b) Each time You Distribute or Publicly Perform an
+      Adaptation, Licensor offers to the recipient a license to
+      the original Work on the same terms and conditions as the
+      license granted to You under this License.
+ .
+   c) If any provision of this License is invalid or
+      unenforceable under applicable law, it shall not affect
+      the validity or enforceability of the remainder of the
+      terms of this License, and without further action by the
+      parties to this agreement, such provision shall be
+      reformed to the minimum extent necessary to make such
+      provision valid and enforceable.
+ .
+   d) No term or provision of this License shall be deemed
+      waived and no breach consented to unless such waiver or
+      consent shall be in writing and signed by the party to be
+      charged with such waiver or consent.
+ .
+   e) This License constitutes the entire agreement between
+      the parties with respect to the Work licensed here. There
+      are no understandings, agreements or representations with
+      respect to the Work not specified here. Licensor shall
+      not be bound by any additional provisions that may appear
+      in any communication from You. This License may not be
+      modified without the mutual written agreement of the
+      Licensor and You.
+ .
+   f) The rights granted under, and the subject matter
+      referenced, in this License were drafted utilizing the
+      terminology of the Berne Convention for the Protection of
+      Literary and Artistic Works (as amended on September 28,
+      1979), the Rome Convention of 1961, the WIPO Copyright
+      Treaty of 1996, the WIPO Performances and Phonograms
+      Treaty of 1996 and the Universal Copyright Convention (as
+      revised on July 24, 1971). These rights and subject
+      matter take effect in the relevant jurisdiction in which
+      the License terms are sought to be enforced according to
+      the corresponding provisions of the implementation of
+      those treaty provisions in the applicable national law.
+      If the standard suite of rights granted under applicable
+      copyright law includes additional rights not granted
+      under this License, such additional rights are deemed to
+      be included in the License; this License is not intended
+      to restrict the license of any rights under applicable
+      law.
+
+License: Expat
+ 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.
+
+License: CC-BY-SA-3.0
+ Creative Commons Attribution-ShareAlike 3.0 Unported
+ .
+ CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
+ LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN
+ ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION
+ ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE
+ INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
+ ITS USE.
+ .
+ License
+ .
+ THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
+ COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
+ COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
+ AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
+ .
+ BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
+ TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
+ BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
+ CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
+ CONDITIONS.
+ .
+ 1. Definitions
+ .
+ a. "Adaptation" means a work based upon the Work, or upon the Work and
+ other pre-existing works, such as a translation, adaptation, derivative
+ work, arrangement of music or other alterations of a literary or
+ artistic work, or phonogram or performance and includes cinematographic
+ adaptations or any other form in which the Work may be recast,
+ transformed, or adapted including in any form recognizably derived from
+ the original, except that a work that constitutes a Collection will not
+ be considered an Adaptation for the purpose of this License. For the
+ avoidance of doubt, where the Work is a musical work, performance or
+ phonogram, the synchronization of the Work in timed-relation with a
+ moving image ("synching") will be considered an Adaptation for the
+ purpose of this License.
+ .
+ b. "Collection" means a collection of literary or artistic works, such
+ as encyclopedias and anthologies, or performances, phonograms or
+ broadcasts, or other works or subject matter other than works listed in
+ Section 1(f) below, which, by reason of the selection and arrangement of
+ their contents, constitute intellectual creations, in which the Work is
+ included in its entirety in unmodified form along with one or more other
+ contributions, each constituting separate and independent works in
+ themselves, which together are assembled into a collective whole. A work
+ that constitutes a Collection will not be considered an Adaptation (as
+ defined below) for the purposes of this License.
+ .
+ c. "Creative Commons Compatible License" means a license that is listed
+ at http://creativecommons.org/compatiblelicenses that has been approved
+ by Creative Commons as being essentially equivalent to this License,
+ including, at a minimum, because that license: (i) contains terms that
+ have the same purpose, meaning and effect as the License Elements of
+ this License; and, (ii) explicitly permits the relicensing of
+ adaptations of works made available under that license under this
+ License or a Creative Commons jurisdiction license with the same License
+ Elements as this License.
+ .
+ d. "Distribute" means to make available to the public the original and
+ copies of the Work or Adaptation, as appropriate, through sale or other
+ transfer of ownership.
+ .
+ e. "License Elements" means the following high-level license attributes
+ as selected by Licensor and indicated in the title of this License:
+ Attribution, ShareAlike.
+ .
+ f. "Licensor" means the individual, individuals, entity or entities that
+ offer(s) the Work under the terms of this License.
+ .
+ g. "Original Author" means, in the case of a literary or artistic work,
+ the individual, individuals, entity or entities who created the Work or
+ if no individual or entity can be identified, the publisher; and in
+ addition (i) in the case of a performance the actors, singers,
+ musicians, dancers, and other persons who act, sing, deliver, declaim,
+ play in, interpret or otherwise perform literary or artistic works or
+ expressions of folklore; (ii) in the case of a phonogram the producer
+ being the person or legal entity who first fixes the sounds of a
+ performance or other sounds; and, (iii) in the case of broadcasts, the
+ organization that transmits the broadcast.
+ .
+ h. "Work" means the literary and/or artistic work offered under the
+ terms of this License including without limitation any production in the
+ literary, scientific and artistic domain, whatever may be the mode or
+ form of its expression including digital form, such as a book, pamphlet
+ and other writing; a lecture, address, sermon or other work of the same
+ nature; a dramatic or dramatico-musical work; a choreographic work or
+ entertainment in dumb show; a musical composition with or without words;
+ a cinematographic work to which are assimilated works expressed by a
+ process analogous to cinematography; a work of drawing, painting,
+ architecture, sculpture, engraving or lithography; a photographic work
+ to which are assimilated works expressed by a process analogous to
+ photography; a work of applied art; an illustration, map, plan, sketch
+ or three-dimensional work relative to geography, topography,
+ architecture or science; a performance; a broadcast; a phonogram; a
+ compilation of data to the extent it is protected as a copyrightable
+ work; or a work performed by a variety or circus performer to the extent
+ it is not otherwise considered a literary or artistic work.
+ .
+ i. "You" means an individual or entity exercising rights under this
+ License who has not previously violated the terms of this License with
+ respect to the Work, or who has received express permission from the
+ Licensor to exercise rights under this License despite a previous
+ violation.
+ .
+ j. "Publicly Perform" means to perform public recitations of the Work
+ and to communicate to the public those public recitations, by any means
+ or process, including by wire or wireless means or public digital
+ performances; to make available to the public Works in such a way that
+ members of the public may access these Works from a place and at a place
+ individually chosen by them; to perform the Work to the public by any
+ means or process and the communication to the public of the performances
+ of the Work, including by public digital performance; to broadcast and
+ rebroadcast the Work by any means including signs, sounds or images.
+ .
+ k. "Reproduce" means to make copies of the Work by any means including
+ without limitation by sound or visual recordings and the right of
+ fixation and reproducing fixations of the Work, including storage of a
+ protected performance or phonogram in digital form or other electronic
+ medium.
+ .
+ 2. Fair Dealing Rights. Nothing in this License is intended to reduce,
+ limit, or restrict any uses free from copyright or rights arising from
+ limitations or exceptions that are provided for in connection with the
+ copyright protection under copyright law or other applicable laws.
+ .
+ 3. License Grant. Subject to the terms and conditions of this License,
+ Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
+ perpetual (for the duration of the applicable copyright) license to
+ exercise the rights in the Work as stated below:
+ .
+ a. to Reproduce the Work, to incorporate the Work into one or more
+ Collections, and to Reproduce the Work as incorporated in the
+ Collections;
+ .
+ b. to create and Reproduce Adaptations provided that any such
+ Adaptation, including any translation in any medium, takes reasonable
+ steps to clearly label, demarcate or otherwise identify that changes
+ were made to the original Work. For example, a translation could be
+ marked "The original work was translated from English to Spanish," or a
+ modification could indicate "The original work has been modified.";
+ .
+ c. to Distribute and Publicly Perform the Work including as incorporated
+ in Collections; and,
+ .
+ d. to Distribute and Publicly Perform Adaptations.
+ .
+ e. For the avoidance of doubt:
+ .
+ i. Non-waivable Compulsory License Schemes. In those jurisdictions in
+ which the right to collect royalties through any statutory or compulsory
+ licensing scheme cannot be waived, the Licensor reserves the exclusive
+ right to collect such royalties for any exercise by You of the rights
+ granted under this License;
+ .
+ ii. Waivable Compulsory License Schemes. In those jurisdictions in which
+ the right to collect royalties through any statutory or compulsory
+ licensing scheme can be waived, the Licensor waives the exclusive right
+ to collect such royalties for any exercise by You of the rights granted
+ under this License; and,
+ .
+ iii. Voluntary License Schemes. The Licensor waives the right to collect
+ royalties, whether individually or, in the event that the Licensor is a
+ member of a collecting society that administers voluntary licensing
+ schemes, via that society, from any exercise by You of the rights
+ granted under this License.
+ .
+ The above rights may be exercised in all media and formats whether now
+ known or hereafter devised. The above rights include the right to make
+ such modifications as are technically necessary to exercise the rights
+ in other media and formats. Subject to Section 8(f), all rights not
+ expressly granted by Licensor are hereby reserved.
+ .
+ 4. Restrictions. The license granted in Section 3 above is expressly
+ made subject to and limited by the following restrictions:
+ .
+ a. You may Distribute or Publicly Perform the Work only under the terms
+ of this License. You must include a copy of, or the Uniform Resource
+ Identifier (URI) for, this License with every copy of the Work You
+ Distribute or Publicly Perform. You may not offer or impose any terms on
+ the Work that restrict the terms of this License or the ability of the
+ recipient of the Work to exercise the rights granted to that recipient
+ under the terms of the License. You may not sublicense the Work. You
+ must keep intact all notices that refer to this License and to the
+ disclaimer of warranties with every copy of the Work You Distribute or
+ Publicly Perform. When You Distribute or Publicly Perform the Work, You
+ may not impose any effective technological measures on the Work that
+ restrict the ability of a recipient of the Work from You to exercise the
+ rights granted to that recipient under the terms of the License. This
+ Section 4(a) applies to the Work as incorporated in a Collection, but
+ this does not require the Collection apart from the Work itself to be
+ made subject to the terms of this License. If You create a Collection,
+ upon notice from any Licensor You must, to the extent practicable,
+ remove from the Collection any credit as required by Section 4(c), as
+ requested. If You create an Adaptation, upon notice from any Licensor
+ You must, to the extent practicable, remove from the Adaptation any
+ credit as required by Section 4(c), as requested.
+ .
+ b. You may Distribute or Publicly Perform an Adaptation only under the
+ terms of: (i) this License; (ii) a later version of this License with
+ the same License Elements as this License; (iii) a Creative Commons
+ jurisdiction license (either this or a later license version) that
+ contains the same License Elements as this License (e.g.,
+ Attribution-ShareAlike 3.0 US)); (iv) a Creative Commons Compatible
+ License. If you license the Adaptation under one of the licenses
+ mentioned in (iv), you must comply with the terms of that license. If
+ you license the Adaptation under the terms of any of the licenses
+ mentioned in (i), (ii) or (iii) (the "Applicable License"), you must
+ comply with the terms of the Applicable License generally and the
+ following provisions: (I) You must include a copy of, or the URI for,
+ the Applicable License with every copy of each Adaptation You Distribute
+ or Publicly Perform; (II) You may not offer or impose any terms on the
+ Adaptation that restrict the terms of the Applicable License or the
+ ability of the recipient of the Adaptation to exercise the rights
+ granted to that recipient under the terms of the Applicable License;
+ (III) You must keep intact all notices that refer to the Applicable
+ License and to the disclaimer of warranties with every copy of the Work
+ as included in the Adaptation You Distribute or Publicly Perform; (IV)
+ when You Distribute or Publicly Perform the Adaptation, You may not
+ impose any effective technological measures on the Adaptation that
+ restrict the ability of a recipient of the Adaptation from You to
+ exercise the rights granted to that recipient under the terms of the
+ Applicable License. This Section 4(b) applies to the Adaptation as
+ incorporated in a Collection, but this does not require the Collection
+ apart from the Adaptation itself to be made subject to the terms of the
+ Applicable License.
+ .
+ c. If You Distribute, or Publicly Perform the Work or any Adaptations or
+ Collections, You must, unless a request has been made pursuant to
+ Section 4(a), keep intact all copyright notices for the Work and
+ provide, reasonable to the medium or means You are utilizing: (i) the
+ name of the Original Author (or pseudonym, if applicable) if supplied,
+ and/or if the Original Author and/or Licensor designate another party or
+ parties (e.g., a sponsor institute, publishing entity, journal) for
+ attribution ("Attribution Parties") in Licensor's copyright notice,
+ terms of service or by other reasonable means, the name of such party or
+ parties; (ii) the title of the Work if supplied; (iii) to the extent
+ reasonably practicable, the URI, if any, that Licensor specifies to be
+ associated with the Work, unless such URI does not refer to the
+ copyright notice or licensing information for the Work; and (iv) ,
+ consistent with Ssection 3(b), in the case of an Adaptation, a credit
+ identifying the use of the Work in the Adaptation (e.g., "French
+ translation of the Work by Original Author," or "Screenplay based on
+ original Work by Original Author"). The credit required by this Section
+ 4(c) may be implemented in any reasonable manner; provided, however,
+ that in the case of a Adaptation or Collection, at a minimum such credit
+ will appear, if a credit for all contributing authors of the Adaptation
+ or Collection appears, then as part of these credits and in a manner at
+ least as prominent as the credits for the other contributing authors.
+ For the avoidance of doubt, You may only use the credit required by this
+ Section for the purpose of attribution in the manner set out above and,
+ by exercising Your rights under this License, You may not implicitly or
+ explicitly assert or imply any connection with, sponsorship or
+ endorsement by the Original Author, Licensor and/or Attribution Parties,
+ as appropriate, of You or Your use of the Work, without the separate,
+ express prior written permission of the Original Author, Licensor and/or
+ Attribution Parties.
+ .
+ d. Except as otherwise agreed in writing by the Licensor or as may be
+ otherwise permitted by applicable law, if You Reproduce, Distribute or
+ Publicly Perform the Work either by itself or as part of any Adaptations
+ or Collections, You must not distort, mutilate, modify or take other
+ derogatory action in relation to the Work which would be prejudicial to
+ the Original Author's honor or reputation. Licensor agrees that in those
+ jurisdictions (e.g. Japan), in which any exercise of the right granted
+ in Section 3(b) of this License (the right to make Adaptations) would be
+ deemed to be a distortion, mutilation, modification or other derogatory
+ action prejudicial to the Original Author's honor and reputation, the
+ Licensor will waive or not assert, as appropriate, this Section, to the
+ fullest extent permitted by the applicable national law, to enable You
+ to reasonably exercise Your right under Section 3(b) of this License
+ (right to make Adaptations) but not otherwise.
+ .
+ 5. Representations, Warranties and Disclaimer
+ .
+ UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
+ OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
+ KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
+ INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
+ LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
+ WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE
+ EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
+ .
+ 6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
+ LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
+ ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
+ ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
+ BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ .
+ 7. Termination
+ .
+ a. This License and the rights granted hereunder will terminate
+ automatically upon any breach by You of the terms of this License.
+ Individuals or entities who have received Adaptations or Collections
+ from You under this License, however, will not have their licenses
+ terminated provided such individuals or entities remain in full
+ compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
+ survive any termination of this License.
+ .
+ b. Subject to the above terms and conditions, the license granted here
+ is perpetual (for the duration of the applicable copyright in the Work).
+ Notwithstanding the above, Licensor reserves the right to release the
+ Work under different license terms or to stop distributing the Work at
+ any time; provided, however that any such election will not serve to
+ withdraw this License (or any other license that has been, or is
+ required to be, granted under the terms of this License), and this
+ License will continue in full force and effect unless terminated as
+ stated above.
+ .
+ 8. Miscellaneous
+ .
+ a. Each time You Distribute or Publicly Perform the Work or a
+ Collection, the Licensor offers to the recipient a license to the Work
+ on the same terms and conditions as the license granted to You under
+ this License.
+ .
+ b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
+ offers to the recipient a license to the original Work on the same terms
+ and conditions as the license granted to You under this License.
+ .
+ c. If any provision of this License is invalid or unenforceable under
+ applicable law, it shall not affect the validity or enforceability of
+ the remainder of the terms of this License, and without further action
+ by the parties to this agreement, such provision shall be reformed to
+ the minimum extent necessary to make such provision valid and
+ enforceable.
+ .
+ d. No term or provision of this License shall be deemed waived and no
+ breach consented to unless such waiver or consent shall be in writing
+ and signed by the party to be charged with such waiver or consent.
+ .
+ e. This License constitutes the entire agreement between the parties
+ with respect to the Work licensed here. There are no understandings,
+ agreements or representations with respect to the Work not specified
+ here. Licensor shall not be bound by any additional provisions that may
+ appear in any communication from You. This License may not be modified
+ without the mutual written agreement of the Licensor and You.
+ .
+ f. The rights granted under, and the subject matter referenced, in this
+ License were drafted utilizing the terminology of the Berne Convention
+ for the Protection of Literary and Artistic Works (as amended on
+ September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
+ Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
+ the Universal Copyright Convention (as revised on July 24, 1971). These
+ rights and subject matter take effect in the relevant jurisdiction in
+ which the License terms are sought to be enforced according to the
+ corresponding provisions of the implementation of those treaty
+ provisions in the applicable national law. If the standard suite of
+ rights granted under applicable copyright law includes additional rights
+ not granted under this License, such additional rights are deemed to be
+ included in the License; this License is not intended to restrict the
+ license of any rights under applicable law.
+ .
+ Creative Commons Notice
+ .
+ Creative Commons is not a party to this License, and makes no warranty
+ whatsoever in connection with the Work. Creative Commons will not be
+ liable to You or any party on any legal theory for any damages
+ whatsoever, including without limitation any general, special,
+ incidental or consequential damages arising in connection to this
+ license. Notwithstanding the foregoing two (2) sentences, if Creative
+ Commons has expressly identified itself as the Licensor hereunder, it
+ shall have all rights and obligations of Licensor.
+ .
+ Except for the limited purpose of indicating to the public that the Work
+ is licensed under the CCPL, Creative Commons does not authorize the use
+ by either party of the trademark "Creative Commons" or any related
+ trademark or logo of Creative Commons without the prior written consent
+ of Creative Commons. Any permitted use will be in compliance with
+ Creative Commons' then-current trademark usage guidelines, as may be
+ published on its website or otherwise made available upon request from
+ time to time. For the avoidance of doubt, this trademark restriction
+ does not form part of the License.
+ .
+ Creative Commons may be contacted at http://creativecommons.org/.
diff -Nru tiled-qt-1.2.1+dfsg.1/debian/watch tiled-qt-1.2.4+dfsg.1/debian/watch
--- tiled-qt-1.2.1+dfsg.1/debian/watch	2018-11-27 20:31:39.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/debian/watch	2019-07-07 17:25:13.000000000 +0000
@@ -1,4 +1,4 @@
-version=3
+version=4
 #http://sf.net/tiled/tiled-qt-(.*)\.tar\.gz debian uupdate
 opts="filenamemangle=s/(?:.*\/)?v?(\d[\d\.]*)\.tar\.gz/tiled-qt-$1.tar.gz/, repacksuffix=+dfsg.1, dversionmangle=auto" \
  https://github.com/bjorn/tiled/tags (?:.*/)?v?(\d[\d\.]*)\.tar\.gz debian uupdate
diff -Nru tiled-qt-1.2.1+dfsg.1/dist/copr/tiled.spec tiled-qt-1.2.4+dfsg.1/dist/copr/tiled.spec
--- tiled-qt-1.2.1+dfsg.1/dist/copr/tiled.spec	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/dist/copr/tiled.spec	2019-05-15 15:33:52.000000000 +0000
@@ -166,6 +166,7 @@
 # Core plugins
 %{_libdir}/%{name}/plugins/libcsv.so
 %{_libdir}/%{name}/plugins/libjson.so
+%{_libdir}/%{name}/plugins/libjson1.so
 %{_libdir}/%{name}/plugins/liblua.so
 
 %{_mandir}/man1/automappingconverter.1*
diff -Nru tiled-qt-1.2.1+dfsg.1/dist/linux/setup-qbs.sh tiled-qt-1.2.4+dfsg.1/dist/linux/setup-qbs.sh
--- tiled-qt-1.2.1+dfsg.1/dist/linux/setup-qbs.sh	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/dist/linux/setup-qbs.sh	2019-05-15 15:33:52.000000000 +0000
@@ -3,6 +3,9 @@
     CXX=g++
 fi
 
+# - Not using Qbs 1.12.0, 1.12.1 or 1.12.2 because of a false "Duplicate source file" error (QBS-1416)
+# - Make sure not to build against Qt 5.12 to avoid build issues on macOS (QBS-1417)
+
 git clone --depth 1 -b v1.11.1 git://code.qt.io/qbs/qbs.git qbs-build
 pushd qbs-build
 qmake -r qbs.pro QMAKE_CXX=$CXX QMAKE_LINK=$CXX \
diff -Nru tiled-qt-1.2.1+dfsg.1/dist/win/installer.wxs tiled-qt-1.2.4+dfsg.1/dist/win/installer.wxs
--- tiled-qt-1.2.1+dfsg.1/dist/win/installer.wxs	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/dist/win/installer.wxs	2019-05-15 15:33:52.000000000 +0000
@@ -140,6 +140,7 @@
                 <File Id="filD34235A8BFB590E5CCC1D9E2894616EC" Source="$(var.InstallRoot)\plugins\tiled\flare.dll" />
                 <File Id="gmx_dll" Source="$(var.InstallRoot)\plugins\tiled\gmx.dll" />
                 <File Id="fil39697F4D8941F23FE8E9024568D7FAD6" Source="$(var.InstallRoot)\plugins\tiled\json.dll" />
+                <File Id="json1_dll" Source="$(var.InstallRoot)\plugins\tiled\json1.dll" />
                 <File Id="fil4D119D1A1F54B04C4EB7C3E1B25B1616" Source="$(var.InstallRoot)\plugins\tiled\lua.dll" />
 
                 <?ifdef Python ?>
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/conf.py tiled-qt-1.2.4+dfsg.1/docs/conf.py
--- tiled-qt-1.2.1+dfsg.1/docs/conf.py	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/conf.py	2019-05-15 15:33:52.000000000 +0000
@@ -47,7 +47,7 @@
 
 # General information about the project.
 project = 'Tiled'
-copyright = '2017, Tiled Documentation Writers'
+copyright = '2019, Tiled Documentation Writers'
 author = 'Thorbjørn Lindeijer'
 
 # The version info for the project you're documenting, acts as replacement for
@@ -57,7 +57,7 @@
 # The short X.Y version.
 version = '1.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.2.0'
+release = '1.2.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/de/LC_MESSAGES/index.po tiled-qt-1.2.4+dfsg.1/docs/locale/de/LC_MESSAGES/index.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/de/LC_MESSAGES/index.po	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/de/LC_MESSAGES/index.po	2019-05-15 15:33:52.000000000 +0000
@@ -8,16 +8,16 @@
 "Project-Id-Version: Tiled 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-21 14:31+0100\n"
-"PO-Revision-Date: 2017-12-29 20:18+0000\n"
-"Last-Translator: Edgar Minderlin <edgar.minderlin@web.de>\n"
-"Language-Team: German <https://hosted.weblate.org/projects/tiled"
-"/documentation-index/de/>\n"
+"PO-Revision-Date: 2018-12-09 01:09+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/tiled/"
+"documentation-index/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.19-dev\n"
+"X-Generator: Weblate 3.4-dev\n"
 "Generated-By: Babel 2.5.1\n"
 
 #: ../../index.rst:2
@@ -31,7 +31,7 @@
 "<http://discourse.mapeditor.org>`_."
 msgstr ""
 "Wenn Sie nicht gefunden haben wonach Sie suchen, zögern Sie bitte nicht im `"
-"Tiled Forum <http://discourse.mapeditor.org>`_ nachzufragen. "
+"Tiled Forum <http://discourse.mapeditor.org>`_ nachzufragen."
 
 #: ../../index.rst:8
 msgid "User Manual"
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/de/LC_MESSAGES/reference.po tiled-qt-1.2.4+dfsg.1/docs/locale/de/LC_MESSAGES/reference.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/de/LC_MESSAGES/reference.po	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/de/LC_MESSAGES/reference.po	2019-05-15 15:33:52.000000000 +0000
@@ -8,8 +8,8 @@
 "Project-Id-Version: Tiled 1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2017-12-21 14:31+0100\n"
-"PO-Revision-Date: 2018-06-20 20:38+0000\n"
-"Last-Translator: nimradium <nimra242001@gmail.com>\n"
+"PO-Revision-Date: 2019-01-05 08:07+0000\n"
+"Last-Translator: JuKuSoft.com <info@jukusoft.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/tiled/reference/"
 "de/>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.1-dev\n"
+"X-Generator: Weblate 3.4-dev\n"
 "Generated-By: Babel 2.5.1\n"
 
 #: ../../reference/json-map-format.rst:2
@@ -46,7 +46,7 @@
 
 #: ../../reference/json-map-format.rst:14
 msgid "Map"
-msgstr ""
+msgstr "Karte"
 
 #: ../../reference/json-map-format.rst:17
 #: ../../reference/json-map-format.rst:82
@@ -55,7 +55,7 @@
 #: ../../reference/json-map-format.rst:453
 #: ../../reference/json-map-format.rst:493
 msgid "Field"
-msgstr ""
+msgstr "Feld"
 
 #: ../../reference/json-map-format.rst:17
 #: ../../reference/json-map-format.rst:82
@@ -94,17 +94,17 @@
 #: ../../reference/json-map-format.rst:417
 #: ../../reference/json-map-format.rst:495
 msgid "string"
-msgstr ""
+msgstr "Zeichenkette"
 
 #: ../../reference/json-map-format.rst:19
 msgid "Hex-formatted color (#RRGGBB or #AARRGGBB) (optional)"
-msgstr ""
+msgstr "Hex-formatierte Farbe (#RRGGBB or #AARRGGBB) (optional)"
 
 #: ../../reference/json-map-format.rst:21
 #: ../../reference/json-map-format.rst:88
 #: ../../reference/json-map-format.rst:166
 msgid "height"
-msgstr ""
+msgstr "Höhe"
 
 #: ../../reference/json-map-format.rst:21
 #: ../../reference/json-map-format.rst:27
@@ -133,15 +133,15 @@
 #: ../../reference/json-map-format.rst:415
 #: ../../reference/json-map-format.rst:497
 msgid "int"
-msgstr ""
+msgstr "Ganzzahl (int)"
 
 #: ../../reference/json-map-format.rst:21
 msgid "Number of tile rows"
-msgstr ""
+msgstr "Anzahl der Tiles-Zeilen"
 
 #: ../../reference/json-map-format.rst:23
 msgid "infinite"
-msgstr ""
+msgstr "unendlich"
 
 #: ../../reference/json-map-format.rst:23
 #: ../../reference/json-map-format.rst:102
@@ -149,16 +149,16 @@
 #: ../../reference/json-map-format.rst:172
 #: ../../reference/json-map-format.rst:186
 msgid "bool"
-msgstr ""
+msgstr "Boolean (wahr/falsch)"
 
 #: ../../reference/json-map-format.rst:23
 msgid "Whether the map has infinite dimensions"
-msgstr ""
+msgstr "Ob die Karte unendliche Dimensionen hat"
 
 #: ../../reference/json-map-format.rst:25
 #: ../../reference/json-map-format.rst:90
 msgid "layers"
-msgstr ""
+msgstr "Layer"
 
 #: ../../reference/json-map-format.rst:25
 #: ../../reference/json-map-format.rst:40
@@ -168,7 +168,7 @@
 #: ../../reference/json-map-format.rst:402
 #: ../../reference/json-map-format.rst:455
 msgid "array"
-msgstr ""
+msgstr "Array"
 
 #: ../../reference/json-map-format.rst:25
 msgid "Array of :ref:`layers <json-layer>`"
@@ -184,7 +184,7 @@
 
 #: ../../reference/json-map-format.rst:29
 msgid "orientation"
-msgstr ""
+msgstr "Ausrichtung"
 
 #: ../../reference/json-map-format.rst:29
 msgid "``orthogonal``, ``isometric``, ``staggered`` or ``hexagonal``"
@@ -221,7 +221,7 @@
 
 #: ../../reference/json-map-format.rst:34
 msgid "renderorder"
-msgstr ""
+msgstr "Zeichenreihenfolge"
 
 #: ../../reference/json-map-format.rst:34
 msgid "Rendering direction (orthogonal maps only)"
@@ -238,7 +238,7 @@
 #: ../../reference/json-map-format.rst:38
 #: ../../reference/json-map-format.rst:406
 msgid "tileheight"
-msgstr ""
+msgstr "Tile-Höhe"
 
 #: ../../reference/json-map-format.rst:38
 msgid "Map grid height"
@@ -246,7 +246,7 @@
 
 #: ../../reference/json-map-format.rst:40
 msgid "tilesets"
-msgstr ""
+msgstr "Tilesets"
 
 #: ../../reference/json-map-format.rst:40
 msgid "Array of :ref:`tilesets <json-tileset>`"
@@ -255,7 +255,7 @@
 #: ../../reference/json-map-format.rst:42
 #: ../../reference/json-map-format.rst:415
 msgid "tilewidth"
-msgstr ""
+msgstr "Tile-Breite"
 
 #: ../../reference/json-map-format.rst:42
 msgid "Map grid width"
@@ -266,7 +266,7 @@
 #: ../../reference/json-map-format.rst:184
 #: ../../reference/json-map-format.rst:417
 msgid "type"
-msgstr ""
+msgstr "Typ"
 
 #: ../../reference/json-map-format.rst:44
 msgid "``map`` (since 1.0)"
@@ -274,21 +274,21 @@
 
 #: ../../reference/json-map-format.rst:46
 msgid "version"
-msgstr ""
+msgstr "Version"
 
 #: ../../reference/json-map-format.rst:46
 msgid "number"
-msgstr ""
+msgstr "Nummer"
 
 #: ../../reference/json-map-format.rst:46
 msgid "The JSON format version"
-msgstr ""
+msgstr "Die JSON-formatierte Version"
 
 #: ../../reference/json-map-format.rst:48
 #: ../../reference/json-map-format.rst:104
 #: ../../reference/json-map-format.rst:188
 msgid "width"
-msgstr ""
+msgstr "Breite"
 
 #: ../../reference/json-map-format.rst:48
 msgid "Number of tile columns"
@@ -296,15 +296,15 @@
 
 #: ../../reference/json-map-format.rst:52
 msgid "Map Example"
-msgstr ""
+msgstr "Beispielkarte"
 
 #: ../../reference/json-map-format.rst:79
 msgid "Layer"
-msgstr ""
+msgstr "Ebene"
 
 #: ../../reference/json-map-format.rst:84
 msgid "data"
-msgstr ""
+msgstr "Daten"
 
 #: ../../reference/json-map-format.rst:84
 msgid "Array of GIDs. ``tilelayer`` only."
@@ -312,7 +312,7 @@
 
 #: ../../reference/json-map-format.rst:86
 msgid "draworder"
-msgstr ""
+msgstr "Zeichenreihenfolge"
 
 #: ../../reference/json-map-format.rst:86
 msgid "``topdown`` (default) or ``index``. ``objectgroup`` only."
@@ -331,11 +331,11 @@
 #: ../../reference/json-map-format.rst:394
 #: ../../reference/json-map-format.rst:495
 msgid "name"
-msgstr ""
+msgstr "Name"
 
 #: ../../reference/json-map-format.rst:92
 msgid "Name assigned to this layer"
-msgstr ""
+msgstr "Name der dieser Ebene zugeordnet ist"
 
 #: ../../reference/json-map-format.rst:94
 msgid "objects"
@@ -356,7 +356,7 @@
 
 #: ../../reference/json-map-format.rst:96
 msgid "Value between 0 and 1"
-msgstr ""
+msgstr "Wert zwischen 0 und 1"
 
 #: ../../reference/json-map-format.rst:98
 msgid "string key-value pairs."
@@ -377,12 +377,12 @@
 
 #: ../../reference/json-map-format.rst:104
 msgid "Column count. Same as map width for fixed-size maps."
-msgstr ""
+msgstr "Spaltenanzahl. Selber Wert wie die Kartenbreite für feste Mapgrößen."
 
 #: ../../reference/json-map-format.rst:106
 #: ../../reference/json-map-format.rst:190
 msgid "x"
-msgstr ""
+msgstr "x"
 
 #: ../../reference/json-map-format.rst:106
 msgid "Horizontal layer offset in tiles. Always 0."
@@ -407,7 +407,7 @@
 
 #: ../../reference/json-map-format.rst:157
 msgid "Object"
-msgstr ""
+msgstr "Objekt"
 
 #: ../../reference/json-map-format.rst:162
 msgid "ellipse"
@@ -431,7 +431,7 @@
 
 #: ../../reference/json-map-format.rst:168
 msgid "id"
-msgstr ""
+msgstr "ID"
 
 #: ../../reference/json-map-format.rst:168
 msgid "Incremental id - unique across all objects"
@@ -443,7 +443,7 @@
 
 #: ../../reference/json-map-format.rst:172
 msgid "point"
-msgstr ""
+msgstr "Punkt"
 
 #: ../../reference/json-map-format.rst:172
 msgid "Used to mark an object as a point"
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/id/LC_MESSAGES/index.po tiled-qt-1.2.4+dfsg.1/docs/locale/id/LC_MESSAGES/index.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/id/LC_MESSAGES/index.po	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/id/LC_MESSAGES/index.po	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2017, Tiled Documentation Writers
+# This file is distributed under the same license as the Tiled package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tiled 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-21 14:31+0100\n"
+"PO-Revision-Date: 2019-01-05 08:07+0000\n"
+"Last-Translator: Evelyn Mahasin <emahasin@outlook.com>\n"
+"Language-Team: Indonesian <https://hosted.weblate.org/projects/tiled/"
+"documentation-index/id/>\n"
+"Language: id\n"
+"MIME-Version: 1.0\n"
+"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"
+
+#: ../../index.rst:2
+msgid "Tiled Documentation"
+msgstr "Dokumentasi Tiled"
+
+#: ../../index.rst:5
+msgid "If you're not finding what you're looking for in these pages, please don't hesitate to ask questions on the `Tiled Forum <http://discourse.mapeditor.org>`_."
+msgstr ""
+"Jika anda tidak bisa menemukan jawaban dari pertanyaan anda, jangan sungkan "
+"untuk bertanya di `Forum Tiled <http://discourse.mapeditor.org>`_."
+
+#: ../../index.rst:8
+msgid "User Manual"
+msgstr "Buku Panduan"
+
+#: ../../index.rst:29
+msgid "Reference"
+msgstr ""
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/index.po tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/index.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/index.po	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/index.po	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2017, Tiled Documentation Writers
+# This file is distributed under the same license as the Tiled package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tiled 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-21 14:31+0100\n"
+"PO-Revision-Date: 2019-01-21 00:21+0000\n"
+"Last-Translator: Louies <louies0623@gmail.com>\n"
+"Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
+"tiled/documentation-index/zh_Hant/>\n"
+"Language: zh_Hant\n"
+"MIME-Version: 1.0\n"
+"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"
+
+#: ../../index.rst:2
+msgid "Tiled Documentation"
+msgstr "Tiled 文檔"
+
+#: ../../index.rst:5
+msgid "If you're not finding what you're looking for in these pages, please don't hesitate to ask questions on the `Tiled Forum <http://discourse.mapeditor.org>`_."
+msgstr ""
+"如果你在這些頁面中找不到你要找的東西，請不要猶豫，在 \"Tiled 論壇 <http://discourse.mapeditor.org>\"_ "
+"上提問。"
+
+#: ../../index.rst:8
+msgid "User Manual"
+msgstr "使用者手冊"
+
+#: ../../index.rst:29
+msgid "Reference"
+msgstr "參考"
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/manual.po tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/manual.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/manual.po	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/manual.po	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,3181 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2017, Tiled Documentation Writers
+# This file is distributed under the same license as the Tiled package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tiled 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-21 14:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_Hant\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../manual/automapping.rst:3
+msgid "Automapping"
+msgstr ""
+
+#: ../../manual/automapping.rst:6
+msgid "What is Automapping?"
+msgstr ""
+
+#: ../../manual/automapping.rst:8
+msgid "Automapping is an advanced tool to automatically search certain combinations of tiles across layers in a map and to replace these parts by other combination. This allows the user to draw structures with a minimum of time spent and the Automapping will be able to generate a rather complex scenario, which would need lots more time if manually crafted."
+msgstr ""
+
+#: ../../manual/automapping.rst:15
+msgid "So the goal of Automapping is that you only need to draw within one layer and everything else is setup for you. This brings some advantages:"
+msgstr ""
+
+#: ../../manual/automapping.rst:18
+msgid "**Working speed** - you need less time to setup a map."
+msgstr ""
+
+#: ../../manual/automapping.rst:19
+msgid "**Less errors** - the main reason is to reduce the error rate. If you have setup the rules properly, there is no hidden error."
+msgstr ""
+
+#: ../../manual/automapping.rst:23
+msgid "External Links"
+msgstr ""
+
+#: ../../manual/automapping.rst:25
+msgid "`Automapping explained for Tiled 0.9 and later (YouTube) <http://www.youtube.com/watch?v=UUi0lD1pxyQ>`__"
+msgstr ""
+
+#: ../../manual/automapping.rst:26
+msgid "`Examples on Automapping <https://github.com/stefanbeller/tiled_examples>`__"
+msgstr ""
+
+#: ../../manual/automapping.rst:27
+msgid "`Tiled Map Editor Tutorial Part Three: AutoMap (YouTube) <https://youtu.be/A_A6rz7cvG4>`__"
+msgstr ""
+
+#: ../../manual/automapping.rst:31
+msgid "Setting it Up"
+msgstr ""
+
+#: ../../manual/automapping.rst:33
+msgid "The Automapping feature is looking for a text file called 'rules.txt' in the folder where the current map is located. Each line in this text file is either"
+msgstr ""
+
+#: ../../manual/automapping.rst:37
+msgid "a path to a **rulefile**"
+msgstr ""
+
+#: ../../manual/automapping.rst:38
+msgid "or a path to another textfile which has the same syntax (i.e. in another directory)"
+msgstr ""
+
+#: ../../manual/automapping.rst:40
+msgid "or is a comment which is indicated by **#** or **//**"
+msgstr ""
+
+#: ../../manual/automapping.rst:42
+msgid "A **rulefile** is a standard map file, which can be read and written by tiled (\\*.tmx). In one rulefile there can be defined multiple rules."
+msgstr ""
+
+#: ../../manual/automapping.rst:45
+msgid "An automapping **rulefile** consists of 4 major parts:"
+msgstr ""
+
+#: ../../manual/automapping.rst:47
+msgid "The definition of regions describes which locations of the rulemap are actually used to create Automapping rules."
+msgstr ""
+
+#: ../../manual/automapping.rst:49
+msgid "The definition of inputs describes which kind of pattern the working map will be searched for."
+msgstr ""
+
+#: ../../manual/automapping.rst:51
+msgid "The definition of outputs describes how the working map is changed when an input pattern is found."
+msgstr ""
+
+#: ../../manual/automapping.rst:53
+msgid "The map properties are used to fine-tune the input pattern localization and the output of all rules within this rules file."
+msgstr ""
+
+#: ../../manual/automapping.rst:57
+msgid "Defining the Regions"
+msgstr ""
+
+#: ../../manual/automapping.rst:59
+msgid "There must be either a tile layer called **regions** or there must be the both tile layers **regions\\_input** and **regions\\_output**. Using the **regions** layer, the region defined for input and output is the same. Using the different layers **regions\\_input** and **regions\\_output** delivers the possibility to have different regions for the input section and the output section. The region layer(s) are only used to mark regions, where an Automapping rule exists. Therefore it does not matter which tiles are used in this layer, since these tiles are just used to define a region. So either use any tile or no tile at a coordinate to indicate if that coordinate belongs to a rule or if it doesn't."
+msgstr ""
+
+#: ../../manual/automapping.rst:70
+msgid "If multiple rules are defined in one rulemap file, the regions must not be adjacent. That means there must be at least one tile of unused space in between two rules. If the regions are adjacent (coherent) then both regions are interpreted as one rule."
+msgstr ""
+
+#: ../../manual/automapping.rst:76
+msgid "Multiple Rules in One Rulefile"
+msgstr ""
+
+#: ../../manual/automapping.rst:78
+msgid "Of course multiple rules are possible in one rulemap. If you want to have the rules applied in a certain sequence, you should use multiple **rulefiles** and define the sequence within the **rules.txt** file. As of now there also is a certain sequence within one rulemapfile. Generally speaking the regions with small y value come first. If there are regions at the same y value, then the x value is taken into account. On orthogonal maps this ordering scheme is the same as for reading in most western countries. (Left to right, top to down). The order within one rulemap may be changed later, once tiled is capable of utilizing multiple threads/processors. So if you want to rely on a certain sequence, use different rulemaps and order these in the rules.txt"
+msgstr ""
+
+#: ../../manual/automapping.rst:91
+msgid "Definition of Inputs"
+msgstr ""
+
+#: ../../manual/automapping.rst:93
+msgid "Inputs are generally defined by tile layers which name follows this scheme:"
+msgstr ""
+
+#: ../../manual/automapping.rst:96
+msgid "**input[not][index]\\_name**"
+msgstr ""
+
+#: ../../manual/automapping.rst:98
+msgid "where the **[not]** and **[index]** are optional. After the first underscore there will be the name of the input layer. The input layer name can of course include more underscores."
+msgstr ""
+
+#: ../../manual/automapping.rst:102
+msgid "The **name** determines which layer on the working map is examined. So for example the layer *input\\_Ground* will check the layer called *Ground* in the working map for this rule. *input\\_test\\_case* will check the layer *test\\_case* in the working map for this rule."
+msgstr ""
+
+#: ../../manual/automapping.rst:107
+msgid "Multiple layers having the same name and index is explicitly allowed and is intended. Having multiple layers of the same name and index , will allow you to define different possible tiles per coordinate as input."
+msgstr ""
+
+#: ../../manual/automapping.rst:111
+msgid "The index is used to create complete different input conditions. All layers having the same index are taken into account for forming one condition. Each of these conditions are checked individually."
+msgstr ""
+
+#: ../../manual/automapping.rst:115
+msgid "index must not contain an underscore."
+msgstr ""
+
+#: ../../manual/automapping.rst:116
+msgid "index must not start with *not*"
+msgstr ""
+
+#: ../../manual/automapping.rst:117
+msgid "index may be empty."
+msgstr ""
+
+#: ../../manual/automapping.rst:119
+msgid "If there are tiles in the standard input layers one of these tiles must be there to match the rule. The optional **[not]** inverts the meaning of that layer. So if there are **inputnot** layers, the tiles placed on them, must not occur in the working map at the examined region to make a rule match. Within one rule you can combine the usage of both input and inputnot layers to make rules input conditions as accurate as you need or as fuzzy as you need."
+msgstr ""
+
+#: ../../manual/automapping.rst:128
+msgid "Definition of Outputs"
+msgstr ""
+
+#: ../../manual/automapping.rst:130
+msgid "Outputs are generally defined by layers whichs name follows this scheme"
+msgstr ""
+
+#: ../../manual/automapping.rst:132
+msgid "**output[index]\\_name**"
+msgstr ""
+
+#: ../../manual/automapping.rst:134
+msgid "which is very similar to the input section. At first there must be the word output. Then optionally an **[index]** may occur. After the first underscore there will be the name of the target layer. The target layer name can of course include more underscores."
+msgstr ""
+
+#: ../../manual/automapping.rst:139
+msgid "All layers of the same index are treated as one possible output. So the intention of indexes in the outputs of rules is only used for random output."
+msgstr ""
+
+#: ../../manual/automapping.rst:143
+msgid "The indexes in the output section have nothing to do with the indexes in the input section, they are independent. In the output section they are used for randomness. In the input section they are used to define multiple possible layers as input. So when there are multiple indexes within one rule, the output will be chosen fairly (uniformly distributed) across all indexes. So a dice will be rolled and one index is picked. All of the output layers carrying this index will be put out into the working map then."
+msgstr ""
+
+#: ../../manual/automapping.rst:152
+msgid "Note that the output is not being checked for overlapping itself. This can be achieved by setting the map property **NoOverlappingRules** to true."
+msgstr ""
+
+#: ../../manual/automapping.rst:157
+#: ../../manual/export.rst:164
+msgid "Map Properties"
+msgstr ""
+
+#: ../../manual/automapping.rst:159
+msgid "There are three different map properties, which can be used to add additional information to a **rulefile**:"
+msgstr ""
+
+#: ../../manual/automapping.rst:162
+msgid "**DeleteTiles** - This map property is a boolean property: it can be true or false. If rules of this rulefile get applied at some location in your map, this map property determines if all other tiles are deleted before applying the rules. Consider a map where you have multiple layers. Not all layers are filled at all places. In that case all tiles of all layers should be cleared, so afterwards there are only the tiles which are defined by the rules. Since when not all tiles are cleared before, you will have still tiles from before at these places, which are not covered by any tile."
+msgstr ""
+
+#: ../../manual/automapping.rst:172
+msgid "**AutomappingRadius** - This map property is a number: 1, 2, 3 ... It determines how many tiles around your changes will be checked as well for redoing the Automapping at live Automapping."
+msgstr ""
+
+#: ../../manual/automapping.rst:176
+msgid "**NoOverlappingRules** - This map property is a boolean property: A rule is not allowed to overlap on itself."
+msgstr ""
+
+#: ../../manual/automapping.rst:179
+msgid "These properties are map wide, meaning it applies to all rules which are part of the rulemap. If you need rules with different properties, you can use multiple rulemaps."
+msgstr ""
+
+#: ../../manual/automapping.rst:184
+msgid "Converting Rules From 0.8 and Below"
+msgstr ""
+
+#: ../../manual/automapping.rst:186
+msgid "There is a tool **automappingconverter** along in your distribution to convert the rules created for previous versions of Tiled to version 0.9 and later."
+msgstr ""
+
+#: ../../manual/automapping.rst:190
+msgid "If you are compiling tiled from scratch the tool is found in the in **/bin/** folder."
+msgstr ""
+
+#: ../../manual/automapping.rst:193
+msgid "The changes for conversion are only layer renaming:"
+msgstr ""
+
+#: ../../manual/automapping.rst:195
+msgid "Previous **RuleRegion** will be named **regions**"
+msgstr ""
+
+#: ../../manual/automapping.rst:197
+msgid "Previous **RuleSet** will be named **input\\_set**"
+msgstr ""
+
+#: ../../manual/automapping.rst:199
+msgid "Previous **RuleNotSet** will be named **inputnot\\_set**"
+msgstr ""
+
+#: ../../manual/automapping.rst:201
+msgid "Previous **Rule\\_\\*** will be named **output\\_\\***"
+msgstr ""
+
+#: ../../manual/automapping.rst:204
+msgid "Examples"
+msgstr ""
+
+#: ../../manual/automapping.rst:206
+msgid "All of the examples are for version 0.9 and later. If you want to see examples for tiled version 0.8 and below, `have a look in this archive. <https://github.com/stefanbeller/tiled_examples/zipball/v0.8andbefore>`__"
+msgstr ""
+
+#: ../../manual/automapping.rst:211
+msgid "Abstract Input Layer Examples"
+msgstr ""
+
+#: ../../manual/automapping.rst:214
+msgid "Having Multiple Input Layers with the Same Name"
+msgstr ""
+
+#: ../../manual/automapping.rst:216
+msgid "Assume the following 3 tile layers as input, which possible inputs are there in the working map?"
+msgstr ""
+
+#: ../../manual/automapping.rst:220
+#: ../../manual/automapping.rst:251
+#: ../../manual/automapping.rst:326
+#: ../../manual/automapping.rst:434
+#: ../../manual/automapping.rst:463
+#: ../../manual/automapping.rst:496
+#: ../../manual/automapping.rst:543
+#: ../../manual/automapping.rst:593
+msgid "Tile layer"
+msgstr ""
+
+#: ../../manual/automapping.rst:220
+#: ../../manual/automapping.rst:251
+#: ../../manual/automapping.rst:326
+#: ../../manual/automapping.rst:434
+#: ../../manual/automapping.rst:463
+#: ../../manual/automapping.rst:496
+#: ../../manual/automapping.rst:543
+#: ../../manual/automapping.rst:593
+#: ../../manual/editing-tilesets.rst:51
+#: ../../manual/using-commands.rst:33
+msgid "Name"
+msgstr ""
+
+#: ../../manual/automapping.rst:222
+#: ../../manual/automapping.rst:225
+#: ../../manual/automapping.rst:228
+#: ../../manual/automapping.rst:253
+#: ../../manual/automapping.rst:256
+#: ../../manual/automapping.rst:330
+#: ../../manual/automapping.rst:436
+#: ../../manual/automapping.rst:438
+#: ../../manual/automapping.rst:440
+#: ../../manual/automapping.rst:465
+#: ../../manual/automapping.rst:467
+#: ../../manual/automapping.rst:469
+#: ../../manual/automapping.rst:500
+#: ../../manual/automapping.rst:547
+#: ../../manual/automapping.rst:549
+#: ../../manual/automapping.rst:551
+#: ../../manual/automapping.rst:553
+#: ../../manual/automapping.rst:555
+#: ../../manual/automapping.rst:597
+msgid "input\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:232
+msgid "The following parts would be detected as matches for this rule:"
+msgstr ""
+
+#: ../../manual/automapping.rst:246
+msgid "Input Layers Using Different Indexes"
+msgstr ""
+
+#: ../../manual/automapping.rst:248
+msgid "Given the following 3 input tile layers:"
+msgstr ""
+
+#: ../../manual/automapping.rst:259
+msgid "input2\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:263
+msgid "The last layer has an index unequal to the other indexes (which are empty). All following parts would be recognized as matches within the working map:"
+msgstr ""
+
+#: ../../manual/automapping.rst:279
+msgid "The Mana World Examples"
+msgstr ""
+
+#: ../../manual/automapping.rst:281
+msgid "The Mana world examples will demonstrate quite a lot of different Automapping features. At first a shoreline will be constructed, by first adding all the straight parts and afterwards another rule will correct the corners to make them also fit the given tileset. After the shoreline has been added, the waters will be marked as unwalkable for the game engine. Last but not least the grass should be tiles should be made random by using 5 different grasss tiles."
+msgstr ""
+
+#: ../../manual/automapping.rst:291
+msgid "This is what we want to draw."
+msgstr ""
+
+#: ../../manual/automapping.rst:295
+msgid "Here we have straight shorelines applied."
+msgstr ""
+
+#: ../../manual/automapping.rst:299
+msgid "Here we have some corners."
+msgstr ""
+
+#: ../../manual/automapping.rst:303
+msgid "And corners the other way round as well."
+msgstr ""
+
+#: ../../manual/automapping.rst:307
+msgid "Here all unwalkable tiles are marked."
+msgstr ""
+
+#: ../../manual/automapping.rst:311
+msgid "If you look closely at the grass, you'll see they are now randomized."
+msgstr ""
+
+#: ../../manual/automapping.rst:314
+msgid "Basic Shoreline"
+msgstr ""
+
+#: ../../manual/automapping.rst:316
+msgid "This example will demonstrate how a straight shoreline can easily be setup between shallow water grass tiles. In this example we will only implement the shoreline, which has grass in southern and water in northern direction."
+msgstr ""
+
+#: ../../manual/automapping.rst:321
+msgid "So basically the meaning we will define in the input region is: *All tiles which are south of a water tile and are no water tiles itself, will be replaced by a shoreline tile*"
+msgstr ""
+
+#: ../../manual/automapping.rst:328
+#: ../../manual/automapping.rst:390
+#: ../../manual/automapping.rst:498
+#: ../../manual/automapping.rst:545
+#: ../../manual/automapping.rst:595
+msgid "regions"
+msgstr ""
+
+#: ../../manual/automapping.rst:332
+#: ../../manual/automapping.rst:471
+msgid "output\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:335
+msgid "The region in which this Automapping rule should be defined is of 2 tiles in height and 1 tile in width. Therefore we need a layer called *regions* and it will have 2 tiles placed to indicate this region."
+msgstr ""
+
+#: ../../manual/automapping.rst:339
+msgid "The input layer called *input\\_Ground* is depicted in the middle. Only the upper tile is filled by the water tile. The lower tile contains no tile. It is not an invisible tile, just no tile at all."
+msgstr ""
+
+#: ../../manual/automapping.rst:343
+msgid "And whenever there is no tile in a place within the rule regions in an input layer, what kind of tiles will be allowed there? There will be allowed any tiles except all used tiles within all input layer with the same index and name."
+msgstr ""
+
+#: ../../manual/automapping.rst:348
+msgid "Here we only have one tile layer as an input layer carrying only the water tile. Hence at the position, where no tile is located, all tiles except that water tile are allowed."
+msgstr ""
+
+#: ../../manual/automapping.rst:352
+msgid "The output layer called *output\\_Ground* shows the tile which gets placed, if this rule matches."
+msgstr ""
+
+#: ../../manual/automapping.rst:356
+msgid "Corners on a Shore Line"
+msgstr ""
+
+#: ../../manual/automapping.rst:358
+msgid "This example is a continuation of the previous example. Now the corners of the given shoreline should be implemented automatically. Within this article we will just examine the bent in corner shoreline in the topleft corner. The other shoreline corners are constructed the same way. So after the example is applied, we would like to have the corners of the shoreline get suitable tiles. Since we rely on the other example being finished, we will put the rules needed for the corners into another new rulefile. (which is listed afterwards in rules.txt)"
+msgstr ""
+
+#: ../../manual/automapping.rst:375
+msgid "The shoreline may have some more corners nearby, which means there may be more different tiles than the straigt corner lines. In the figure we see all inputs which should be covered."
+msgstr ""
+
+#: ../../manual/automapping.rst:379
+msgid "Both the tiles in the top right corner and in the lower left corner are directly adjacent to the desired (slightly transparent) tile in the top left corner."
+msgstr ""
+
+#: ../../manual/automapping.rst:383
+msgid "We can see 3 different tiles for the lower left corner, which is straight shore line, bent inside and bend outside shore lines."
+msgstr ""
+
+#: ../../manual/automapping.rst:386
+msgid "Also we see 3 different inputs for the top right corner, which also is straight, bent in or out shore line."
+msgstr ""
+
+#: ../../manual/automapping.rst:392
+msgid "So with this rule we want to put the bent in shore line tile in the top left corner, hence we don't care which tile has been there before. Also we don't care about the tile in the lower right corner. (probably water, but can be any decorative watertile, so just ignore it)."
+msgstr ""
+
+#: ../../manual/automapping.rst:401
+msgid "Therefore we will need different input and output regions. In the figure we can see the both tilelayers regions input and regions output. The input section covers just these two tiles as we discussed. The output region covers just the single tile we want to output. Though the input and output region do not overlap, the united region of both the input and the output region is still one coherent region, so it's one rule and works."
+msgstr ""
+
+#: ../../manual/automapping.rst:409
+msgid "Output regions can be larger than absolutely required, since when there are no tiles in the Output section, the tiles in the working map are not overwritten but just kept as is, hence the Output region could also be sized as the united region of both the output and input region."
+msgstr ""
+
+#: ../../manual/automapping.rst:415
+#: ../../manual/automapping.rst:473
+msgid "regions\\_input"
+msgstr ""
+
+#: ../../manual/automapping.rst:417
+msgid "Now we want to put all the nine possible patterns we observed as possible input for this rule. We could of course define nine different layers *input1\\_Ground* up to *input9\\_Ground*"
+msgstr ""
+
+#: ../../manual/automapping.rst:421
+msgid "Nine TileLayers?! what a mess, we'll put it in a better way."
+msgstr ""
+
+#: ../../manual/automapping.rst:423
+msgid "Also consider not having just 3 possible tiles at the 2 locations but 4. Then we would need 4\\*4=16 tilelayers to get all conditions. Another downside of this comes with more needed locations: Think of more than 2 locations needed to construct a ruleinput. So for 3 locations, then each location could have the 3 possibilites, hence you need 3\\*3\\*3 = 27 tilelayers. It's not getting better..."
+msgstr ""
+
+#: ../../manual/automapping.rst:430
+msgid "So let's try a smart way: All input layers have the same name, so at each position any of the three different tiles is valid."
+msgstr ""
+
+#: ../../manual/automapping.rst:444
+msgid "outputs"
+msgstr ""
+
+#: ../../manual/automapping.rst:446
+msgid "The output is straight forward, since only one tile is needed. No randomness is needed, hence the index is not needed to be varied, so it's kept empty. The desired output layer is called Ground, so the over all name of the single output layer will be output Ground. At this single layer at the correct location the correct tile is placed."
+msgstr ""
+
+#: ../../manual/automapping.rst:457
+msgid "The Other Corners on a Shore Line"
+msgstr ""
+
+#: ../../manual/automapping.rst:459
+msgid "This is for corners bent the other way round. Basically it has the same concepts, just other tiles."
+msgstr ""
+
+#: ../../manual/automapping.rst:475
+msgid "regions\\_output"
+msgstr ""
+
+#: ../../manual/automapping.rst:479
+msgid "Adding Collision Tiles"
+msgstr ""
+
+#: ../../manual/automapping.rst:481
+msgid "The Mana World uses an extra tile layer called *Collision* to have information about whether a player is able to walk at certain tiles or if it is not. That layer is invisible to the player, but the game engine parses it, whether there is a tile or there is no tile."
+msgstr ""
+
+#: ../../manual/automapping.rst:486
+msgid "So we need to decide for each position if a player can walk there and put a tile into the *Collision* layer if it is unwalkable."
+msgstr ""
+
+#: ../../manual/automapping.rst:489
+msgid "As *input* layer we will parse the *Ground* layer and put collision tiles where the player should not walk."
+msgstr ""
+
+#: ../../manual/automapping.rst:492
+msgid "Actually this task is a bunch of rules, but each rule itself is very easy:"
+msgstr ""
+
+#: ../../manual/automapping.rst:502
+msgid "output\\_Collision"
+msgstr ""
+
+#: ../../manual/automapping.rst:505
+msgid "In the above *regions* layer we have 14 different rules, because there are 14 incoherent regions in the *regions* layer. That's 9 different water tiles, which should be unwalkable and 5 different grass tiles which will be placed randomly in the next example."
+msgstr ""
+
+#: ../../manual/automapping.rst:510
+msgid "As input we will have one of all the used tiles and as output there is either a tile in the *Collision* layer or not."
+msgstr ""
+
+#: ../../manual/automapping.rst:513
+msgid "**Do we need the rules with clean output?** No, it is not needed for one run of Automapping. But if you are designing a map, you will likely add areas with collision and then remove some parts of it again and so on."
+msgstr ""
+
+#: ../../manual/automapping.rst:517
+msgid "So we need to also remove the collision tiles from positions, which are not marked by a collision any more. This can be done by adding the map property *DeleteTiles* and setting it to *yes* or *true*. Then all the parts in the *Collision* layer will be erased before the Automapping takes place, so the collision tiles are only placed at real unwalkable tiles and the history if there has been a collision place is neglected."
+msgstr ""
+
+#: ../../manual/automapping.rst:525
+msgid "Random Grass Tiles"
+msgstr ""
+
+#: ../../manual/automapping.rst:527
+msgid "In this example we will shuffle all grass tiles, so one grass tiles will be replaced with another randomly chosen tile."
+msgstr ""
+
+#: ../../manual/automapping.rst:530
+msgid "As input we will choose all of our grass tiles. This is done by having each tile in its own input layer, so each grass tile gets accepted for this rule."
+msgstr ""
+
+#: ../../manual/automapping.rst:534
+msgid "As output we will also put each grass tile into one output layer. To make it random the *index* of the output layers needs to be different for each layer."
+msgstr ""
+
+#: ../../manual/automapping.rst:538
+msgid "The following rule might look always the same, but there are different grass tiles. Each grass tile is in both one of the input and one of the output layers (the order of the layers doesn't matter)."
+msgstr ""
+
+#: ../../manual/automapping.rst:557
+msgid "output1\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:559
+msgid "output2\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:561
+msgid "output3\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:563
+msgid "output4\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:565
+msgid "output5\\_Ground"
+msgstr ""
+
+#: ../../manual/automapping.rst:569
+msgid "An alternating wall"
+msgstr ""
+
+#: ../../manual/automapping.rst:571
+msgid "This example will demonstrate how a wall as a transition between a walkable area and the non-walkable black void can easily be setup. As input a dedicated set layer will be used."
+msgstr ""
+
+#: ../../manual/automapping.rst:580
+msgid "In my opinion a dedicated set layer is much easier to use for the rough draft, but for adding details such as collision information on decorative tiles the input should use the decoration."
+msgstr ""
+
+#: ../../manual/automapping.rst:584
+msgid "The structure of the input, output and region layer is very similar to the example of the straight shoreline in The Mana World examples. The main difference is the different size. Since the wall contains multiple tiles in height, the height of the rulelayers is different as well. Vertically the tiles are also alternating. As you can see in the following figure, every second tile displaying the base board of the wall has a notch for example."
+msgstr ""
+
+#: ../../manual/automapping.rst:599
+msgid "output\\_Walls"
+msgstr ""
+
+#: ../../manual/automapping.rst:602
+msgid "Hence the region in which this Automapping rule should be defined is of 4 tiles in height and 2 tile in width. Therefore we need a layer called *regions* and it will have 8 tiles placed to indicate this region. In the figure the top graphics shows such a region layer."
+msgstr ""
+
+#: ../../manual/automapping.rst:607
+msgid "The input layer has the following meaning:"
+msgstr ""
+
+#: ../../manual/automapping.rst:609
+msgid "*If there are 2 vertical adjacent brown tiles in the set layer and in the 3x2 tiles above here are no brown tiles, this rule matches.*"
+msgstr ""
+
+#: ../../manual/automapping.rst:612
+msgid "Only the lowest 2 coordinates contain the brown tile. The upper coordinates contains no tile. (It is not an invisible tile, just no tile at all.) The input layer called *Input\\_set* is depicted in the middle of the figure."
+msgstr ""
+
+#: ../../manual/automapping.rst:617
+msgid "The output consists of only one layer as well called *Output\\_Walls*. It contains the actual wall tiles."
+msgstr ""
+
+#: ../../manual/automapping.rst:622
+msgid "Vertically the tiles are alternating."
+msgstr ""
+
+#: ../../manual/automapping.rst:627
+msgid "A broken version of the rule, *NoOverlappingRules* was not yet set."
+msgstr ""
+
+#: ../../manual/automapping.rst:629
+msgid "When trying to match the input layer to the desired set layer (right picture of the figure at the beginning of the example, you will see it matches all way long, no matter of the vertical adjustment."
+msgstr ""
+
+#: ../../manual/automapping.rst:633
+msgid "Hence when we use the rule as discussed now, we will get not the desired result, but this rule overlaps itself. The overlapping problem is shown in figure above."
+msgstr ""
+
+#: ../../manual/automapping.rst:637
+msgid "Since the overlapping is not desired, we can turn it off by adding a map property to the rulemap *NoOverlappingRules* and setting it to *true*"
+msgstr ""
+
+#: ../../manual/automapping.rst:640
+msgid "Keep in mind that the map property applies for all rules on that rule map."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:2
+msgid "Custom Properties"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:4
+msgid "One of the major strengths of Tiled is that it allows setting custom properties on all of its basic data structures. This way it is possible to include many forms of custom information, which can later be used by your game or by the framework you're using to integrate Tiled maps."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:9
+msgid "Custom properties are displayed in the Properties view. This view is context-sensitive, usually displaying the properties of the last selected object. For tiles in a tileset or objects on an object layer, it also supports multi-selection."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:17
+msgid "Properties View"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:20
+msgid "Adding Properties"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:22
+msgid "When you add a property (using the '+' button at the bottom of the Properties view), you are prompted for its name and its type. Currently Tiled supports the following basic property types:"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:26
+msgid "**string** (any text, including multi-line text)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:27
+msgid "**float** (a floating point number)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:28
+msgid "**int** (a whole number)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:29
+msgid "**bool** (true or false)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:30
+msgid "**file** (a relative path referencing a file)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:31
+msgid "**color** (a 32-bit color value)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:36
+msgid "Add Property Dialog"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:38
+msgid "The property type is used to choose a custom editor in the Properties view. Choosing a number or boolean type also avoids that the value will get quoted in JSON and Lua exports."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:49
+msgid "Tile Property Inheritance"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:51
+msgid "When custom properties are added to a tile, these properties will also be visible when an object instance of that tile is selected. This enables easy per-object overriding of certain default properties associated with a tile. This becomes especially useful when combined with :ref:`typed-tiles`."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:57
+msgid "Inherited properties will be displayed in gray (disabled text color), whereas overridden properties will be displayed in black (usual text color)."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:64
+msgid "Predefining Properties"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:67
+msgid "General Setup"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:69
+msgid "Usually you only use a limited set of object types in your game, and each type of object has a fixed set of possible properties, with specific types and default values. To save you time, Tiled allows predefining these properties based on the \"Type\" field for objects. You can set this up using the Object Types Editor, available from the *View* menu."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:79
+msgid "Object Types Editor"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:81
+msgid "By default, Tiled stores these object types in the user settings. However, since you'll often want to share them with other people in your project, you can export your object types or change the storage location of the object types file. A simple XML or JSON file with self-explanatory contents is used to store your object types."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:87
+msgid "The color not only affects the rendering of the various shapes of objects, but is also the color of the label which will show up if you give your object a name."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:91
+msgid "To make the predefined properties show up in the Properties view, all you need to do is to enter the name of the type in the built-in \"Type\" property. Usually this is what you're doing already anyway to tell your engine what kind of object it is dealing with."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:103
+msgid "Typed Tiles"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:105
+msgid "If you're using :ref:`tile objects <insert-tile-tool>`, you can set the type on the tile to avoid having to set it on each object instance. Setting the type on the tile makes the predefined properties visible when having the tile selected, allowing to override the values. It also makes those possibly overridden values visible when having a tile object instance selected, again allowing you to override them."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:112
+msgid "An example use-case for this would be to define custom types like \"NPC\", \"Enemy\" or \"Item\" with properties like \"name\", \"health\" or \"weight\". You can then specify values for these on the tiles representing these entities. And when placing those tiles as objects, you can override those values if you need to."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:121
+msgid "There are several types of custom properties I'd like to add:"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:123
+msgid "**Enumerations**, where you can predefine all possible values and it forms a combo box (`#1211 <https://github.com/bjorn/tiled/issues/1211>`__)."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:126
+msgid "**Object references**, which would allow easily linking objects together and Tiled could display such connections (`#707 <https://github.com/bjorn/tiled/issues/707>`__)."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:129
+msgid "**Array properties**, which would be properties having a list of values (`#1493 <https://github.com/bjorn/tiled/issues/1493>`__)."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:131
+msgid "**Dictionary properties**, which would be properties that can contain any number of other properties as children (`#489 <https://github.com/bjorn/tiled/issues/489>`__)."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:135
+msgid "It would also be nice to add support for **limiting property values**, like the length of string properties or a minimum/maximum on number values."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:139
+msgid "Apart from predefining properties based on object type, I'd like to add support for **predefining the properties for each data type**. So defining which custom properties are valid for maps, tilesets, layers, etc. (`#1410 <https://github.com/bjorn/tiled/issues/1410>`__)"
+msgstr ""
+
+#: ../../manual/custom-properties.rst:144
+msgid "Finally, the predefined properties would work very well together with explicit **support for projects**. Then you could switch between different projects or get started on an existing project, without needing to configure Tiled to use the right object type definitions."
+msgstr ""
+
+#: ../../manual/custom-properties.rst:149
+#: ../../manual/editing-tilesets.rst:230
+#: ../../manual/layers.rst:132
+#: ../../manual/objects.rst:284
+msgid "If you like any of these plans, please help me getting around to it faster by `becoming a patron <https://www.patreon.com/bjorn>`__. The more support I receive the more time I can afford to spend improving Tiled!"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:2
+msgid "Editing Tile Layers"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:4
+msgid ":ref:`tile-layer-introduction` are what makes Tiled a *tile map editor*. Although not as flexible as :ref:`object-layer-introduction`, they provide efficient data storage and good rendering performance as well as efficient content creation. Every new map gets one by default, though feel free to delete it when you're not going to use it."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:13
+msgid "Stamp Brush"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:15
+msgid "Shortcut: ``B``"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:17
+msgid "The primary tool for editing tile layers is the Stamp Brush. It can be used to paint single tiles as well as larger \"stamps\", which is where it gets its name from. Using the right mouse button, it can also quickly capture tile stamps from the currently active layer. A tile stamp is commonly created by selecting one or more tiles in the Tilesets view."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:23
+msgid "The Stamp Brush has some extra features:"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:25
+msgid "While holding ``Shift``, click any two points to draw a line between them."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:28
+msgid "While holding ``Ctrl+Shift``, click any two points two draw a circle or ellipse centered on the first point."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:31
+msgid "Activate the *Random Mode* using the dice button on the Tool Options toolbar to have the Stamp Brush paint with random tiles from the tile stamp. The probability of each tile depends on how often it occurred on the tile stamp, as well as the probability set on each tile in the *Tileset Editor*."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:37
+msgid "Activate the *Wang Fill Mode* using the Wang tile button on the tool bar to have the Stamp Brush paint using the Wang methods. This makes adjacent tiles match edge and corner colors to be placed. Wang tiles are described in detail in :doc:`using-wang-tiles`."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:42
+msgid "In combination with the *Tile Stamps* view, it can also place randomly from a set of predefined tile stamps. This can be more useful than the *Random Mode*, which randomly places individual tiles."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:47
+msgid "You can flip the current tile stamp horizontally/vertically by using ``X`` and ``Y`` respectively. You can also rotate left/right by using ``Z`` and ``Shift+Z`` respectively. These actions can also be triggered from the Tool Options tool bar."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:55
+msgid "Terrain Brush"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:57
+#: ../../manual/objects.rst:102
+msgid "Shortcut: ``T``"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:59
+msgid "The Terrain Brush allows for efficient editing with a certain type of corner-based terrain transitions. Setting it up requires associating terrain information with your tiles, which is described in detail in :doc:`Using the Terrain Tool <using-the-terrain-tool>`."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:64
+msgid "Similarly to the :ref:`stamp-tool`, you can draw lines by holding ``Shift``. When holding ``Ctrl``, the size of the editing area is reduced to one corner (this currently doesn't work well in combination with drawing lines)."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:73
+msgid "When holding ``Alt``, the editing operations are also applied at a 180 degree rotation. This is especially useful when editing strategic maps where two sides need to have equal opportunities. The modifier works well in combination with either ``Shift`` for drawing lines or ``Ctrl`` for reducing the edited area."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:86
+#: ../../manual/using-wang-tiles.rst:99
+#: ../../manual/using-wang-tiles.rst:106
+msgid "Wang Brush"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:88
+msgid "Shortcut: ``G``"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:90
+msgid "The Wang Brush works in a very similar way to the :ref:`terrain-tool`, except it uses Wang sets. Key differences are:"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:93
+msgid "Wang tiles support edges as well as corners, whereas terrains only support corners. This makes Wang tiles useful for drawing paths, or fences."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:95
+msgid "The default size is to edit one edge/corner. Holding ``Ctrl`` expands it to the whole tile."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:97
+msgid "If the transition cannot be made on the immediately affected tiles, the operation is aborted."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:100
+msgid "To use the tool, a color must be selected from the Wang color view. Wang tiles and this tool are described in detail in :doc:`using-wang-tiles`."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:106
+msgid "Bucket Fill Tool"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:108
+msgid "Shortcut: ``F``"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:110
+msgid "The Bucket Fill Tool provides a quick way of filling empty areas or areas covered with the same tiles. The currently active tile stamp will be repeated in the filled area. It can also be used in combination with the *Random Mode*, or *Wang Fill Mode*."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:115
+msgid "When holding ``Shift``, the tool fills the currently selected area regardless of its contents. This is useful for filling custom areas that have been selected previously using one or more `Selection Tools <#selection-tools>`__."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:120
+msgid "You can also flip and rotate the current stamp as described for the :ref:`stamp-tool`."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:126
+msgid "Eraser"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:128
+#: ../../manual/objects.rst:251
+msgid "Shortcut: ``E``"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:130
+msgid "A simple eraser tool. Left click erases single tiles and right click can be used to quickly erase rectangular areas."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:134
+msgid "Selection Tools"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:136
+msgid "There are various tile selection tools that all work in similar fashion:"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:138
+msgid "**Rectangular Select** allows selection of rectangular areas (shortcut: ``R``)"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:141
+msgid "**Magic Wand** allows selection of connected areas filled with the same tile (shortcut: ``W``)"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:144
+msgid "**Select Same Tile** allows selection of same-tiles across the entire layer (shortcut: ``S``)"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:147
+msgid "By default, each of these tools replaces the currently selected area. The following modifiers can be used to change this behavior:"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:150
+msgid "Holding ``Shift`` expands the current selection with the new area"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:151
+msgid "Holding ``Ctrl`` subtracts the new area from the current selection"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:152
+msgid "Holding ``Ctrl`` and ``Shift`` selects the intersection of the new area with the current selection"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:155
+msgid "You can also lock into one of these modes (Add, Subtract or Intersect) by clicking on one of the tool buttons in the Tool Options toolbar."
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:159
+msgid "Managing Tile Stamps"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:161
+msgid "It can often be useful to store the current tile stamp somewhere to use it again later. The following shortcuts work for this purpose:"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:164
+msgid "``Ctrl + 1-9`` - Store current tile stamp (similar to ``Ctrl + C``)"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:165
+msgid "``1-9`` - Recall the stamp stored at this location (similar to ``Ctrl + V``)"
+msgstr ""
+
+#: ../../manual/editing-tile-layers.rst:168
+msgid "Tile stamps can also be stored by name and extended with variations using the *Tile Stamps* view."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:2
+msgid "Editing Tilesets"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:4
+msgid "To edit a tileset it needs to be opened explicitly for editing. External tilesets can be opened via the *File* menu, but in general the quickest way to edit the tileset when it is already open in the *Tilesets* view is to click the small *Edit Tileset* button in the tool bar below the tileset."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:11
+msgid "Two Types of Tileset"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:13
+msgid "A tileset is a collection of tiles. Tiled currently supports two types of tilesets, which are chosen when creating a new tileset:"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:22
+msgid "Based on Tileset Image"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:17
+msgid "This tileset defines a fixed size for all tiles and the image from which these tiles are supposed to be cut. In addition it supports a margin around the tiles and a spacing between the tiles, which allows for using tileset images that either happen to have space between or around their tiles or those that have extruded the border pixels of each tile to avoid color bleeding."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:27
+msgid "Collection of Images"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:25
+msgid "In this type of tileset each tile refers to its own image file. It is useful when the tiles aren't the same size, or when the packing of tiles into a texture is done later on."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:29
+msgid "Regardless of the type of tileset, you can associate a lot of meta- information with it and its tiles. Some of this information can be for use in your game, like :ref:`collision information <tile-collision-editor>` and :ref:`animations <tile-animation-editor>`. Other information is primarily meant for certain editing tools."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:37
+msgid "A tileset can be either embedded in a map file or saved externally. Since Tiled 1.0, the default and recommended approach is to save your tilesets to their own file. This simplifies your workflow since it makes sure any meta-information is shared between all maps using the same tileset."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:44
+msgid "Tileset Properties"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:46
+msgid "You can access the tileset properties by using the menu action *Tileset > Tileset Properties*."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:50
+msgid "The name of the tileset. Used to identify the tileset in the *Tilesets* view when editing a map."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:56
+msgid "Drawing Offset"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:54
+msgid "A drawing offset in pixels, applied when rendering any tile from the tileset (as part of tile layers or as tile objects). This is can be useful to make your tiles align to the grid."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:60
+msgid "Background Color"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:59
+msgid "A background color for the tileset, which can be set in case the default dark-gray background is not suitable for your tiles."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:72
+msgid "Orientation"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:67
+msgid "When the tileset contains isometric tiles, you can set this to *Isometric*. This value, along with the **Grid Width** and **Grid Height** properties, is taken into account by overlays rendered on top of the tiles. This helps for example when specifying :ref:`terrain-information` or editing :ref:`wang-sets`. It also affects the orientation used by the :ref:`tile-collision-editor`."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:77
+msgid "Columns"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:75
+msgid "This is a read-only property for tilesets based on a tileset image, but for image collection tilesets you can control the number of columns used when displaying the tileset here."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:83
+#: ../../manual/editing-tilesets.rst:113
+msgid "Image"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:80
+msgid "This property only exists for tilesets based on a tileset image. Selecting the value field will show an *Edit...* button, allowing you to change the parameters relevant to cutting the tiles from the image."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:85
+msgid "Of course, as with most data types in Tiled, you can also associate :doc:`custom-properties` with the tileset."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:90
+msgid "Tile Properties"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:93
+msgid "ID"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:93
+msgid "The ID of the tile in the tileset (read-only)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:101
+msgid "Type"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:100
+msgid "This property refers to custom types defined in the :ref:`Object Types Editor <predefining-properties>`. See the section about :ref:`typed-tiles` for more information."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:104
+msgid "Width and Height"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:104
+msgid "The size of the tile (read-only)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:109
+#: ../../manual/using-wang-tiles.rst:129
+msgid "Probability"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:107
+msgid "Represents a relative probability that this tile will get chosen out of multiple options. This value is used in *Random Mode* and by the :ref:`terrain-tool`."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:112
+msgid "Only relevant for tiles that are part of image collection tilesets, this shows the image file of the tile and allows you to change it."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:118
+msgid "Terrain Information"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:120
+msgid "Terrain information can be added to a tileset to enable the use of the the :ref:`terrain-tool`. See the section about :ref:`defining terrain information <define-terrain-information>`."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:131
+msgid "Wang Sets"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:133
+msgid "A tileset can contain any number of Wang sets for use with the :ref:`wang-tool`. See :ref:`defining-wang-tile-info` for more information."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:140
+#: ../../manual/editing-tilesets.rst:155
+msgid "Tile Collision Editor"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:142
+msgid "The tile collision editor is available by clicking the *Tile Collision Editor* |tile-collision-editor-icon| button on the tool bar. This will open a view where you can create and edit shapes on the tile. You can also associate custom properties with each shape."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:147
+msgid "Usually these shapes define collision information for a certain sprite or for a tile representing level geometry, but of course you could also use them to add certain hot-spots to your sprites like for particle emitters or the source of gunshots."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:159
+msgid "Check out the `Tiled2Unity`_ tool by Sean Barton for a great example of what you can do with this information. It can take the collision shapes for all tiles and generate a single collision mesh from it, as demonstrated in the `Mega Dad Adventures`_ post."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:167
+#: ../../manual/editing-tilesets.rst:180
+msgid "Tile Animation Editor"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:169
+msgid "The tile animation editor allows defining a single linear looping animation with each tile by referring to other tiles in the tileset as its frames. Open it by clicking the *Tile Animation Editor* |tile-animation-editor-icon| button."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:173
+msgid "Tile animations can be live-previewed in Tiled, which is useful for getting a feeling of what it would look like in-game. The preview can be turned on or off via *View > Show Tile Animations*."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:182
+msgid "The following steps allow to add or edit a tile animation:"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:184
+msgid "Select the tile in the main Tiled window. This will make the *Tile Animation Editor* window show the (initially empty) animation associated with that tile, along with all other tiles from the tileset."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:188
+msgid "Drag tiles from the tileset view in the Tile Animation Editor into the list on the left to add animation frames. You can drag multiple tiles at the same time. Each new frame gets a default duration of 100 ms."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:192
+msgid "Double-click on the duration of a frame to change it."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:194
+msgid "Drag frames around in the list to reorder them."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:196
+msgid "A preview of the animation shows in the bottom left corner."
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:211
+msgid "There are many ways in which the tileset editor can be made more efficient, for example:"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:214
+msgid "**Wang Sets**"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:216
+msgid "Make it easier to set up Wang tiles (`#1729 <https://github.com/bjorn/tiled/issues/1729>`__)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:218
+msgid "**Tile Collision Editor**"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:220
+msgid "Allow setting collisions for multiple tiles at once (`#1322 <https://github.com/bjorn/tiled/issues/1322>`__)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:221
+msgid "Render tile collision shapes to the main map (`#799 <https://github.com/bjorn/tiled/issues/799>`__) or to the tileset view (`#1281 <https://github.com/bjorn/tiled/issues/1281>`__)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:224
+msgid "**Tile Animation Editor**"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:226
+msgid "Allow changing the default frame duration (`#1631 <https://github.com/bjorn/tiled/issues/1631>`__)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:227
+msgid "Allow changing the duration of multiple frames at the same time (`#1310 <https://github.com/bjorn/tiled/issues/1310>`__)"
+msgstr ""
+
+#: ../../manual/editing-tilesets.rst:228
+msgid "Support multiple named animations per tile (`#986 <https://github.com/bjorn/tiled/issues/986>`__)"
+msgstr ""
+
+#: ../../manual/export.rst:2
+msgid "Export Formats"
+msgstr ""
+
+#: ../../manual/export.rst:4
+msgid "While there are many :doc:`libraries and frameworks </reference/support-for-tmx-maps>` that work directly with Tiled maps, Tiled also supports a number of additional file and export formats."
+msgstr ""
+
+#: ../../manual/export.rst:8
+msgid "Exporting can be done by clicking *File > Export*. When triggering the menu action multiple times, Tiled will only ask for the file name the first time. Exporting can also be automated using the ``--export-map`` command-line parameter."
+msgstr ""
+
+#: ../../manual/export.rst:15
+msgid "When exporting on the command-line on Linux, Tiled will still need an X server to run. To automate exports in a headless environment, you can use a headless X server such as `Xvfb`_. In this case you would run Tiled from the command-line as follows:"
+msgstr ""
+
+#: ../../manual/export.rst:25
+msgid "JSON"
+msgstr ""
+
+#: ../../manual/export.rst:27
+msgid ":doc:`The JSON format </reference/json-map-format>` is most common additional file format supported by Tiled. It can be used instead of TMX since Tiled can also open JSON maps and tilesets and the format supports all Tiled features. Especially in the browser and when using JavaScript in general, the JSON format is easier to load."
+msgstr ""
+
+#: ../../manual/export.rst:33
+msgid "The JSON format is currently the only additional format supported for tilesets."
+msgstr ""
+
+#: ../../manual/export.rst:39
+msgid "Lua"
+msgstr ""
+
+#: ../../manual/export.rst:41
+msgid "Maps can be exported to Lua code. This export option supports most of Tiled's features and is useful when using a Lua-based framework like `LÖVE`_ (with `Simple Tiled Implementation`_), `Corona`_ (with `ponytiled`_ or `Dusk Engine`_) or `Defold`_."
+msgstr ""
+
+#: ../../manual/export.rst:46
+msgid "Currently not included are the type of custom properties (though the type does affect how a property value is exported) and information related to recent features like :doc:`Wang tiles <using-wang-tiles>` and :doc:`object templates <using-templates>`."
+msgstr ""
+
+#: ../../manual/export.rst:52
+msgid "CSV"
+msgstr ""
+
+#: ../../manual/export.rst:54
+msgid "The CSV export only supports :doc:`tile layers <editing-tile-layers>`. Maps containing multiple tile layers will export as multiple files, called ``base_<layer-name>.csv``."
+msgstr ""
+
+#: ../../manual/export.rst:58
+msgid "Each tile is written out by its ID, unless the tile has a custom property called ``name``, in which case its value is used to write out the tile. Using multiple tilesets will lead to ambiguous IDs, unless the custom ``name`` property is used. Empty cells get the value ``-1``."
+msgstr ""
+
+#: ../../manual/export.rst:66
+msgid "GameMaker: Studio 1.4"
+msgstr ""
+
+#: ../../manual/export.rst:68
+msgid "GameMaker: Studio 1.4 uses a custom XML-based format to store its rooms, and Tiled ships with a plugin to export maps in this format. Currently only orthogonal maps will export correctly."
+msgstr ""
+
+#: ../../manual/export.rst:72
+msgid "Tile layers and tile objects (when no type is set) will export as \"tile\" elements. These support horizontal and vertical flipping, but no rotation. For tile objects, scaling is also supported."
+msgstr ""
+
+#: ../../manual/export.rst:78
+msgid "The tilesets have to be named the same as the corresponding backgrounds in the GameMaker project. Otherwise GameMaker will pop up an error for each tile while loading the exported ``room.gmx`` file."
+msgstr ""
+
+#: ../../manual/export.rst:83
+msgid "Object Instances"
+msgstr ""
+
+#: ../../manual/export.rst:85
+msgid "GameMaker object instances are created by putting the object name in the \"Type\" field of the object in Tiled. Rotation is supported here, and for tile objects also flipping and scaling is supported (though flipping in combination with rotation doesn't appear to work in GameMaker)."
+msgstr ""
+
+#: ../../manual/export.rst:94
+msgid "The following custom properties can be set on objects to affect the exported instance:"
+msgstr ""
+
+#: ../../manual/export.rst:97
+msgid "string ``code`` (instance creation code, default: \"\")"
+msgstr ""
+
+#: ../../manual/export.rst:98
+msgid "float ``scaleX`` (default: derived from tile or 1.0)"
+msgstr ""
+
+#: ../../manual/export.rst:99
+msgid "float ``scaleY`` (default: derived from tile or 1.0)"
+msgstr ""
+
+#: ../../manual/export.rst:100
+msgid "int ``originX`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:101
+msgid "int ``originY`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:103
+msgid "The ``scaleX`` and ``scaleY`` properties can be used to override the scale of the instance. However, if the scale is relevant then it will generally be easier to use a tile object, in which case it is automatically derived from the tile size and the object size."
+msgstr ""
+
+#: ../../manual/export.rst:108
+msgid "The ``originX`` and ``originY`` properties can be used to tell Tiled about the origin of the object defined in GameMaker, as an offset from the top-left. This origin is taken into account when determining the position of the exported instance."
+msgstr ""
+
+#: ../../manual/export.rst:115
+msgid "Of course setting the type and/or the above properties manually for each instance will get old fast. Since Tiled 1.0.2, you can instead use tile objects with the type set on the tile, and in Tiled 1.1 you can also use :doc:`object templates <using-templates>`."
+msgstr ""
+
+#: ../../manual/export.rst:125
+msgid "Views"
+msgstr ""
+
+#: ../../manual/export.rst:131
+msgid "Views can be defined using :ref:`rectangle objects <insert-rectangle-tool>` where the Type has been set to ``view``. The position and size will be snapped to pixels. Whether the view is visible when the room starts depends on whether the object is visible. The use of views is automatically enabled when any views are defined."
+msgstr ""
+
+#: ../../manual/export.rst:137
+msgid "The following custom properties can be used to define the various other properties of the view:"
+msgstr ""
+
+#: ../../manual/export.rst:140
+msgid "**Port on screen**"
+msgstr ""
+
+#: ../../manual/export.rst:142
+msgid "int ``xport`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:143
+msgid "int ``yport`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:144
+msgid "int ``wport`` (default: 1024)"
+msgstr ""
+
+#: ../../manual/export.rst:145
+msgid "int ``hport`` (default: 768)"
+msgstr ""
+
+#: ../../manual/export.rst:147
+msgid "**Object following**"
+msgstr ""
+
+#: ../../manual/export.rst:149
+msgid "string ``objName``"
+msgstr ""
+
+#: ../../manual/export.rst:150
+msgid "int ``hborder`` (default: 32)"
+msgstr ""
+
+#: ../../manual/export.rst:151
+msgid "int ``vborder`` (default: 32)"
+msgstr ""
+
+#: ../../manual/export.rst:152
+msgid "int ``hspeed`` (default: -1)"
+msgstr ""
+
+#: ../../manual/export.rst:153
+msgid "int ``vspeed`` (default: -1)"
+msgstr ""
+
+#: ../../manual/export.rst:157
+msgid "When you're defining views in Tiled, it is useful to add ``view`` as object type in the :ref:`Object Types Editor <predefining-properties>`, adding the above properties for ease of access. If you frequently use views with similar settings, you can set up :doc:`templates <using-templates>` for them."
+msgstr ""
+
+#: ../../manual/export.rst:167
+#: ../../manual/keyboard-shortcuts.rst:9
+#: ../../manual/preferences.rst:21
+msgid "General"
+msgstr ""
+
+#: ../../manual/export.rst:169
+msgid "int ``speed`` (default: 30)"
+msgstr ""
+
+#: ../../manual/export.rst:170
+msgid "bool ``persistent`` (default: false)"
+msgstr ""
+
+#: ../../manual/export.rst:171
+msgid "bool ``clearDisplayBuffer`` (default: true)"
+msgstr ""
+
+#: ../../manual/export.rst:172
+msgid "bool ``clearViewBackground`` (default: false)"
+msgstr ""
+
+#: ../../manual/export.rst:173
+msgid "string ``code`` (map creation code, default: \"\")"
+msgstr ""
+
+#: ../../manual/export.rst:176
+msgid "Physics"
+msgstr ""
+
+#: ../../manual/export.rst:178
+msgid "bool ``PhysicsWorld`` (default: false)"
+msgstr ""
+
+#: ../../manual/export.rst:179
+msgid "int ``PhysicsWorldTop`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:180
+msgid "int ``PhysicsWorldLeft`` (default: 0)"
+msgstr ""
+
+#: ../../manual/export.rst:181
+msgid "int ``PhysicsWorldRight`` (default: width of map in pixels)"
+msgstr ""
+
+#: ../../manual/export.rst:182
+msgid "int ``PhysicsWorldBottom`` (default: height of map in pixels)"
+msgstr ""
+
+#: ../../manual/export.rst:183
+msgid "float ``PhysicsWorldGravityX`` (default: 0.0)"
+msgstr ""
+
+#: ../../manual/export.rst:184
+msgid "float ``PhysicsWorldGravityY`` (default: 10.0)"
+msgstr ""
+
+#: ../../manual/export.rst:185
+msgid "float ``PhysicsWorldPixToMeters`` (default: 0.1)"
+msgstr ""
+
+#: ../../manual/export.rst:188
+msgid "Layer Properties"
+msgstr ""
+
+#: ../../manual/export.rst:190
+msgid "Both tile layers and object layers may produce \"tile\" elements in the exported room file. Their depth is set automatically, with tiles from the bottom-most layer getting a value of 10000000 (the GameMaker default) and counting up from there. If you want to set a custom depth value you can set the following property on the layer:"
+msgstr ""
+
+#: ../../manual/export.rst:196
+msgid "int ``depth`` (default: 10000000 + N)"
+msgstr ""
+
+#: ../../manual/export.rst:203
+msgid "tBIN"
+msgstr ""
+
+#: ../../manual/export.rst:205
+msgid "The tBIN map format is a binary format used by the `tIDE Tile Map Editor`_. tIDE was used by `Stardew Valley`_, a successful game that spawned many `community mods <https://www.nexusmods.com/stardewvalley/?>`__."
+msgstr ""
+
+#: ../../manual/export.rst:209
+msgid "Tiled ships with a plugin that enables direct editing of Stardew Valley maps (and any other maps using the tBIN format). This plugin needs to be enabled in *Edit > Preferences > Plugins*. It is not enabled by default because it won't store everything (most notably it doesn't support object layers in general, nor external tilesets), so you need to know what you are doing."
+msgstr ""
+
+#: ../../manual/export.rst:218
+msgid "The tBIN format supports setting custom properties on the tiles of a tile layer. Since Tiled does not support this directly, \"TileData\" objects are created that match the location of the tile, on which such properties are then stored. Care should be taken to keep these objects aligned to the grid for the saving to work correctly."
+msgstr ""
+
+#: ../../manual/export.rst:225
+msgid "Defold"
+msgstr ""
+
+#: ../../manual/export.rst:227
+msgid "Tiled can export a map to a `Defold Tile Map <https://www.defold.com/manuals/2dgraphics/#_tile_maps>`__ (\\*.tilemap). This component only supports tile layers and only a single tileset may be used. The plugin is disabled by default."
+msgstr ""
+
+#: ../../manual/export.rst:231
+msgid "Upon export, the ``tile_set`` property of the Tile Map is left empty, so it will need to be set up in Defold after each export."
+msgstr ""
+
+#: ../../manual/export.rst:234
+msgid "When any additional information from the map is needed, the map can be exported in :ref:`Lua format <lua-export>` and loaded as Defold script."
+msgstr ""
+
+#: ../../manual/export.rst:238
+msgid "Other Formats"
+msgstr ""
+
+#: ../../manual/export.rst:240
+msgid "A few other plugins ship with Tiled to support various games:"
+msgstr ""
+
+#: ../../manual/export.rst:242
+msgid "droidcraft"
+msgstr ""
+
+#: ../../manual/export.rst:243
+msgid "Adds support for editing `DroidCraft <https://play.google.com/store/apps/details?id=org.me.droidcraft>`__ maps (\\*.dat)"
+msgstr ""
+
+#: ../../manual/export.rst:244
+msgid "flare"
+msgstr ""
+
+#: ../../manual/export.rst:245
+msgid "Adds support for editing `Flare Engine <http://flarerpg.org/>`__ maps (\\*.txt)"
+msgstr ""
+
+#: ../../manual/export.rst:246
+msgid "replicaisland"
+msgstr ""
+
+#: ../../manual/export.rst:247
+msgid "Adds support for editing `Replica Island <http://replicaisland.net/>`__ maps (\\*.bin)"
+msgstr ""
+
+#: ../../manual/export.rst:249
+msgid "tengine"
+msgstr ""
+
+#: ../../manual/export.rst:249
+msgid "Adds support for exporting to `T-Engine4 <https://te4.org/te4>`__ maps (\\*.lua)"
+msgstr ""
+
+#: ../../manual/export.rst:251
+msgid "These plugins are disabled by default. They can be enabled in *Edit > Preferences > Plugins*."
+msgstr ""
+
+#: ../../manual/export.rst:254
+#: ../../manual/python.rst:2
+msgid "Python Scripts"
+msgstr ""
+
+#: ../../manual/export.rst:256
+msgid "It is also possible to write :doc:`Python scripts <python>` to add support for importing or exporting custom map formats."
+msgstr ""
+
+#: ../../manual/introduction.rst:2
+msgid "Introduction"
+msgstr ""
+
+#: ../../manual/introduction.rst:5
+msgid "About Tiled"
+msgstr ""
+
+#: ../../manual/introduction.rst:7
+msgid "**Tiled is a 2D level editor that helps you develop the content of your game. Its primary feature is to edit tile maps of various forms, but it also supports free image placement as well as powerful ways to annotate your level with extra information used by the game. Tiled focuses on general flexibility while trying to stay intuitive.**"
+msgstr ""
+
+#: ../../manual/introduction.rst:13
+msgid "In terms of tile maps, it supports straight rectangular tile layers, but also projected isometric, staggered isometric and staggered hexagonal layers. A tileset can be either a single image containing many tiles, or it can be a collection of individual images. In order to support certain depth faking techniques, tiles and layers can be offset by a custom distance and their rendering order can be configured."
+msgstr ""
+
+#: ../../manual/introduction.rst:20
+msgid "The primary tool for editing :ref:`tile layers <tile-layer-introduction>` is a stamp brush that allows efficient painting and copying of tile areas. It also supports drawing lines and circles. In addition, there are several selection tools and a tool that does :doc:`automatic terrain transitions <using-the-terrain-tool>`. Finally, it can apply changes based on :doc:`pattern-matching <automapping>` to automate parts of your work."
+msgstr ""
+
+#: ../../manual/introduction.rst:27
+msgid "Tiled also supports :ref:`object layers <object-layer-introduction>`, which traditionally were only for annotating your map with information but more recently they can also be used to place images. You can add rectangle, point, ellipse, polygon, polyline and tile objects. Object placement is not limited to the tile grid and objects can also be scaled or rotated. Object layers offer a lot of flexibility to add almost any information to your level that your game needs."
+msgstr ""
+
+#: ../../manual/introduction.rst:35
+msgid "Other things worth mentioning are the support for adding custom map or tileset formats through plugins, the tile stamp memory, tile animation support and the tile collision editor."
+msgstr ""
+
+#: ../../manual/introduction.rst:42
+msgid "Getting Started"
+msgstr ""
+
+#: ../../manual/introduction.rst:45
+msgid "Creating a New Map"
+msgstr ""
+
+#: ../../manual/introduction.rst:47
+msgid "When launching Tiled for the first time, we are greeted with the following window:"
+msgstr ""
+
+#: ../../manual/introduction.rst:53
+msgid "Tiled Window"
+msgstr ""
+
+#: ../../manual/introduction.rst:55
+msgid "The first thing we'll do is to start a new map with *File -> New -> New Map…* (``Ctrl+N``). The following dialog will pop up:"
+msgstr ""
+
+#: ../../manual/introduction.rst:62
+msgid "New Map"
+msgstr ""
+
+#: ../../manual/introduction.rst:64
+msgid "Here, we choose the initial map size, tile size, orientation, tile layer format, tile render order (only supported for *Orthogonal* maps) and whether the map is :doc:`infinite <using-infinite-maps>` or not. All of these things can be changed later as needed, so it's not important to get it all right the first time."
+msgstr ""
+
+#: ../../manual/introduction.rst:70
+msgid "After saving our map, we'll see the tile grid and an initial tile layer will be added to the map. However, before we can start using any tiles we need to add a tileset. Choose *File -> New -> New Tileset…* to open the New Tileset dialog:"
+msgstr ""
+
+#: ../../manual/introduction.rst:79
+msgid "New Tileset"
+msgstr ""
+
+#: ../../manual/introduction.rst:81
+msgid "Click the *Browse…* button and select the ``tmw_desert_spacing.png`` tileset from the examples shipping with Tiled (or use one of your own if you wish). This example tileset uses a tile size of 32x32. It also has a one pixel *margin* around the tiles and a one pixel *spacing* in between the tiles (this is pretty rare actually, usually you should leave these values on 0)."
+msgstr ""
+
+#: ../../manual/introduction.rst:90
+msgid "We leave the *Embed in map* option disabled. This is recommended, since it will allow the tileset to be used by multiple maps without setting up its parameters again. It will also be good to store the tileset in its own file if you later add tile properties, terrain definitions, collision shapes, etc., since that information is then shared between all your maps."
+msgstr ""
+
+#: ../../manual/introduction.rst:97
+msgid "After saving the tileset, Tiled should look as follows:"
+msgstr ""
+
+#: ../../manual/introduction.rst:102
+msgid "Tileset Created"
+msgstr ""
+
+#: ../../manual/introduction.rst:104
+msgid "Since we don't want to do anything else with the tileset for now, just switch back to the map file:"
+msgstr ""
+
+#: ../../manual/introduction.rst:110
+msgid "Tileset Usable on the Map"
+msgstr ""
+
+#: ../../manual/introduction.rst:112
+msgid "We're ready to select some tiles and start painting! But first, let's have a quick look at the :doc:`various layer types <layers>` supported by Tiled."
+msgstr ""
+
+#: ../../manual/introduction.rst:118
+msgid "Much of the manual still needs to be written. Fortunately, there is a very nice `Tiled Map Editor Tutorial Series`_ on GamesFromScratch.com. In addition, the support for Tiled in various :doc:`engines and frameworks </reference/support-for-tmx-maps>` often comes with some usage information."
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:2
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:4
+msgid "Try out these keyboard shortcuts to help save you time."
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:6
+msgid "On Mac, replace ``Ctrl`` with the ``Command`` key."
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:11
+msgid "``Right Click on Tile`` - Captures the tile under the mouse (drag to capture larger areas)."
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:13
+msgid "``Ctrl + MouseWheel`` - Zoom in/out on tileset and map"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:14
+msgid "``Ctrl + Plus/Minus`` - Zoom in/out on map"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:15
+msgid "``Ctrl + 0`` - Reset zoom on map"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:16
+msgid "``Ctrl + Object Move`` - Toggles \"Snap to Grid\" temporarily"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:17
+msgid "``Ctrl + Object Resize`` - Keep aspect ratio"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:18
+msgid "``Alt + Object Resize`` - Toggles \"Snap to Grid\" temporarily"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:19
+msgid "``Middle Click`` or ``Space Bar`` - Hold to pan the map view"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:20
+msgid "``Ctrl + X`` - Cut (tiles, objects or properties)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:21
+msgid "``Ctrl + C`` - Copy (tiles, objects or properties)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:22
+msgid "``Ctrl + V`` - Paste (tiles, objects or properties)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:23
+msgid "``Del`` - Delete (tiles or objects)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:24
+msgid "``H`` - Toggle highlighting of the current layer"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:25
+msgid "``A`` - Invokes :doc:`automapping`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:26
+msgid "``Alt + C`` - Copy current position of mouse cursor to clipboard (in tile coordinates)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:28
+msgid "``Ctrl + D`` - Duplicate selected objects (since Tiled 1.0, before it was Delete)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:30
+msgid "``Ctrl + Shift + D`` - Duplicate active layer"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:31
+msgid "``F2`` - Rename (if applicable in context)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:32
+msgid "``Tab`` - Hide docks and tool bars (since Tiled 1.0)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:33
+msgid "``Ctrl + PgUp`` - Select previous layer (above current layer)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:34
+msgid "``Ctrl + PgDown`` - Select next layer (below current layer)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:35
+msgid "``Ctrl + Shift + Up`` - Move current layer up"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:36
+msgid "``Ctrl + Shift + Down`` - Move current layer down"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:37
+msgid "``Ctrl + Shift + H`` - Show/Hide all other layers (only active layer visible / all layers visible)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:39
+msgid "``Ctrl + Tab`` - Switch to left document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:40
+msgid "``Ctrl + Shift + Tab`` - Switch to right document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:41
+msgid "``Alt + Left`` - Switch to left document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:42
+msgid "``Alt + Right`` - Switch to right document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:43
+msgid "``Ctrl + G`` - Toggle displaying of the tile grid"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:44
+msgid "``Ctrl + W`` - Close current document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:45
+msgid "``Ctrl + Shift + W`` - Close all documents"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:46
+msgid "``Ctrl + E`` - Export current document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:47
+msgid "``Ctrl + Shift + E`` - Export current document to another file"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:48
+msgid "``Ctrl + R`` - Reload current document"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:49
+msgid "``Ctrl + T`` - Force-reload all tilesets used by the current map (mainly useful when not using the automatic reloading)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:53
+msgid "When a tile layer is selected"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:55
+msgid "``D`` - Toggle Random Mode"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:56
+msgid "``B`` - Activate :ref:`stamp-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:58
+msgid "``Shift + Click`` - Line mode, places tiles on a line between two clicked locations"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:60
+msgid "``Ctrl + Shift + Click`` - Circle mode, places tiles around the clicked center"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:63
+msgid "``T`` - Activate :ref:`terrain-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:64
+msgid "``G`` - Activate :ref:`wang-tool` (since Tiled 1.1)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:65
+msgid "``F`` - Activate :ref:`bucket-fill-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:66
+msgid "``E`` - Activate :ref:`eraser-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:67
+msgid "``R`` - Activate Rectangular Select"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:68
+msgid "``W`` - Activate Magic Wand"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:69
+msgid "``S`` - Activate Select Same Tile"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:70
+msgid "``Ctrl + 1-9`` - Store current tile selection (similar to ``Ctrl + C``)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:72
+msgid "``1-9`` recall the previous selection (similar to ``Ctrl + V``)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:73
+msgid "``Ctrl + A`` - Select the whole layer"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:74
+msgid "``Ctrl + Shift + A`` - Select nothing"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:76
+msgid "Changing the active stamp:"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:78
+msgid "``X`` - Flip active stamp horizontally"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:79
+msgid "``Y`` - Flip active stamp vertically"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:80
+msgid "``Z`` - Rotate active stamp clockwise"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:81
+msgid "``Shift + Z`` - Rotate active stamp counterclockwise"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:85
+msgid "When an object layer is selected"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:87
+msgid "``S`` - Activate :ref:`select-objects-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:89
+msgid "``PgUp`` - Raise selected objects (with Manual object drawing order)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:91
+msgid "``PgDown`` - Lower selected objects (with Manual object drawing order)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:93
+msgid "``Home`` - Move selected objects to Top (with Manual object drawing order)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:95
+msgid "``End`` - Move selected objects to Bottom (with Manual object drawing order)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:98
+msgid "``O`` - Activate :ref:`edit-polygons-tool` (was ``E`` until Tiled 1.0)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:99
+msgid "``R`` - Activate :ref:`insert-rectangle-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:100
+msgid "``I`` - Activate :ref:`insert-point-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:101
+msgid "``C`` - Activate :ref:`insert-ellipse-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:102
+msgid "``P`` - Activate :ref:`insert-polygon-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:103
+msgid "``L`` - Activate :ref:`insert-polyline-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:105
+msgid "``Enter`` - Finish creating object"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:106
+msgid "``Escape`` - Cancel creating object"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:108
+msgid "``T`` - Activate :ref:`insert-tile-tool`"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:109
+msgid "``V`` - Activate :ref:`insert-template-tool` (since Tiled 1.1)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:110
+msgid "``E`` - Activate :ref:`insert-text-tool` (since Tiled 1.0)"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:111
+msgid "``Ctrl + A`` - Select all objects in the current object layer"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:112
+msgid "``Ctrl + Shift + A`` - Clear object selection"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:115
+msgid "In the Properties dialog"
+msgstr ""
+
+#: ../../manual/keyboard-shortcuts.rst:117
+msgid "``Del`` or ``Backspace`` - Deletes a property"
+msgstr ""
+
+#: ../../manual/layers.rst:2
+msgid "Working with Layers"
+msgstr ""
+
+#: ../../manual/layers.rst:4
+msgid "A Tiled map supports various sorts of content, and this content is organized into various different layers. The most common layers are the `Tile Layer <#tile-layers>`__ and the `Object Layer <#object-layers>`__. There is also an `Image Layer <#image-layers>`__ for including simple foreground or background graphics. The order of the layers determines the rendering order of your content."
+msgstr ""
+
+#: ../../manual/layers.rst:11
+msgid "Layers can be hidden, made only partially visible and can be locked. Layers also have an offset, which can be used to position them independently of each other, for example to fake depth."
+msgstr ""
+
+#: ../../manual/layers.rst:18
+msgid "The eye and lock icon toggle the visibility and locked state of a layer respectively."
+msgstr ""
+
+#: ../../manual/layers.rst:21
+msgid "You use `Group Layers <#group-layers>`__ to organize the layers into a hierarchy. This makes it more comfortable to work with a large amount of layers."
+msgstr ""
+
+#: ../../manual/layers.rst:28
+msgid "Tile Layers"
+msgstr ""
+
+#: ../../manual/layers.rst:30
+msgid "Tile layers provide an efficient way of storing a large area filled with tile data. The data is a simple array of tile references and as such no additional information can be stored for each location. The only extra information stored are a few flags, that allow tile graphics to be flipped vertically, horizontally or anti-diagonally (to support rotation in 90-degree increments)."
+msgstr ""
+
+#: ../../manual/layers.rst:37
+msgid "The information needed to render each tile layer is stored with the map, which specifies the position and rendering order of the tiles based on the orientation and various other properties."
+msgstr ""
+
+#: ../../manual/layers.rst:41
+msgid "Despite only being able to refer to tiles, tile layers can also be useful for defining various bits of non-graphical information in your level. Collision information can often be conveyed using a special tileset, and any kind of object that does not need custom properties and is always aligned to the grid can also be placed on a tile layer."
+msgstr ""
+
+#: ../../manual/layers.rst:50
+msgid "Object Layers"
+msgstr ""
+
+#: ../../manual/layers.rst:52
+msgid "Object layers are useful because they can store many kinds of information that would not fit in a tile layer. Objects can be freely positioned, resized and rotated. They can also have individual custom properties. There are many kinds of objects:"
+msgstr ""
+
+#: ../../manual/layers.rst:57
+msgid "**Rectangle** - for marking custom rectangular areas"
+msgstr ""
+
+#: ../../manual/layers.rst:58
+msgid "**Ellipse** - for marking custom ellipse or circular areas"
+msgstr ""
+
+#: ../../manual/layers.rst:59
+msgid "**Point** - for marking exact locations"
+msgstr ""
+
+#: ../../manual/layers.rst:60
+msgid "**Polygon** - for when a rectangle or ellipse doesn't cut it (often a collision area)"
+msgstr ""
+
+#: ../../manual/layers.rst:62
+msgid "**Polyline** - can be a path to follow or a wall to collide with"
+msgstr ""
+
+#: ../../manual/layers.rst:63
+msgid "**Tile** - for freely placing, scaling and rotating your tile graphics"
+msgstr ""
+
+#: ../../manual/layers.rst:65
+msgid "**Text** - for custom text or notes (since Tiled 1.0)"
+msgstr ""
+
+#: ../../manual/layers.rst:67
+msgid "All objects can be named, in which case their name will show up in a label above them (by default only for selected objects). Objects can also be given a *type*, which is useful since it can be used to customize the color of their label and the available :ref:`custom properties <predefining-properties>` for this object type. For tile objects, the type can be :ref:`inherited from their tile <tile-property-inheritance>`."
+msgstr ""
+
+#: ../../manual/layers.rst:75
+msgid "For most map types, objects are positioned in plain pixels. The only exception to this are isometric maps (not isometric staggered). For isometric maps, it was deemed useful to store their positions in a projected coordinate space. For this, the isometric tiles are assumed to represent projected squares with both sides equal to the *tile height*. If you're using a different coordinate space for objects in your isometric game, you'll need to convert these coordinates accordingly."
+msgstr ""
+
+#: ../../manual/layers.rst:83
+msgid "The object width and height is also mostly stored in pixels. For isometric maps, all shape objects (rectangle, point, ellipse, polygon and polyline) are projected into the same coordinate space described above. This is based on the assumption that these objects are generally used to mark areas on the map."
+msgstr ""
+
+#: ../../manual/layers.rst:90
+msgid "Image Layers"
+msgstr ""
+
+#: ../../manual/layers.rst:92
+msgid "Image layers provide a way to quickly include a single image as foreground or background of your map. They are currently not so useful, because if you instead add the image as a Tileset and place it as a :ref:`Tile Object <insert-tile-tool>`, you gain the ability to freely scale and rotate the image."
+msgstr ""
+
+#: ../../manual/layers.rst:97
+msgid "The only advantage of using an image layer is that it avoids selecting / dragging the image while using the Select Objects tool. However, since Tiled 1.1 this can also be achieved by locking the object layer containing the tile object you'd like to avoid interacting with."
+msgstr ""
+
+#: ../../manual/layers.rst:107
+msgid "Group Layers"
+msgstr ""
+
+#: ../../manual/layers.rst:109
+msgid "Group layers work like folders and can be used for organizing the layers into a hierarchy. This is mainly useful when your map contains a large amount of layers."
+msgstr ""
+
+#: ../../manual/layers.rst:113
+msgid "The visibility, opacity, offset and lock of a group layer affects all child layers."
+msgstr ""
+
+#: ../../manual/layers.rst:116
+msgid "Layers can be easily dragged in and out of groups with the mouse. The Raise Layer / Lower Layer actions also allow moving layers in and out of groups."
+msgstr ""
+
+#: ../../manual/layers.rst:123
+msgid "There are many ways in which the layers can be made more powerful:"
+msgstr ""
+
+#: ../../manual/layers.rst:125
+msgid "Ability to lock individual objects (`#828 <https://github.com/bjorn/tiled/issues/828>`__)."
+msgstr ""
+
+#: ../../manual/layers.rst:127
+msgid "Moving certain map-global properties to the Tile Layer (`#149 <https://github.com/bjorn/tiled/issues/149>`__). It would be useful if one map could accommodate layers of different tile sizes and maybe even of different orientation."
+msgstr ""
+
+#: ../../manual/objects.rst:2
+msgid "Working with Objects"
+msgstr ""
+
+#: ../../manual/objects.rst:4
+msgid "Using objects you can add a great deal of information to your map for use in your game. They can replace tedious alternatives like hardcoding coordinates (like spawn points) in your source code or maintaining additional data files for storing gameplay elements. With the addition of *tile objects*, they also became useful for graphical purposes and can in some cases replace tile layers entirely, as demonstrated by the \"Sticker Knight\" example shipping with Tiled."
+msgstr ""
+
+#: ../../manual/objects.rst:12
+msgid "To start using objects, add an :ref:`Object Layer <object-layer-introduction>` to your map."
+msgstr ""
+
+#: ../../manual/objects.rst:16
+msgid "Placement Tools"
+msgstr ""
+
+#: ../../manual/objects.rst:18
+msgid "Each type of object has its own placement tool."
+msgstr ""
+
+#: ../../manual/objects.rst:23
+msgid "Insert Rectangle"
+msgstr ""
+
+#: ../../manual/objects.rst:25
+msgid "Shortcut: ``R``"
+msgstr ""
+
+#: ../../manual/objects.rst:27
+msgid "The rectangle was the first type of object supported by Tiled, which is why objects are rectangles by default in the :doc:`/reference/tmx-map-format`. They are useful for marking rectangular areas and assigning custom properties to them. They are also often used for specifying collision boxes."
+msgstr ""
+
+#: ../../manual/objects.rst:32
+msgid "Place a rectangle by clicking-and-dragging in any direction. Holding ``Shift`` makes it square and holding ``Ctrl`` snaps its size to the tile size."
+msgstr ""
+
+#: ../../manual/objects.rst:36
+msgid "If the rectangle is empty (width and height are both 0), it is rendered as a small square around its position. This is mainly to keep it visible and selectable."
+msgstr ""
+
+#: ../../manual/objects.rst:43
+msgid "Insert Point"
+msgstr ""
+
+#: ../../manual/objects.rst:45
+msgid "Shortcut: ``I``"
+msgstr ""
+
+#: ../../manual/objects.rst:47
+msgid "Points are the simplest objects you can place on a map. They only represent a location, and cannot be resized or rotated. Simply click on the map to position a point object."
+msgstr ""
+
+#: ../../manual/objects.rst:54
+msgid "Insert Ellipse"
+msgstr ""
+
+#: ../../manual/objects.rst:56
+msgid "Shortcut: ``C``"
+msgstr ""
+
+#: ../../manual/objects.rst:58
+msgid "Ellipses work the same way as `rectangles <#insert-rectangle>`__, except that they are rendered as an ellipse. Useful for when your area or collision shape needs to represent a circle or ellipse."
+msgstr ""
+
+#: ../../manual/objects.rst:65
+msgid "Insert Polygon"
+msgstr ""
+
+#: ../../manual/objects.rst:67
+msgid "Shortcut: ``P``"
+msgstr ""
+
+#: ../../manual/objects.rst:69
+msgid "Polygons are the most flexible way of defining the shape of an area. They are most commonly used for defining collision shapes."
+msgstr ""
+
+#: ../../manual/objects.rst:72
+msgid "When placing a polygon, the first click determines the location of the object as well as the location of the first point of the polygon. Subsequent clicks are used to add additional points to the polygon. Right click or press ``Enter`` to finish creating the polygon. Polygons needs to have at least three points. You can press ``Escape`` to cancel the creation of the polygon."
+msgstr ""
+
+#: ../../manual/objects.rst:79
+msgid "When you want to change a polygon after it has been placed, you need to use the :ref:`edit-polygons-tool` tool."
+msgstr ""
+
+#: ../../manual/objects.rst:85
+msgid "Insert Polyline"
+msgstr ""
+
+#: ../../manual/objects.rst:87
+msgid "Shortcut: ``L``"
+msgstr ""
+
+#: ../../manual/objects.rst:89
+msgid "Polylines work very similar to `polygons <#insert-polygon>`__, except that they are rendered as a line and require only two points. While they can represent collision walls, they are also often used to represent paths to be followed."
+msgstr ""
+
+#: ../../manual/objects.rst:94
+msgid "Despite its name, the :ref:`edit-polygons-tool` tool is also used to edit polylines."
+msgstr ""
+
+#: ../../manual/objects.rst:100
+msgid "Insert Tile"
+msgstr ""
+
+#: ../../manual/objects.rst:104
+msgid "Tiles can be inserted as objects to have full flexibility in placing, scaling and rotating the tile image on your map. Like all objects, tile objects can also have custom properties associated with them. This makes them useful for placement of recognizable interactive objects that need special information, like a chest with defined contents or an NPC with defined script."
+msgstr ""
+
+#: ../../manual/objects.rst:111
+msgid "To place a tile object, first select the tile you want to place in the Tilesets view. Then use the Left mouse button on the map to start placing the object, move to position it based on the preview and release to finish placing the object."
+msgstr ""
+
+#: ../../manual/objects.rst:120
+msgid "To change the tile used by existing tile objects, select all the objects you want to change using the :ref:`select-objects-tool` tool and then right-click on a tile in the Tilesets view, and choose *Replace Tile of Selected Objects*."
+msgstr ""
+
+#: ../../manual/objects.rst:132
+msgid "Insert Template"
+msgstr ""
+
+#: ../../manual/objects.rst:134
+#: ../../manual/using-templates.rst:49
+msgid "Shortcut: ``V``"
+msgstr ""
+
+#: ../../manual/objects.rst:136
+msgid "Can be used to quickly insert multiple instances of the template selected in the Templates view. See :ref:`creating-template-instances`."
+msgstr ""
+
+#: ../../manual/objects.rst:142
+msgid "Insert Text"
+msgstr ""
+
+#: ../../manual/objects.rst:144
+msgid "Shortcut: ``X``"
+msgstr ""
+
+#: ../../manual/objects.rst:146
+msgid "Text objects can be used to add arbitrary multi-line text to your maps. You can configure various font properties and the wrapping / clipping area, making them useful for both quick notes as well as text used in the game."
+msgstr ""
+
+#: ../../manual/objects.rst:154
+msgid "Select Objects"
+msgstr ""
+
+#: ../../manual/objects.rst:156
+msgid "Shortcut: ``S``"
+msgstr ""
+
+#: ../../manual/objects.rst:158
+msgid "When you're not inserting new objects, you're generally using the Select Objects tool. It packs a lot of functionality, which is outlined below."
+msgstr ""
+
+#: ../../manual/objects.rst:162
+msgid "Selecting and Deselecting"
+msgstr ""
+
+#: ../../manual/objects.rst:164
+msgid "You can select objects by clicking them or by dragging a rectangular lasso, selecting any object that intersect with its area. By holding ``Shift`` or ``Ctrl`` while clicking, you can add/remove single objects to/from the selection."
+msgstr ""
+
+#: ../../manual/objects.rst:169
+msgid "When pressing and dragging on an object, this object is selected and moved. When this prevents you from starting a rectangular selection, you can hold ``Shift`` to force the selection rectangle."
+msgstr ""
+
+#: ../../manual/objects.rst:177
+msgid "By default you interact with the top-most object. When you need to select an object below another object, first select the higher object and then hold ``Alt`` while clicking at the same location to select lower objects. You can also hold ``Alt`` while opening the context menu to get a list of all objects at the clicked location, so you may directly select the desired object."
+msgstr ""
+
+#: ../../manual/objects.rst:185
+msgid "Moving"
+msgstr ""
+
+#: ../../manual/objects.rst:187
+msgid "You can simply drag any single object, or drag already selected objects by dragging any one of them. Hold ``Ctrl`` to toggle snapping to the tile grid."
+msgstr ""
+
+#: ../../manual/objects.rst:191
+msgid "Hold ``Alt`` to force a move operation on the currently selected objects, regardless of where you click on the map. This is useful when the selected objects are small or covered by other objects."
+msgstr ""
+
+#: ../../manual/objects.rst:195
+msgid "The selected objects can also be moved with the arrow keys. By default this moves the objects pixel by pixel. Hold ``Shift`` while using the arrow keys to move the objects by distance of one tile."
+msgstr ""
+
+#: ../../manual/objects.rst:200
+msgid "Resizing"
+msgstr ""
+
+#: ../../manual/objects.rst:202
+msgid "You can use the resize handles to resize one or more selected objects. Hold ``Ctrl`` to keep the aspect ratio of the object and/or ``Shift`` to place the resize origin in the center."
+msgstr ""
+
+#: ../../manual/objects.rst:206
+msgid "Note that you can only change width and height independently when resizing a single object. When having multiple objects selected, the aspect ratio is constant because there would be no way to make that work for rotated objects without full support for transformations."
+msgstr ""
+
+#: ../../manual/objects.rst:212
+msgid "Rotating"
+msgstr ""
+
+#: ../../manual/objects.rst:214
+msgid "To rotate, click any selected object to change the resize handles into rotation handles. Before rotating, you can drag the rotation origin to another position if necessary. Hold ``Shift`` to rotate in 15-degree increments. Click any selected object again to go back to resize mode."
+msgstr ""
+
+#: ../../manual/objects.rst:219
+msgid "You can also rotate the selected objects in 90-degree steps by pressing ``Z`` or ``Shift + Z``."
+msgstr ""
+
+#: ../../manual/objects.rst:223
+msgid "Changing Stacking Order"
+msgstr ""
+
+#: ../../manual/objects.rst:225
+msgid "If the active :ref:`Object Layer <object-layer-introduction>` has its Drawing Order property set to Manual (the default is Top Down), you can control the stacking order of the selected objects within their object layer using the following keys:"
+msgstr ""
+
+#: ../../manual/objects.rst:230
+msgid "``PgUp`` - Raise selected objects"
+msgstr ""
+
+#: ../../manual/objects.rst:231
+msgid "``PgDown`` - Lower selected objects"
+msgstr ""
+
+#: ../../manual/objects.rst:232
+msgid "``Home`` - Move selected objects to Top"
+msgstr ""
+
+#: ../../manual/objects.rst:233
+msgid "``End`` - Move selected objects to Bottom"
+msgstr ""
+
+#: ../../manual/objects.rst:235
+msgid "You can also find these actions in the context menu. When you have multiple Object Layers, the context menu also contains actions to move the selected objects to another layer."
+msgstr ""
+
+#: ../../manual/objects.rst:240
+msgid "Flipping Objects"
+msgstr ""
+
+#: ../../manual/objects.rst:242
+msgid "You can flip the selected objects horizontally by pressing ``X`` or vertically by pressing ``Y``. For tile objects, this also flips their images."
+msgstr ""
+
+#: ../../manual/objects.rst:249
+msgid "Edit Polygons"
+msgstr ""
+
+#: ../../manual/objects.rst:253
+msgid "Polygons and polylines have their own editing needs and as such are covered by a separate tool, which allows selecting and moving around their nodes. You can select and move the nodes of multiple polygons at the same time."
+msgstr ""
+
+#: ../../manual/objects.rst:258
+msgid "Nodes can be deleted by selecting them and choosing \"Delete Nodes\" from the context menu. The ``Delete`` key can also be used to delete the selected nodes, or the selected objects if no nodes are selected."
+msgstr ""
+
+#: ../../manual/objects.rst:262
+msgid "When you have selected multiple consecutive nodes of the same polygon, you can join them together by choosing \"Join Nodes\" from the context menu. You can also split the segments in between the nodes by choosing \"Split Segments\", which is currently the only way to extend an existing polygon. You can also delete a segment when two consecutive nodes are selected in a polygon by choosing \"Delete Segment\" in the context menu. This will convert a polygon into a polyline."
+msgstr ""
+
+#: ../../manual/objects.rst:273
+msgid "Here are some ideas about improvements that could be made to the above tools:"
+msgstr ""
+
+#: ../../manual/objects.rst:276
+msgid "For the `Insert Tile <#insert-tile>`__ tool, show the preview already before pressing the left mouse button (`#537 <https://github.com/bjorn/tiled/issues/537>`__)"
+msgstr ""
+
+#: ../../manual/objects.rst:280
+msgid "Many improvements could be made to the support for editing polygons and polylines, like allowing to rotate and scale the selected nodes (`#1487 <https://github.com/bjorn/tiled/issues/1487>`__)."
+msgstr ""
+
+#: ../../manual/preferences.rst:2
+msgid "User Preferences"
+msgstr ""
+
+#: ../../manual/preferences.rst:4
+msgid "There are only a few options located in the Preferences, accessible though the menu via *Edit > Preferences*. Most other options, like whether to draw the grid, what kind snapping to do or the last used settings when creating a new map are simply remembered persistently."
+msgstr ""
+
+#: ../../manual/preferences.rst:9
+msgid "The preferences are stored in a system-dependent format and location:"
+msgstr ""
+
+#: ../../manual/preferences.rst:12
+msgid "**Windows**"
+msgstr ""
+
+#: ../../manual/preferences.rst:12
+msgid "Registry key ``HKEY_CURRENT_USER\\SOFTWARE\\mapeditor.org\\Tiled``"
+msgstr ""
+
+#: ../../manual/preferences.rst:14
+msgid "**macOS**"
+msgstr ""
+
+#: ../../manual/preferences.rst:14
+msgid "``~/Library/Preferences/org.mapeditor.Tiled.plist``"
+msgstr ""
+
+#: ../../manual/preferences.rst:16
+msgid "**Linux**"
+msgstr ""
+
+#: ../../manual/preferences.rst:16
+msgid "``~/.config/mapeditor.org/tiled.conf``"
+msgstr ""
+
+#: ../../manual/preferences.rst:29
+msgid "Saving and Loading"
+msgstr ""
+
+#: ../../manual/preferences.rst:36
+msgid "Include DTD reference in saved maps"
+msgstr ""
+
+#: ../../manual/preferences.rst:32
+msgid "This option is not enabled by default, since it is of very little use whereas it can in some environments cause problems. Feel free to enable it if it helps with validation for example, but note that the referenced DTD is likely out of date (there is a somewhat more up-to-date XSD file available in the repository)."
+msgstr ""
+
+#: ../../manual/preferences.rst:40
+msgid "Reload tileset images when they change"
+msgstr ""
+
+#: ../../manual/preferences.rst:39
+msgid "This is very useful while working on the tiles or when the tiles might change as a result of a source control system."
+msgstr ""
+
+#: ../../manual/preferences.rst:43
+msgid "Open last files on startup"
+msgstr ""
+
+#: ../../manual/preferences.rst:43
+msgid "Generally a useful thing to keep enabled."
+msgstr ""
+
+#: ../../manual/preferences.rst:51
+msgid "Use safe writing of files"
+msgstr ""
+
+#: ../../manual/preferences.rst:46
+msgid "This setting causes files to be written to a temporary file, and when all went well, to be swapped with the target file. This avoids data getting lost due to errors while saving or due to insufficient disk space. Unfortunately, it is known to cause issues when saving files to a Dropbox folder or a network drive, in which case it helps to disable this feature."
+msgstr ""
+
+#: ../../manual/preferences.rst:54
+msgid "Interface"
+msgstr ""
+
+#: ../../manual/preferences.rst:58
+msgid "Language"
+msgstr ""
+
+#: ../../manual/preferences.rst:57
+msgid "By default the language tries to match that of the system, but if it picks the wrong one you can change it here."
+msgstr ""
+
+#: ../../manual/preferences.rst:61
+msgid "Grid colour"
+msgstr ""
+
+#: ../../manual/preferences.rst:61
+msgid "Because black is not always the best color for the grid."
+msgstr ""
+
+#: ../../manual/preferences.rst:66
+msgid "Fine grid divisions"
+msgstr ""
+
+#: ../../manual/preferences.rst:64
+msgid "The tile grid can be divided further using this setting, which affects the \"Snap to Fine Grid\" setting in the *View > Snapping* menu."
+msgstr ""
+
+#: ../../manual/preferences.rst:71
+msgid "Object line width"
+msgstr ""
+
+#: ../../manual/preferences.rst:69
+msgid "Shapes are by default rendered with a 2 pixel wide line, but some people like it thinner or even thicker. On some systems the DPI-based scaling will affect this setting as well."
+msgstr ""
+
+#: ../../manual/preferences.rst:76
+msgid "Hardware accelerated drawing (OpenGL)"
+msgstr ""
+
+#: ../../manual/preferences.rst:74
+msgid "This enables a rather unoptimized way of rendering the map using OpenGL. It's usually not an improvement and may lead to crashes, but in some scenarios it can make editing more responsive."
+msgstr ""
+
+#: ../../manual/preferences.rst:86
+msgid "Mouse wheel zooms by default"
+msgstr ""
+
+#: ../../manual/preferences.rst:83
+msgid "This option causes the mouse wheel to zoom without the need to hold Control (or Command on macOS). It can be a convenient way to navigate the map, but it can also interfere with panning on a touchpad."
+msgstr ""
+
+#: ../../manual/preferences.rst:89
+msgid "Theme"
+msgstr ""
+
+#: ../../manual/preferences.rst:91
+msgid "On Windows and Linux, the default style used by Tiled is \"Tiled Fusion\". This is a customized version of the \"Fusion\" style that ships with Qt. On macOS, this style can also be used, but because it looks so out of place the default is \"Native\" there."
+msgstr ""
+
+#: ../../manual/preferences.rst:96
+msgid "The \"Tiled Fusion\" style allows customizing the base color. When choosing a dark base color, the text automatically switches to white and some other adjustments are made to keep things readable. You can also choose a custom selection color."
+msgstr ""
+
+#: ../../manual/preferences.rst:101
+msgid "The \"Native\" style tries to fit in with the operating system, and is available since it is in some cases preferable to the custom style. The base color and selection color can't be changed when using this style, as they depend on the system."
+msgstr ""
+
+#: ../../manual/preferences.rst:107
+msgid "Updates"
+msgstr ""
+
+#: ../../manual/preferences.rst:109
+msgid "The official macOS builds and the Windows installers of Tiled ship with an automatic update check, done by `Sparkle`_ and `WinSparkle`_ respectively. These solutions also offer to download the new version and to upgrade or run the installer afterwards."
+msgstr ""
+
+#: ../../manual/preferences.rst:114
+msgid "You can turn off the update checks or trigger them manually using the *Check Now* button."
+msgstr ""
+
+#: ../../manual/preferences.rst:118
+msgid "Plugins"
+msgstr ""
+
+#: ../../manual/preferences.rst:120
+msgid "Here you can choose which plugins are enabled. Currently plugins only serve to add support for additional map and/or tileset file formats. Some generic plugins are enabled by default, while more specific ones need to be manually enabled."
+msgstr ""
+
+#: ../../manual/preferences.rst:125
+msgid "There is no need to restart Tiled when enabling or disabling plugins. When a plugin fails to load, try hovering its icon to see if the tool tip displays a useful error message."
+msgstr ""
+
+#: ../../manual/preferences.rst:129
+msgid "See :doc:`export` for more information about supported file formats."
+msgstr ""
+
+#: ../../manual/python.rst:4
+msgid "Tiled ships with a plugin that enables you to use Python 2.7 to add support for custom map formats. This is nice especially since you don't need to compile Tiled yourself and the scripts are easy to deploy to any platform."
+msgstr ""
+
+#: ../../manual/python.rst:9
+msgid "For the scripts to get loaded, they should be placed in ``~/.tiled``. Tiled watches this directory for changes, so there is no need to restart Tiled after adding or changing scripts (though the directory needs to exist when you start Tiled)."
+msgstr ""
+
+#: ../../manual/python.rst:14
+msgid "There are several `example scripts`_ available in the repository."
+msgstr ""
+
+#: ../../manual/python.rst:18
+msgid "On Windows, Python is not installed by default. For the Tiled Python plugin to work, you'll need to install Python 2.7 (get it from https://www.python.org/). On Linux you may also need to install the appropriate package."
+msgstr ""
+
+#: ../../manual/python.rst:25
+msgid "Example Export Plugin"
+msgstr ""
+
+#: ../../manual/python.rst:27
+msgid "Suppose you'd like to have a map exported in the following format:"
+msgstr ""
+
+#: ../../manual/python.rst:44
+msgid "You can achieve this by saving the following ``example.py`` script in the scripts directory:"
+msgstr ""
+
+#: ../../manual/python.rst:82
+msgid "Then you should see an \"Example files\" entry in the type dropdown when going to *File > Export*, which allows you to export the map using the above script."
+msgstr ""
+
+#: ../../manual/python.rst:88
+msgid "This example does not support the use of group layers, and in fact the script API doesn't support this yet either. Any help with maintaining the Python plugin would be very appreciated. See `open issues related to Python support`_."
+msgstr ""
+
+#: ../../manual/python.rst:94
+msgid "Debugging Your Script"
+msgstr ""
+
+#: ../../manual/python.rst:96
+msgid "Any errors that happen while parsing or running the script are printed to the Debug Console, which can be enabled in *View > Views and Toolbars > Debug Console*."
+msgstr ""
+
+#: ../../manual/python.rst:101
+msgid "API Reference"
+msgstr ""
+
+#: ../../manual/python.rst:103
+msgid "It would be nice to have the full API reference documented here, but for now please check out the `source file`_ for available classes and methods."
+msgstr ""
+
+#: ../../manual/using-commands.rst:2
+msgid "Using Commands"
+msgstr ""
+
+#: ../../manual/using-commands.rst:4
+msgid "The Command Button allows you to create and run shell commands (other programs) from Tiled."
+msgstr ""
+
+#: ../../manual/using-commands.rst:7
+msgid "You may setup as many commands as you like. This is useful if you edit maps for multiple games and you want to set up a command for each game. Or you could setup multiple commands for the same game that load different checkpoints or configurations."
+msgstr ""
+
+#: ../../manual/using-commands.rst:13
+msgid "The Command Button"
+msgstr ""
+
+#: ../../manual/using-commands.rst:15
+msgid "It is located on the main toolbar to the right of the redo button. Clicking on it will run the default command (the first command in the command list). Clicking the arrow next to it will bring down a menu that allows you to run any command you have set up, as well as an option to open the Edit Commands dialog. You can also find all the commands in the File menu."
+msgstr ""
+
+#: ../../manual/using-commands.rst:22
+msgid "Apart from this, you can set up custom keyboard shortcuts for each command."
+msgstr ""
+
+#: ../../manual/using-commands.rst:26
+msgid "Editing Commands"
+msgstr ""
+
+#: ../../manual/using-commands.rst:28
+msgid "The 'Edit Commands' dialog contains a list of commands. Each command has several properties:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:32
+msgid "The name of the command as it will be shown in the drop down list, so you can easily identify it."
+msgstr ""
+
+#: ../../manual/using-commands.rst:37
+msgid "Executable"
+msgstr ""
+
+#: ../../manual/using-commands.rst:36
+msgid "The executable to run. It should either be a full path or the name of an executable in the system PATH."
+msgstr ""
+
+#: ../../manual/using-commands.rst:40
+msgid "Arguments"
+msgstr ""
+
+#: ../../manual/using-commands.rst:40
+msgid "The arguments for running the executable."
+msgstr ""
+
+#: ../../manual/using-commands.rst:43
+msgid "Working directory"
+msgstr ""
+
+#: ../../manual/using-commands.rst:43
+msgid "The path to the working directory."
+msgstr ""
+
+#: ../../manual/using-commands.rst:47
+msgid "Shortcut"
+msgstr ""
+
+#: ../../manual/using-commands.rst:46
+msgid "A custom key sequence to trigger the command. You can use 'Clear' to reset the shortcut."
+msgstr ""
+
+#: ../../manual/using-commands.rst:52
+msgid "Output in Debug Console"
+msgstr ""
+
+#: ../../manual/using-commands.rst:50
+msgid "If this is enabled, then the output (stdout and stderr) of this command will be displayed in the Debug Console. You can find the Debug Console in *View > Views and Toolbars > Debug Console*."
+msgstr ""
+
+#: ../../manual/using-commands.rst:56
+msgid "Save map before executing"
+msgstr ""
+
+#: ../../manual/using-commands.rst:55
+msgid "If this is enabled, then the current map will be saved before executing the command."
+msgstr ""
+
+#: ../../manual/using-commands.rst:60
+msgid "Enabled"
+msgstr ""
+
+#: ../../manual/using-commands.rst:59
+msgid "A quick way to disable commands and remove them from the drop down list. The default command is the first enabled command."
+msgstr ""
+
+#: ../../manual/using-commands.rst:62
+msgid "Note that if the executable or any of its arguments contain spaces, these parts need to be quoted."
+msgstr ""
+
+#: ../../manual/using-commands.rst:66
+msgid "Substituted Variables"
+msgstr ""
+
+#: ../../manual/using-commands.rst:68
+msgid "In the executable, arguments and working directory fields, you can use the following variables:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:72
+msgid "``%mapfile``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:72
+msgid "the current maps full path."
+msgstr ""
+
+#: ../../manual/using-commands.rst:75
+msgid "``%mappath``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:75
+msgid "the full folder path in which the map is located. (since Tiled 0.18)"
+msgstr ""
+
+#: ../../manual/using-commands.rst:78
+msgid "``%objecttype``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:78
+msgid "the type of the currently selected object, if any. (since Tiled 0.12)"
+msgstr ""
+
+#: ../../manual/using-commands.rst:81
+msgid "``%objectid``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:81
+msgid "the ID of the currently selected object, if any. (since Tiled 0.17)"
+msgstr ""
+
+#: ../../manual/using-commands.rst:84
+msgid "``%layername``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:84
+msgid "the name of the currently selected layer. (since Tiled 0.17)"
+msgstr ""
+
+#: ../../manual/using-commands.rst:86
+msgid "For the working directory field, you can additionally use the following variable:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:91
+msgid "``%executablepath``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:90
+msgid "the path to the executable."
+msgstr ""
+
+#: ../../manual/using-commands.rst:94
+msgid "Example Commands"
+msgstr ""
+
+#: ../../manual/using-commands.rst:96
+msgid "Launching a custom game called \"mygame\" with a -loadmap parameter and the mapfile:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:103
+msgid "On Mac, remember that Apps are folders, so you need to run the actual executable from within the ``Contents/MacOS`` folder:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:110
+msgid "Or use ``open`` (and note the quotes since one of the arguments contains spaces):"
+msgstr ""
+
+#: ../../manual/using-commands.rst:117
+msgid "Some systems also have a command to open files in the appropriate program:"
+msgstr ""
+
+#: ../../manual/using-commands.rst:120
+msgid "OSX: ``open %mapfile``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:121
+msgid "GNOME systems like Ubuntu: ``gnome-open %mapfile``"
+msgstr ""
+
+#: ../../manual/using-commands.rst:122
+msgid "FreeDesktop.org standard: ``xdg-open %mapfile``"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:6
+msgid "Using Infinite Maps"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:8
+msgid "Infinite maps give you independence from bounds of the map. The canvas is \"auto-growing\", which basically means, that you have an infinite grid which can be painted upon without worrying about the width and height of the map. The bounds of a particular layer get expanded whenever tiles are painted outside the current bounds."
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:18
+msgid "Creating an Infinite Map"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:20
+msgid "In the order to create an infinite map, make sure the 'Infinite' option is selected in New Map dialog."
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:27
+msgid "The newly created map will then have an infinite canvas."
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:30
+msgid "Editing the Infinite Map"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:32
+msgid "Except for the :ref:`bucket-fill-tool`, all tools works exactly in the same way as in the fixed-size maps. The Bucket Fill Tool fills the current bounds of that particular tile layer. These bounds get increased upon further painting of that tile layer."
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:41
+msgid "Conversion from Infinite to Finite Map and Vice Versa"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:43
+msgid "In the map properties, you can toggle whether the map should be infinite or not. When converting from infinite to a finite map, the width and height of the final map are chosen on the basis of bounds of all the tile layers."
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:51
+msgid "The Initial Infinite Map"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:56
+msgid "Unchecking the Infinite property in Map Properties"
+msgstr ""
+
+#: ../../manual/using-infinite-maps.rst:61
+msgid "The Converted Map"
+msgstr ""
+
+#: ../../manual/using-templates.rst:6
+msgid "Using Templates"
+msgstr ""
+
+#: ../../manual/using-templates.rst:8
+msgid "Any created object can be saved as a template. These templates can then be instantiated elsewhere as objects that inherit the template's properties. This can save a lot of tedious work of setting up the object type and properties, or even just finding the right tile in the tileset."
+msgstr ""
+
+#: ../../manual/using-templates.rst:13
+msgid "Each template is stored in its own file and they can be organized in directories. You can save templates in either XML or JSON format, just like map and tileset files."
+msgstr ""
+
+#: ../../manual/using-templates.rst:21
+msgid "Creating Templates"
+msgstr ""
+
+#: ../../manual/using-templates.rst:23
+msgid "A template can be created by right clicking on any object in the map and selecting \"Save As Template\". You will be asked to choose the file name and the format to save the template in. If the object already has a name the suggested file name will be based on that."
+msgstr ""
+
+#: ../../manual/using-templates.rst:31
+msgid "You can't create a template from a tile object that uses a tile from an embedded tileset, because :ref:`template files <tmx-template-files>` do not support referring to such tilesets."
+msgstr ""
+
+#: ../../manual/using-templates.rst:37
+msgid "The Templates View"
+msgstr ""
+
+#: ../../manual/using-templates.rst:39
+msgid "Working with templates is done through the Templates view. The Templates view is divided into two parts: the left part is a tree view that shows the template files in a selected directory and the right part shows a preview of the selected template."
+msgstr ""
+
+#: ../../manual/using-templates.rst:47
+msgid "Creating Template Instances"
+msgstr ""
+
+#: ../../manual/using-templates.rst:51
+msgid "Template instantiation works by either dragging and dropping the template from the list of templates to the map, or by using the \"Insert Template\" tool by selecting a template and clicking on the map which is more convenient when you want to create many instances."
+msgstr ""
+
+#: ../../manual/using-templates.rst:61
+msgid "Editing Templates"
+msgstr ""
+
+#: ../../manual/using-templates.rst:63
+msgid "Selecting a template will show an editable preview in the Templates view and will show the template's properties in the Properties view where they can be edited. Changes to the template are saved automatically."
+msgstr ""
+
+#: ../../manual/using-templates.rst:67
+msgid "All template instances are linked to their template, so all edits will be immediately reflected upon all the template instances on the map."
+msgstr ""
+
+#: ../../manual/using-templates.rst:73
+msgid "If a property of a template instance is changed, it will be internally marked as an overridden property and won't be changed when the template changes."
+msgstr ""
+
+#: ../../manual/using-templates.rst:77
+msgid "Detaching Template Instances"
+msgstr ""
+
+#: ../../manual/using-templates.rst:79
+msgid "Detaching a template instance will disconnect it from its template, so any further edits to the template will not affect the detached instance."
+msgstr ""
+
+#: ../../manual/using-templates.rst:82
+msgid "To detach an instance, right click on it and select *Detach*."
+msgstr ""
+
+#: ../../manual/using-templates.rst:87
+msgid "Resetting overridden properties individually (`#1725 <https://github.com/bjorn/tiled/issues/1725>`__)."
+msgstr ""
+
+#: ../../manual/using-templates.rst:88
+msgid "Locking template properties (`#1726 <https://github.com/bjorn/tiled/issues/1726>`__)."
+msgstr ""
+
+#: ../../manual/using-templates.rst:89
+msgid "Handling wrong file paths (`#1732 <https://github.com/bjorn/tiled/issues/1732>`__)."
+msgstr ""
+
+#: ../../manual/using-templates.rst:90
+msgid "Managing the templates folder, e.g. moving, renaming or deleting a template or a sub-folder (`#1723 <https://github.com/bjorn/tiled/issues/1723>`__)."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:2
+msgid "Using the Terrain Brush"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:4
+msgid "The :ref:`terrain-tool` was added to make editing tile maps easier when using terrain transitions. There are of course multiple ways to do transitions between tiles. This tool supports transition tiles that have a well-defined terrain type at each of their 4 corners, which seems to be the most common method."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:10
+msgid "To demonstrate how to use this tool we describe the steps necessary to reproduce the ``desert.tmx`` example map, which now also includes terrain information in its tileset."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:15
+msgid "Create a New Map and Add a Tileset"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:17
+msgid "First of all, follow the :ref:`getting-started` instructions to set up the map and the tileset."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:20
+msgid "The ``tmw_desert_spacing.png`` tileset we just set up has 4 different terrain types. Traditionally editing a map with these tiles meant that you had to carefully connect the right transitions to avoid broken edges. Now we will define the terrain information for this tileset, which the :ref:`terrain-tool` will use to automatically place the right transitions."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:30
+msgid "Define the Terrain Information"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:32
+msgid "First of all, switch to the tileset file. If you're looking at the map and have the tileset selected, you can do this by clicking the small *Edit Tileset* button below the Tilesets view."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:39
+msgid "Edit Tileset button"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:41
+msgid "Then, activate the terrain editing mode by clicking on the *Terrains* |terrain| button on the tool bar."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:44
+msgid "In this mode, the list of terrain types is displayed and you can mark corners of the tiles in your tileset as belonging to a certain terrain type. To start with, add each of the 4 terrain types. The fastest way is by right-clicking on a tile representing a certain terrain and choosing \"Add Terrain Type\". This automatically sets the tile as the image representing the terrain."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:54
+msgid "Adding Terrain Type"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:56
+msgid "Give each of the terrains an appropriate name. Once you're done, select the Sand terrain and mark all corners in the tileset with this type of terrain. When you're done it should look like this:"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:63
+msgid "Sand Terrain Marked"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:65
+msgid "If you make a mistake, just use Undo (or press ``Ctrl+Z``). Or if you notice a mistake later, either use *Erase Terrain* to clear a terrain type from a corner or select the correct terrain type and paint over it."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:69
+msgid "Do the same for each of the other terrain types. Eventually you'll have marked all tiles apart from the special objects."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:75
+msgid "Done Marking Terrain"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:77
+msgid "Now you can disable the *Terrains* mode by clicking the tool bar button again."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:81
+msgid "Editing with the Terrain Brush"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:83
+msgid "Switch back to the map and then activate the Terrains window. You should see the 4 terrain types represented in a list. Click on the Sand terrain and start painting. You may immediately notice that nothing special is happening. This is because there are no other tiles on the map yet so the terrain tool doesn't really know how to help (because we have no transitions to \"nothing\" in our tileset). Assuming we're out to create a desert map, it's better to start by filling your entire map with sand. Just switch back to the Tilesets window for a moment, select the sand tile and then use the :ref:`bucket-fill-tool`."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:93
+msgid "Let's switch back to the Terrains window and draw some cobblestones. Now you can see the tool in action!"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:99
+msgid "Drawing Cobblestone"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:101
+msgid "Try holding ``Control`` (``Command`` on a Mac) while drawing. This reduces the modified area to just the closest corner to the mouse, allowing for precision work."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:105
+msgid "Finally, see what happens when you try drawing some dirt on the cobblestone. Because there are no transitions from dirt directly to cobblestone, the Terrain tool first inserts transitions to sand and from there to cobblestone. Neat!"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:113
+msgid "Drawing Dirt"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:116
+msgid "Final Words"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:118
+msgid "Now you should have a pretty good idea about how to use this tool in your own project. A few things to keep in mind:"
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:121
+msgid "Currently the tool requires all terrain types to be part of the same tileset. You can have multiple tilesets with terrain in your map, but the tool can't perform automatic transitions from a terrain from one tileset to a terrain in another tileset. This usually means you may have to combine several tiles into one image."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:127
+msgid "Since defining the terrain information can be somewhat laboursome, you'll want to avoid using embedded tilesets so that terrain information can be shared among several maps."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:131
+msgid "The Terrain tool works fine with isometric maps as well. To make sure the terrain overlay is displayed correctly, set up the *Orientation*, *Grid Width* and *Grid Height* in the tileset properties."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:135
+msgid "The tool will handle any number of terrain types and each corner of a tile can have a different type of terrain. Still, there are other ways of dealing with transitions that this tool can't handle. Also, it is not able to edit multiple layers at the same time. For a more flexible, but also more complicated way of automatic tile placement, check out :doc:`automapping`."
+msgstr ""
+
+#: ../../manual/using-the-terrain-tool.rst:142
+msgid "I'm maintaining a `collection of tilesets <http://opengameart.org/content/terrain-transitions>`__ that contain transitions that are compatible with this tool on `OpenGameArt.org <http://opengameart.org/>`__."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:6
+msgid "Using Wang Tiles"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:8
+msgid "Wang tiles are similar in concept to Terrains. This is, however, more focused on filling larger areas without repetition. One defines the edge and corner colors of tiles in a tileset. This information can then be used when filling, or brushing to allow for smooth, non-repetitive transitions between tiles. In most cases this tiling is random, and based on color probability. More info on Wang tiles can be found `here <http://www.cr31.co.uk/stagecast/wang/intro.html>`_."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:15
+msgid "To demonstrate how to use Wang tiles, I will describe the steps necessary to recreate ``walkways.tsx`` example tileset."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:21
+msgid "Defining Wang Tile Info"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:23
+msgid "After making the tileset, from the tileset editor, click the Wang Sets button."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:27
+msgid "Wang Set Button"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:29
+msgid "A single tileset can have many Wang sets. Create a new Wang set using the plus button at the bottom of the Wang set view."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:34
+msgid "Wang Set View"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:36
+msgid "You can now edit the properties of the Wang set. Important for us is edge and corner count. This will determine how the set is defined, and how it behaves. This tileset is a 3 edge Wang set."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:42
+msgid "Wang Set Properties"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:44
+msgid "Now in the complete pattern set will generate in the *Patterns* tab below the Wang set view. For the set to be complete (though this is unnecessary), each pattern must be used at least once."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:50
+msgid "Pattern View"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:52
+msgid "Once a pattern is selected, you can paint it directly onto the tileset. Similar to when using the Stamp Brush, ``Z`` and ``Shift + Z`` can be used to rotate the pattern 90 degrees clockwise and counterclockwise respectively. ``X`` and ``Y`` flip the pattern horizontally, and vertically respectively."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:59
+msgid "Painting on a Pattern"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:61
+msgid "In the other tab, there is the *Colors* view. This gives you access to edit properties and assign with each individual color of a set."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:66
+msgid "Painting Individual Edge"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:68
+msgid "Using these methods, assign each tile matching all the edges. After this is done, the set is ready to be used with all the Wang methods."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:73
+msgid "Completely Assigned Wang Set"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:76
+msgid "Editing With Wang Methods"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:78
+msgid "There are two main ways to use Wang tiles:"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:80
+msgid "Activating the `Wang mode <#wang-mode>`__"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:82
+msgid "Using the `Wang brush <#wang-brush>`__"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:85
+msgid "Wang Mode"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:86
+msgid "Similar to the random mode, the Stamp Brush, and Bucket Fill tools can use Wang methods to fill. With the Wang mode activated, each cell will be randomly chosen from all those in the Wang set which match all adjacent edge/corner colors."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:92
+msgid "Stamp Brush with Wang Fill Mode Enabled"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:96
+msgid "Bucket Fill with Wang Fill Mode Enabled"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:100
+msgid "There is also the :ref:`wang-tool`, which works very much like the :ref:`terrain-tool`. This tool changes the edge/color patterns of the adjacent cells, to match a selected color. If no tiles exist in the Wang set of a particular pattern, the area can not be painted."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:109
+msgid "Customizing Wang Colors"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:111
+msgid "Each Wang color can be customized to become more recognizable. As well, the probability of each color can be adjusted, such that with the Wang mode it will show up more often in filling or brushing."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:115
+msgid "Color Appearance"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:116
+msgid "The name, image, and of course color can be changed to alter the appearance  of a Wang color. This image can be changed be selecting a color, then right clicking on the tile whose image is desired, and selecting *Set Wang Color Image*."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:122
+msgid "Selecting Wang color image"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:126
+msgid "The other values can be changed from the properties view."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:130
+msgid "When choosing a tile with Wang methods, all tiles with a valid Wang pattern are considered. They are given a weight based on their edge/corner colors' probabilities. Then one is selected at random, while considering this weight. The weight is the product of all the probabilities."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:139
+msgid "Left shows path with probability 0.1, right shows path with probability 10."
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:142
+msgid "Standard Wang Sets"
+msgstr ""
+
+#: ../../manual/using-wang-tiles.rst:144
+msgid "Some typical Wang sets are `2-corner <http://www.cr31.co.uk/stagecast/wang/2corn.html>`__, `2-edge <http://www.cr31.co.uk/stagecast/wang/2edge.html>`__, and `blob <http://www.cr31.co.uk/stagecast/wang/blob.html>`__. Wang tiles in Tiled support up to 15 edge and 15 corner colors in a single set."
+msgstr ""
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/reference.po tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/reference.po
--- tiled-qt-1.2.1+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/reference.po	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/locale/zh_Hant/LC_MESSAGES/reference.po	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,2370 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) 2017, Tiled Documentation Writers
+# This file is distributed under the same license as the Tiled package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Tiled 1.1\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-12-21 14:31+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: zh_Hant\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/json-map-format.rst:2
+msgid "JSON Map Format"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:4
+msgid "Tiled can export maps as JSON files. To do so, simply select \"File > Export As\" and select the JSON file type. You can export json from the command line with the ``--export-map`` option."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:8
+msgid "The fields found in the JSON format differ slightly from those in the :doc:`tmx-map-format`, but the meanings should remain the same."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:11
+msgid "The following fields can be found in a Tiled JSON file:"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:14
+msgid "Map"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:17
+#: ../../reference/json-map-format.rst:82
+#: ../../reference/json-map-format.rst:160
+#: ../../reference/json-map-format.rst:378
+#: ../../reference/json-map-format.rst:453
+#: ../../reference/json-map-format.rst:493
+msgid "Field"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:17
+#: ../../reference/json-map-format.rst:82
+#: ../../reference/json-map-format.rst:160
+#: ../../reference/json-map-format.rst:378
+#: ../../reference/json-map-format.rst:453
+#: ../../reference/json-map-format.rst:493
+msgid "Type"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:17
+#: ../../reference/json-map-format.rst:82
+#: ../../reference/json-map-format.rst:160
+#: ../../reference/json-map-format.rst:378
+#: ../../reference/json-map-format.rst:453
+#: ../../reference/json-map-format.rst:493
+msgid "Description"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:19
+msgid "backgroundcolor"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:19
+#: ../../reference/json-map-format.rst:29
+#: ../../reference/json-map-format.rst:34
+#: ../../reference/json-map-format.rst:36
+#: ../../reference/json-map-format.rst:44
+#: ../../reference/json-map-format.rst:86
+#: ../../reference/json-map-format.rst:92
+#: ../../reference/json-map-format.rst:100
+#: ../../reference/json-map-format.rst:170
+#: ../../reference/json-map-format.rst:184
+#: ../../reference/json-map-format.rst:386
+#: ../../reference/json-map-format.rst:394
+#: ../../reference/json-map-format.rst:417
+#: ../../reference/json-map-format.rst:495
+msgid "string"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:19
+msgid "Hex-formatted color (#RRGGBB or #AARRGGBB) (optional)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:21
+#: ../../reference/json-map-format.rst:88
+#: ../../reference/json-map-format.rst:166
+msgid "height"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:21
+#: ../../reference/json-map-format.rst:27
+#: ../../reference/json-map-format.rst:38
+#: ../../reference/json-map-format.rst:42
+#: ../../reference/json-map-format.rst:48
+#: ../../reference/json-map-format.rst:84
+#: ../../reference/json-map-format.rst:88
+#: ../../reference/json-map-format.rst:104
+#: ../../reference/json-map-format.rst:106
+#: ../../reference/json-map-format.rst:108
+#: ../../reference/json-map-format.rst:164
+#: ../../reference/json-map-format.rst:166
+#: ../../reference/json-map-format.rst:168
+#: ../../reference/json-map-format.rst:188
+#: ../../reference/json-map-format.rst:190
+#: ../../reference/json-map-format.rst:192
+#: ../../reference/json-map-format.rst:380
+#: ../../reference/json-map-format.rst:382
+#: ../../reference/json-map-format.rst:388
+#: ../../reference/json-map-format.rst:390
+#: ../../reference/json-map-format.rst:392
+#: ../../reference/json-map-format.rst:400
+#: ../../reference/json-map-format.rst:404
+#: ../../reference/json-map-format.rst:406
+#: ../../reference/json-map-format.rst:415
+#: ../../reference/json-map-format.rst:497
+msgid "int"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:21
+msgid "Number of tile rows"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:23
+msgid "infinite"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:23
+#: ../../reference/json-map-format.rst:102
+#: ../../reference/json-map-format.rst:162
+#: ../../reference/json-map-format.rst:172
+#: ../../reference/json-map-format.rst:186
+msgid "bool"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:23
+msgid "Whether the map has infinite dimensions"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:25
+#: ../../reference/json-map-format.rst:90
+msgid "layers"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:25
+#: ../../reference/json-map-format.rst:40
+#: ../../reference/json-map-format.rst:90
+#: ../../reference/json-map-format.rst:174
+#: ../../reference/json-map-format.rst:176
+#: ../../reference/json-map-format.rst:402
+#: ../../reference/json-map-format.rst:455
+msgid "array"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:25
+msgid "Array of :ref:`layers <json-layer>`"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:27
+msgid "nextobjectid"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:27
+msgid "Auto-increments for each placed object"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:29
+msgid "orientation"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:29
+msgid "``orthogonal``, ``isometric``, ``staggered`` or ``hexagonal``"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:32
+#: ../../reference/json-map-format.rst:98
+#: ../../reference/json-map-format.rst:178
+#: ../../reference/json-map-format.rst:396
+msgid "properties"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:32
+#: ../../reference/json-map-format.rst:94
+#: ../../reference/json-map-format.rst:98
+#: ../../reference/json-map-format.rst:178
+#: ../../reference/json-map-format.rst:182
+#: ../../reference/json-map-format.rst:384
+#: ../../reference/json-map-format.rst:396
+#: ../../reference/json-map-format.rst:398
+#: ../../reference/json-map-format.rst:408
+#: ../../reference/json-map-format.rst:410
+#: ../../reference/json-map-format.rst:412
+msgid "object"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:32
+#: ../../reference/json-map-format.rst:178
+#: ../../reference/json-map-format.rst:182
+#: ../../reference/json-map-format.rst:396
+#: ../../reference/json-map-format.rst:398
+msgid "String key-value pairs"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:34
+msgid "renderorder"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:34
+msgid "Rendering direction (orthogonal maps only)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:36
+msgid "tiledversion"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:36
+msgid "The Tiled version used to save the file"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:38
+#: ../../reference/json-map-format.rst:406
+msgid "tileheight"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:38
+msgid "Map grid height"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:40
+msgid "tilesets"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:40
+msgid "Array of :ref:`tilesets <json-tileset>`"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:42
+#: ../../reference/json-map-format.rst:415
+msgid "tilewidth"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:42
+msgid "Map grid width"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:44
+#: ../../reference/json-map-format.rst:100
+#: ../../reference/json-map-format.rst:184
+#: ../../reference/json-map-format.rst:417
+msgid "type"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:44
+msgid "``map`` (since 1.0)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:46
+msgid "version"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:46
+msgid "number"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:46
+msgid "The JSON format version"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:48
+#: ../../reference/json-map-format.rst:104
+#: ../../reference/json-map-format.rst:188
+msgid "width"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:48
+msgid "Number of tile columns"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:52
+msgid "Map Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:79
+msgid "Layer"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:84
+msgid "data"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:84
+msgid "Array of GIDs. ``tilelayer`` only."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:86
+msgid "draworder"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:86
+msgid "``topdown`` (default) or ``index``. ``objectgroup`` only."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:88
+msgid "Row count. Same as map height for fixed-size maps."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:90
+msgid "Array of :ref:`layers <json-layer>`. ``group`` on"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:92
+#: ../../reference/json-map-format.rst:170
+#: ../../reference/json-map-format.rst:394
+#: ../../reference/json-map-format.rst:495
+msgid "name"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:92
+msgid "Name assigned to this layer"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:94
+msgid "objects"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:94
+msgid "Array of :ref:`objects <json-object>`. ``objectgroup`` only."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:96
+msgid "opacity"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:96
+#: ../../reference/json-map-format.rst:180
+msgid "float"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:96
+msgid "Value between 0 and 1"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:98
+msgid "string key-value pairs."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:100
+msgid "``tilelayer``, ``objectgroup``, ``imagelayer`` or ``group``"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:102
+#: ../../reference/json-map-format.rst:186
+msgid "visible"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:102
+msgid "Whether layer is shown or hidden in editor"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:104
+msgid "Column count. Same as map width for fixed-size maps."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:106
+#: ../../reference/json-map-format.rst:190
+msgid "x"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:106
+msgid "Horizontal layer offset in tiles. Always 0."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:108
+#: ../../reference/json-map-format.rst:192
+msgid "y"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:108
+msgid "Vertical layer offset in tiles. Always 0."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:112
+msgid "Tile Layer Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:133
+msgid "Object Layer Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:157
+msgid "Object"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:162
+msgid "ellipse"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:162
+msgid "Used to mark an object as an ellipse"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:164
+msgid "gid"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:164
+msgid "GID, only if object comes from a Tilemap"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:166
+msgid "Height in pixels. Ignored if using a gid."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:168
+msgid "id"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:168
+msgid "Incremental id - unique across all objects"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:170
+msgid "String assigned to name field in editor"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:172
+msgid "point"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:172
+msgid "Used to mark an object as a point"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:174
+msgid "polygon"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:174
+#: ../../reference/json-map-format.rst:176
+msgid "A list of x,y coordinates in pixels"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:176
+msgid "polyline"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:180
+msgid "rotation"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:180
+msgid "Angle in degrees clockwise"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:182
+msgid "text"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:184
+msgid "String assigned to type field in editor"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:186
+msgid "Whether object is shown in editor."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:188
+msgid "Width in pixels. Ignored if using a gid."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:190
+msgid "x coordinate in pixels"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:192
+msgid "y coordinate in pixels"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:196
+msgid "Object Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:218
+msgid "Ellipse Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:236
+msgid "Rectangle Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:253
+msgid "Point Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:271
+msgid "Polygon Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:309
+msgid "Polyline Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:351
+msgid "Text Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:375
+msgid "Tileset"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:380
+msgid "columns"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:380
+msgid "The number of tile columns in the tileset"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:382
+msgid "firstgid"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:382
+msgid "GID corresponding to the first tile in the set"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:384
+msgid "grid"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:384
+msgid "See :ref:`tmx-grid` (optional)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:386
+msgid "image"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:386
+msgid "Image used for tiles in this set"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:388
+msgid "imagewidth"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:388
+msgid "Width of source image in pixels"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:390
+msgid "imageheight"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:390
+msgid "Height of source image in pixels"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:392
+msgid "margin"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:392
+msgid "Buffer between image edge and first tile (pixels)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:394
+msgid "Name given to this tileset"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:398
+msgid "propertytypes"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:400
+msgid "spacing"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:400
+msgid "Spacing between adjacent tiles in image (pixels)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:402
+msgid "terrains"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:402
+msgid "Array of :ref:`terrains <json-terrain>` (optional)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:404
+msgid "tilecount"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:404
+msgid "The number of tiles in this tileset"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:406
+msgid "Maximum height of tiles in this set"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:408
+msgid "tileoffset"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:408
+msgid "See :ref:`tmx-tileoffset` (optional)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:410
+msgid "tileproperties"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:410
+msgid "Per-tile properties, indexed by gid as string"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:412
+msgid "tiles"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:412
+msgid "Mapping from tile ID to :ref:`tile <json-tile>` (optional)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:415
+msgid "Maximum width of tiles in this set"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:417
+msgid "``tileset`` (for tileset files, since 1.0)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:421
+msgid "Tileset Example"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:450
+msgid "Tile (Definition)"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:455
+msgid "terrain"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:455
+msgid "index of terrain for each corner of tile"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:458
+msgid "A tileset that associates information with each tile, like its image path or terrain type, may include a \"tiles\" JSON object. Each key is a local ID of a tile within the tileset."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:462
+msgid "For the terrain information, each value is a length-4 array where each element is the index of a :ref:`terrain <json-terrain>` on one corner of the tile. The order of indices is: top-left, top-right, bottom-left, bottom-right."
+msgstr ""
+
+#: ../../reference/json-map-format.rst:467
+#: ../../reference/json-map-format.rst:500
+msgid "Example:"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:490
+msgid "Terrain"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:495
+msgid "Name of terrain"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:497
+msgid "tile"
+msgstr ""
+
+#: ../../reference/json-map-format.rst:497
+msgid "Local ID of tile representing terrain"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:2
+msgid "Libraries and Frameworks"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:4
+msgid "There are many libraries available for reading and/or writing Tiled maps (either stored in the :doc:`tmx-map-format` or the :doc:`json-map-format`) as well as many development frameworks that include support for Tiled maps. This list is divided into two sections:"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:9
+msgid "`Support by Language <#support-by-language>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:10
+msgid "`Support by Framework <#support-by-framework>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:12
+msgid "The first list is for developers who plan on implementing their own renderer. The second list is for developers already using (or considering) a particular game engine / graphics library who would rather pass on having to write their own tile map renderer."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:19
+msgid "For updates to this page please open a pull request or issue `on GitHub <https://github.com/bjorn/tiled/issues>`__, thanks!"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:23
+msgid "Support by Language"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:25
+msgid "These libraries typically include only a TMX parser, but no rendering support. They can be used universally and should not require a specific game engine or graphics library."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:30
+msgid "C"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:32
+msgid "`TMX <https://github.com/baylej/tmx/>`__ - TMX map loader with Allegro5 and SDL2 examples (BSD)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:36
+msgid "C++"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:38
+msgid "`C++/Boost <http://www.catnapgames.com/blog/2011/10/10/simple-tmx-tilemap-parser.html>`__ by Tomas Andrle (limited functionality, single cpp file)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:40
+msgid "`C++/TinyXML based tmxparser <https://github.com/sainteos/tmxparser>`__ (BSD)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:41
+msgid "C++/Qt based libtiled, used by Tiled itself and included at `src/libtiled <https://github.com/bjorn/tiled/tree/master/src/libtiled>`__ (BSD)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:44
+msgid "`C++11x/TinyXml2 libtmx-parser <https://github.com/halsafar/libtmx-parser>`__ by halsafar. (zlib/tinyxml2)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:47
+msgid "`C++11/TinyXml2 libtmx <https://github.com/jube/libtmx>`__ by jube, for reading only (ISC licence). See `documentation <http://jube.github.io/libtmx/index.html>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:50
+msgid "`TMXParser <https://github.com/solar-storm-studios/TMXParser>`__ General \\*.tmx tileset data loader. Intended to be used with TSXParser for external tileset loading. (No internal tileset support)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:53
+msgid "`TSXParser <https://github.com/solar-storm-studios/TSXParser>`__ General \\*.tsx tileset data loader. Intended to be used with TMXParser."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:56
+msgid "`TMXLoader <https://bitbucket.org/martingrant/tmxloader>`__ based on `RapidXml <http://rapidxml.sourceforge.net/>`__. Limited functionality (check the `website <http://www.midnightpacific.com/portfolio/tmxloader-for-tiled-map-editor/>`__ for details)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:61
+msgid "`tmxlite <https://github.com/fallahn/tmxlite>`__ C++14 map parser with compressed map support but no external linking required. Includes examples for SFML and SDL2 rendering. Currently has full tmx support up to 0.16. (Zlib/libpng)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:67
+msgid "C#/.NET"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:69
+msgid "`MonoGame.Extended <https://github.com/craftworkgames/MonoGame.Extended>`__ has a Tiled map loader and renderer that works with MonoGame on all platforms that support portable class libraries."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:72
+msgid "`XNA map loader <https://github.com/zachmu/tiled-xna>`__ by Kevin Gadd, extended by Stephen Belanger and Zach Musgrave (has dependency on XNA but supposedly can be turned into a standalone parser easily)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:75
+msgid "`TiledSharp <https://github.com/marshallward/TiledSharp>`__: Yet another C# TMX importer library, with Tiled 0.11 support. TiledSharp is a generic parser which can be used in any framework, but it cannot be used to render the maps. Available via NuGet."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:79
+msgid "`NTiled <https://github.com/patriksvensson/ntiled>`__: Generic parser for 0.9.1 tiled maps. Available via NuGet."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:81
+msgid "`TmxCSharp <https://github.com/gwicksted/TmxCSharp>`__: Useful for multi-layer orthographic tile engines. No framework dependencies, used with a custom OpenTK tile engine soon to be open source, tested with Tiled 0.8.1 (multiple output formats). MIT license."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:85
+msgid "`tmx-mapper-pcl <https://github.com/aalmik/tmx-mapper-pcl>`__: PCL library for parsing Tiled map TMX files. This library could be used with MonoGame and Windows Runtime Universal apps."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:90
+msgid "D"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:92
+msgid "`tiledMap.d <https://gist.github.com/gdm85/9896961>`__ simple single-layer and single-tileset example to load a map and its tileset in `D language <http://dlang.org/>`__. It also contains basic rendering logic using `DSFML <https://github.com/Jebbs/DSFML/>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:96
+msgid "`dtiled <https://github.com/rcorre/dtiled>`__ can load JSON-formatted Tiled maps. It also provides general tilemap-related functions and algorithms."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:100
+msgid "Go"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:102
+msgid "`github.com/salviati/go-tmx/tmx <https://github.com/salviati/go-tmx>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:105
+msgid "Haskell"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:107
+msgid "`htiled <http://hackage.haskell.org/package/htiled>`__ (TMX) by `Christian Rødli Amble <https://github.com/chrra>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:109
+msgid "`aeson-tiled <https://hackage.haskell.org/package/aeson-tiled>`__ (JSON) by `Schell Scivally <https://github.com/schell>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:112
+msgid "Java"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:114
+msgid "A library for loading TMX files is included with Tiled at `util/java/libtiled-java <https://github.com/bjorn/tiled/tree/master/util/java/libtiled-java>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:116
+msgid "Android-Specific:"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:118
+msgid "`AndroidTMXLoader <https://github.com/davidmi/Android-TMX-Loader>`__ loads TMX data into an object and renders to an Android Bitmap (limited functionality)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:121
+msgid "`libtiled-java port <http://chiselapp.com/user/devnewton/repository/libtiled-android/index>`__ is a port of the libtiled-java to be used on Android phones."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:126
+msgid "PHP"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:128
+msgid "`PHP TMX Viewer <https://github.com/sebbu2/php-tmx-viewer>`__ by sebbu : render the map as an image (allow some modifications as well)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:132
+msgid "Pike"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:134
+msgid "`TMX parser <https://gitlab.com/tmx-parser/tmx-parser>`__: a simple loader for TMX maps (CSV format only)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:138
+msgid "Processing"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:140
+msgid "`linux-man/ptmx <https://github.com/linux-man/ptmx>`__: Add Tiled maps to your Processing sketch."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:144
+msgid "Python"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:146
+msgid "`pytmxlib <http://pytmxlib.readthedocs.org/en/latest/>`__: library for programmatic manipulation of TMX maps"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:148
+msgid "`python-tmx <http://python-tmx.nongnu.org>`__: a simple library for reading and writing TMX files."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:152
+msgid "Ruby"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:154
+msgid "`tmx gem <https://github.com/shawn42/tmx>`__ by erisdiscord"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:157
+msgid "Vala"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:159
+msgid "`librpg <https://github.com/JumpLink/librpg>`__ A library to load and handle spritesets (own format) and orthogonal TMX maps."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:163
+msgid "Support by Framework"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:165
+msgid "Following entries are integrated solutions for specific game engines. They are typically of little to no use if you're not using said game engine."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:170
+msgid "AndEngine"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:172
+msgid "`AndEngine <http://www.andengine.org/>`__ by Nicolas Gramlich supports `rendering TMX maps <http://www.andengine.org/blog/2010/07/andengine-tiledmaps-in-the-tmx-format/>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:177
+msgid "Allegro"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:179
+msgid "`allegro\\_tiled <https://github.com/dradtke/allegro_tiled>`__ integrates Tiled support with `Allegro 5 <http://alleg.sourceforge.net/>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:184
+msgid "cocos2d"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:186
+msgid "`cocos2d (Python) <http://python.cocos2d.org/>`__ supports loading `Tiled maps <http://python.cocos2d.org/doc/programming_guide/tiled_map.html>`__ through its ``cocos.tiles`` module."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:190
+msgid "`cocos2d-x (C++) <http://www.cocos2d-x.org/>`__ supports loading TMX maps through the `CCTMXTiledMap <http://www.cocos2d-x.org/reference/native-cpp/V2.1.4/da/d68/classcocos2d_1_1_c_c_t_m_x_tiled_map.html>`__ class."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:194
+msgid "`cocos2d-objc (Objective-C, Swift) <http://www.cocos2d-objc.org/>`__ (previously known as: cocos2d-iphone, cocos2d-swift, cocos2d-spritebuilder) supports loading TMX maps through `CCTiledMap <http://cocos2d.spritebuilder.com/docs/api/Classes/CCTiledMap.html>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:198
+msgid "`TilemapKit <http://tilemapkit.com>`__ is a tilemapping framework for Cocos2D. It supports all TMX tilemap types, including staggered iso and all hex variations. No longer in development."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:203
+msgid "Construct 2 - Scirra"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:205
+msgid "`Construct 2 <http://www.scirra.com>`__, since the Beta Release 149, officially supports TMX maps, and importing it by simple dragging the file inside the editor. `Official Note <https://www.scirra.com/construct2/releases/r149>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:211
+msgid "Corona SDK"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:213
+msgid "`ponytiled <https://github.com/ponywolf/ponytiled>`__ is a simple Tiled Map Loader for Corona SDK (`forum announcement <http://discourse.mapeditor.org/t/new-lua-coronasdk-framework-ponytiled/1826>`__)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:216
+msgid "`Dusk Engine <https://github.com/GymbylCoding/Dusk-Engine>`__ is a fully featured Tiled map game engine for Corona SDK"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:220
+msgid "Flixel"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:222
+msgid "Lithander demonstrated his `Flash TMX parser combined with Flixel rendering <http://blog.pixelpracht.net/?p=59>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:226
+msgid "Game Maker"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:228
+msgid "Tiled ships with a plug-in that can :ref:`export a map to a GameMaker: Studio 1.4 room file <gamemaker-export>`"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:229
+msgid "`Tiled2GM Converter <http://gmc.yoyogames.com/index.php?showtopic=539494>`__ by Dmi7ry"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:232
+msgid "Godot"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:234
+msgid "`Tiled Map Importer <https://godotengine.org/asset-library/asset/25>`__ imports each map as Godot scene which can be instanced or inherited (`forum announcement <http://discourse.mapeditor.org/t/importer-plugin-for-godot-engine/1833/1>`__)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:240
+msgid "Haxe"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:242
+msgid "`HaxePunk <https://github.com/HaxePunk/tiled>`__ Tiled Loader for HaxePunk"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:244
+msgid "`HaxeFlixel <https://github.com/HaxeFlixel/flixel-addons/tree/dev/flixel/addons/editors/tiled>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:245
+msgid "`OpenFL <https://github.com/Kasoki/openfl-tiled>`__ \"openfl-tiled\" is a library, which gives OpenFL developers the ability to use the Tiled Map Editor."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:248
+msgid "`OpenFL + Tiled + Flixel <https://github.com/kasoki/openfl-tiled-flixel>`__ Experimental glue to use \"openfl-tiled\" with HaxeFlixel"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:253
+msgid "HTML5 (multiple engines)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:255
+msgid "`Canvas Engine <http://canvasengine.net>`__ A framework to create video games in HTML5 Canvas"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:257
+msgid "`chesterGL <https://github.com/funkaster/ChesterGL>`__ A simple WebGL/canvas game library"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:259
+msgid "`KineticJs-Ext <https://github.com/Wappworks/kineticjs-ext>`__ A multi-canvas based game rendering library"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:261
+msgid "`melonJS <http://www.melonjs.org>`__ A lightweight HTML5 game engine"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:262
+msgid "`Platypus Engine <https://github.com/PBS-KIDS/Platypus/>`__ A robust orthogonal tile game engine with game entity library."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:264
+msgid "`sprite.js <https://github.com/batiste/sprite.js>`__ A game framework for image sprites."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:266
+msgid "`TMXjs <https://github.com/cdmckay/tmxjs>`__ A JavaScript, jQuery and RequireJS-based TMX (Tile Map XML) parser and renderer."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:268
+msgid "`chem-tmx <https://github.com/andrewrk/chem-tmx>`__ Plugin for `chem <https://github.com/andrewrk/chem/>`__ game engine."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:270
+msgid "`GameJs <http://gamejs.org>`__ JavaScript library for game programming; a thin wrapper to draw on HTML5 canvas and other useful modules for game development"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:273
+msgid "`Crafty <http://craftyjs.com>`__ JavaScript HTML5 Game Engine; supports loading Tiled maps through an external component `TiledMapBuilder <https://github.com/Kibo/TiledMapBuilder>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:276
+msgid "`Phaser <http://www.phaser.io>`__ A fast, free and fun open source framework supporting both JavaScript and TypeScript (`Tiled tutorial <http://www.gamedevacademy.org/html5-phaser-tutorial-top-down-games-with-tiled/>`__)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:279
+msgid "`linux-man/p5.tiledmap <https://github.com/linux-man/p5.tiledmap>`__ adds Tiled maps to `p5.js <http://p5js.org/>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:283
+msgid "indielib-crossplatform"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:285
+msgid "`indielib cross-platform <http://www.indielib.com>`__ supports loading TMX maps through the `C++/TinyXML based tmx-parser <http://code.google.com/p/tmx-parser/>`__ by KonoM (BSD)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:290
+msgid "LibGDX"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:292
+msgid "`libgdx <http://libgdx.badlogicgames.com/>`__, a Java-based Android/desktop/HTML5 game library, `provides <https://github.com/libgdx/libgdx/wiki/Tile-maps>`__ a packer, loader and renderer for TMX maps"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:298
+msgid "LITIengine"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:300
+msgid "`LITIengine <https://litiengine.com>`__ is a 2D Java Game Engine that supports loading, saving and rendering maps in the .tmx format."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:304
+msgid "LÖVE"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:306
+msgid "`Simple Tiled Implementation <https://github.com/Karai17/Simple-Tiled-Implementation>`__ Lua loader for the LÖVE (Love2d) game framework."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:311
+msgid "MOAI SDK"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:313
+msgid "`Hanappe <https://github.com/makotok/Hanappe>`__ Framework for MOAI SDK."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:315
+msgid "`Rapanui <https://github.com/ymobe/rapanui>`__ Framework for MOAI SDK."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:319
+msgid "Monkey X"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:321
+msgid "`bit.tiled <https://github.com/bitJericho/bit.tiled>`__ Loads TMX file as objects. Aims to be fully compatible with native TMX files."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:323
+msgid "`Diddy <https://code.google.com/p/diddy/>`__ is an extensive framework for Monkey X that contains a module for loading and rendering TMX files. Supports orthogonal and isometric maps as both CSV and Base64 (uncompressed)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:329
+msgid "Node.js"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:331
+msgid "`node-tmx-parser <https://github.com/andrewrk/node-tmx-parser>`__ - loads the TMX file into a JavaScript object"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:335
+msgid "Oak Nut Engine (onut)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:337
+msgid "`Oak Nut Engine <http://daivuk.github.io/onut/>`__ supports Tiled maps through Javascript and C++. (see TiledMap `Javascript <https://github.com/Daivuk/onut/tree/master/samplesJS/TiledMap>`__ or `C++ <https://github.com/Daivuk/onut/tree/master/samples/TiledMap>`__ samples)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:341
+msgid "Orx Portable Game Engine"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:343
+msgid "`TMX to ORX Converter <http://orx-project.org/wiki/tutorials/community/sausage/tmx_to_orx>`__ Tutorial and converter download for Orx."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:348
+msgid "Pygame"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:350
+msgid "`Pygame map loader <http://www.pygame.org/project/1158/>`__ by dr0id"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:351
+#: ../../reference/support-for-tmx-maps.rst:367
+#: ../../reference/support-for-tmx-maps.rst:373
+msgid "`PyTMX <https://github.com/bitcraft/PyTMX>`__ by Leif Theden (bitcraft)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:353
+msgid "`tmx.py <https://bitbucket.org/r1chardj0n3s/pygame-tutorial/src/a383dd24790d/tmx.py>`__ by Richard Jones, from his `2012 PyCon 'Introduction to Game Development' talk <http://pyvideo.org/video/615/introduction-to-game-development>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:357
+msgid "`TMX <https://github.com/renfredxh/tmx>`__, a fork of tmx.py and a port to Python3. A demo called pylletTown can be found `here <https://github.com/renfredxh/pylletTown>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:362
+msgid "Pyglet"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:364
+msgid "`JSON map loader/renderer for pyglet <https://github.com/reidrac/pyglet-tiled-json-map>`__ by Juan J. Martínez (reidrac)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:371
+msgid "PySDL2"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:377
+msgid "RPG Maker MV"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:379
+msgid "`Tiled Plugin <https://forums.rpgmakerweb.com/index.php?threads/tiled-plugin-version-1-3-0-released.50752/>`__ by `Dr.Yami <http://yami.moe/>`__ & Archeia, from `RPG Maker Web <https://forums.rpgmakerweb.com>`__"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:385
+msgid "SDL"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:387
+msgid "`C++/TinyXML/SDL based loader <http://usefulgamedev.weebly.com/c-tiled-map-loader.html>`__ example by Rohin Knight (limited functionality)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:392
+msgid "SFML"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:394
+msgid "`STP <https://github.com/edoren/STP>`__ (SFML TMX Parser) by edoren"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:395
+msgid "`C++/SFML Tiled map loader <http://trederia.blogspot.co.uk/2013/05/tiled-map-loader-for-sfml.html>`__ by fallahn. (Zlib/libpng)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:398
+msgid "`C++/SfTileEngine <https://github.com/Tresky/sf_tile_engine>`__ by Tresky (currently limited functionality)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:402
+msgid "Slick2D"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:404
+msgid "`Slick2D <http://slick.ninjacave.com>`__ supports loading TMX maps through `TiledMap <http://slick.ninjacave.com/javadoc/org/newdawn/slick/tiled/TiledMap.html>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:409
+msgid "Sprite Kit Framework"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:411
+msgid "`SKTilemap <https://github.com/TomLinthwaite/SKTilemap>`__ is built from the ground up in Swift. It's up to date, full of features and easy to integrate into any Sprite Kit project. Supports iOS and OSX."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:414
+msgid "`SKTiled <https://github.com/mfessenden/SKTiled>`__ - A Swift framework for working with Tiled assets in SpriteKit."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:416
+msgid "`TilemapKit <http://tilemapkit.com>`__ is a tilemapping framework for Sprite Kit. It supports all TMX tilemap types, including staggered iso and all hex variations. No longer in development."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:419
+msgid "`JSTileMap <https://github.com/slycrel/JSTileMap>`__ is a lightweight SpriteKit implementation of the TMX format supporting iOS 7 and OS X 10.9 and above."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:424
+msgid "TERRA Engine (Delphi/Pascal)"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:426
+msgid "`TERRA Engine <http://pascalgameengine.com/>`__ supports loading and rendering of TMX maps."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:430
+msgid "Unity 3D"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:432
+msgid "`Orthello Pro <http://www.wyrmtale.com/products/unity3d-components/orthello-pro>`__ (2D framework) offers `Tiled map support <http://www.wyrmtale.com/orthello-pro/tilemaps>`__."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:436
+msgid "`Tiled To Unity <https://www.assetstore.unity3d.com/#/content/17260/>`__ is a 3D pipeline for Tiled maps. It uses prefabs as tiles, and can place decorations dynamically on tiles. Supports multiple layers (including object layers)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:441
+msgid "`Tiled2Unity <http://www.seanba.com/introtiled2unity.html>`__ exports TMX files to Unity with support for (non-simple) collisions."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:443
+msgid "`UniTMX <https://bitbucket.org/PolCPP/unitmx/overview>`__ imports TMX files into a mesh."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:445
+msgid "`X-UniTMX <https://bitbucket.org/Chaoseiro/x-unitmx>`__ supports almost all Tiled 0.11 features. Imports TMX/XML files into Sprite Objects or Meshes."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:448
+msgid "`Tiled TMX Importer <https://www.assetstore.unity3d.com/en/#!/content/102928>`__, imports into Unity 2017.2's new native Tilemap system."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:451
+msgid "Unreal Engine 4"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:453
+msgid "`Paper2D <https://forums.unrealengine.com/showthread.php?3539-Project-Paper2D>`__ provides built-in support for tile maps and tile sets, importing JSON exported from Tiled."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:458
+msgid "Urho3D"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:460
+msgid "`Urho3D <http://urho3d.github.io/>`__ natively supports loading Tiled maps as part of the `Urho2D <http://urho3d.github.io/documentation/1.4/_urho2_d.html>`__ sublibrary (`Documentation <http://urho3d.github.io/documentation/1.4/class_urho3_d_1_1_tile_map2_d.html>`__, `HTML5 example <http://urho3d.github.io/samples/36_Urho2DTileMap.html>`__)."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:469
+msgid "XNA"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:471
+msgid "`FlatRedBall Engine TMXGlue tool <http://www.flatredball.com/frb/docs/index.php?title=Kain%27s_Tavern#Tiled_Map_Editor.2C_TMX.2C_Glue_and_you.>`__ by Domenic Datti loads TMX maps into the FlatRedBall engine, complete with node networks, pathfinding, and shapecollection support via object layers."
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:476
+msgid "`TiledMax <http://tiledmax.xpod.be/>`__ by Aimee Bailey, a .NET library for parsing TMX maps without dependencies on Windows or XNA"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:478
+msgid "`XTiled <https://bitbucket.org/vinull/xtiled>`__ by Michael C. Neel and Dylan Wolf, XNA library for loading and rendering TMX maps"
+msgstr ""
+
+#: ../../reference/support-for-tmx-maps.rst:480
+msgid "`XNA map loader <https://github.com/zachmu/tiled-xna>`__ by Kevin Gadd, extended by Stephen Belanger and Zach Musgrave"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:2
+msgid "TMX Changelog"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:4
+msgid "Below are described the changes/additions that were made to the :doc:`tmx-map-format` for recent versions of Tiled."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:8
+msgid "Tiled 1.1"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:10
+msgid "A new :ref:`tmx-chunk` element was added for infinite maps which contains the similar content as :ref:`tmx-data`, except it stores the data of the area specified by its ``x``, ``y``, ``width`` and ``height`` attributes."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:15
+msgid ":doc:`Templates </manual/using-templates>` were added, a template is an :ref:`external file <tmx-template-files>` referenced by template instance objects:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:23
+msgid "Tilesets can now contain :doc:`Wang tiles </manual/using-wang-tiles>`. They are saved in the new :ref:`tmx-wangsets` element."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:27
+msgid "Tiled 1.0"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:29
+msgid "A new :ref:`tmx-group` element was added which is a group layer that can have other layers as child elements. This means layers now form a hierarchy."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:31
+msgid "Added Text objects, identified by a new :ref:`tmx-text` element which is used as a child of the :ref:`tmx-object` element."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:33
+msgid "Added a :ref:`tile.type <tmx-tileset-tile>` attribute for supporting :ref:`typed-tiles`."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:37
+msgid "Tiled 0.18"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:39
+msgid "*No file format changes.*"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:42
+msgid "Tiled 0.17"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:44
+msgid "Added ``color`` and ``file`` as possible values for the :ref:`property.type <tmx-property>` attribute."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:46
+msgid "Added support for editing multi-line string properties, which are written out differently."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:50
+msgid "Tiled 0.16"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:52
+msgid "The :ref:`tmx-property` element gained a ``type`` attribute, storing the type of the value. Currently supported types are ``string`` (the default), ``int``, ``float`` and ``bool``."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:57
+msgid "Tiled 0.15"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:59
+msgid "The ``offsetx`` and ``offsety`` attributes are now also used for :ref:`tmx-imagelayer` elements, replacing the ``x`` and ``y`` attributes previously used. This change was made for consistency with the other layer types."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:63
+msgid "The tiles in an image collection tileset are no longer guaranteed to be consecutive, because removing tiles from the collection will no longer change the IDs of other tiles."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:66
+msgid "The pure XML and Gzip-compressed tile layer data formats were deprecated, since they didn't have any advantage over other formats. Remaining formats are CSV, base64 and Zlib-compressed layer data."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:69
+msgid "Added ``columns`` attribute to the :ref:`tmx-tileset` element, which specifies the number of tile columns in the tileset. For image collection tilesets it is editable and is used when displaying the tileset."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:73
+msgid "The ``backgroundcolor`` attribute of the :ref:`tmx-map` element will now take the format ``#AARRGGBB`` when its alpha value differs from 255. Previously the alpha value was silently discarded."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:78
+msgid "Tiled 0.14"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:80
+msgid "Added optional ``offsetx`` and ``offsety`` attributes to the ``layer`` and ``objectgroup`` elements. These specify an offset in pixels that is to be applied when rendering the layer. The default values are 0."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:86
+msgid "Tiled 0.13"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:88
+msgid "Added an optional ``tilecount`` attribute to the ``tileset`` element, which is written by Tiled to help parsers determine the amount of memory to allocate for tile data."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:93
+msgid "Tiled 0.12"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:95
+msgid "Previously tile objects never had ``width`` and ``height`` properties, though the format technically allowed this. Now these properties are used to store the size the image should be rendered at. The default values for these attributes are the dimensions of the tile image."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:102
+msgid "Tiled 0.11"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:104
+msgid "Added ``hexagonal`` to the supported values for the ``orientation`` attribute on the ``map`` element. This also adds ``staggerindex`` (``even`` or ``odd``) and ``staggeraxis`` (``x`` or ``y``) and ``hexsidelength`` (integer value) attributes to the ``map`` element, in order to support the many variations of staggered hexagonal. The new ``staggerindex`` and ``staggeraxis`` attributes are also supported when using the ``staggered`` map orientation."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:111
+msgid "Added an ``id`` attribute to the ``object`` element, which stores a map-unique ID of the object."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:113
+msgid "Added a ``nextobjectid`` attribute to the ``map`` element, which stores the next available ID for new objects. This number is stored to prevent reuse of the same ID after objects have been removed."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:118
+msgid "Tiled 0.10"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:120
+msgid "Tile objects can now be horizontally or vertically flipped. This is stored in the ``gid`` attribute using the same mechanism as for regular tiles. The image is expected to be flipped without affecting its position, same way as flipped tiles."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:125
+msgid "Objects can be rotated freely. The rotation is stored in degrees as a ``rotation`` attribute, with positive rotation going clockwise."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:128
+msgid "The render order of the tiles on tile layers can be configured in a number of ways through a new ``renderorder`` property on the ``map`` element. Valid values are ``right-down`` (the default), ``right-up``, ``left-down`` and ``left-up``. In all cases, the map is drawn row-by-row. This is only supported for orthogonal maps at the moment."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:134
+msgid "The render order of objects on object layers can be configured to be either sorted by their y-coordinate (previous behavior and still the default) or simply the order of appearance in the map file. The latter enables manual control over the drawing order with actions that \"Raise\" and \"Lower\" selected objects. It is controlled by the ``draworder`` property on the ``objectgroup`` element, which can be either ``topdown`` (default) or ``index``."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:142
+msgid "Tiles can have an ``objectgroup`` child element, which can contain objects that define the collision shape to use for that tile. This information can be edited in the new Tile Collision Editor."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:146
+msgid "Tiles can have a single looping animation associated with them using an ``animation`` child element. Each frame of the animation refers to a local tile ID from this tileset and defines the frame duration in milliseconds. Example:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:165
+msgid "Tiled 0.9"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:167
+msgid "Per-object visibility flag is saved (defaults to 1):"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:173
+msgid "Terrain information was added to tileset definitions (this is generally not very relevant for games):"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:187
+msgid "There is preliminary support for a \"staggered\" (isometric) projection (new value for the ``orientation`` attribute of the ``map`` element)."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:190
+msgid "A basic image layer type was added:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:198
+msgid "Added ellipse object shape. Same parameters as rectangular objects, but marked as ellipse with a child element:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:207
+msgid "Added map property for specifying the background color:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:213
+msgid "Added initial (non-GUI) support for individual and/or embedded tile images (since there is no way to set this up in Tiled Qt but only in Tiled Java or with `pytmxlib <https://github.com/encukou/pytmxlib>`__, this is not very important to support at the moment):"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:238
+msgid "Tiled 0.8"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:240
+msgid "Tilesets can now have custom properties (using the ``properties`` child element, just like everything else)."
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:243
+msgid "Tilesets now support defining a drawing offset in pixels, which is to be used when drawing any tiles from that tileset. Example:"
+msgstr ""
+
+#: ../../reference/tmx-changelog.rst:253
+msgid "Support for tile rotation in 90-degree increments was added by using the third most significant bit in the global tile id. This new bit means \"anti-diagonal flip\", which swaps the x and y axis when rendering a tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:2
+msgid "TMX Map Format"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:4
+msgid "**Version 1.1**"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:6
+msgid "The TMX (Tile Map XML) map format used by `Tiled <http://www.mapeditor.org>`__ is a flexible way to describe a tile based map. It can describe maps with any tile size, any amount of layers, any number of tile sets and it allows custom properties to be set on most elements. Beside tile layers, it can also contain groups of objects that can be placed freely."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:13
+msgid "Note that there are many :doc:`libraries and frameworks <support-for-tmx-maps>` available that can work with TMX maps."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:16
+msgid "In this document we'll go through each element found in this map format. The elements are mentioned in the headers and the list of attributes of the elements are listed right below, followed by a short explanation. Attributes or elements that are deprecated or unsupported by the current version of Tiled are formatted in italics."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:22
+msgid "Have a look at the :doc:`changelog <tmx-changelog>` when you're interested in what changed between Tiled versions."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:25
+msgid "*A DTD-file (Document Type Definition) is served at http://mapeditor.org/dtd/1.0/map.dtd. This file is not up-to-date but might be useful for XML-namespacing anyway.*"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:32
+msgid "<map>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:34
+msgid "**version:** The TMX format version. Was \"1.0\" so far, and will be incremented to match minor Tiled releases."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:36
+msgid "**tiledversion:** The Tiled version used to save the file (since Tiled 1.0.1). May be a date (for snapshot builds)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:38
+msgid "**orientation:** Map orientation. Tiled supports \"orthogonal\", \"isometric\", \"staggered\" and \"hexagonal\" (since 0.11)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:40
+msgid "**renderorder:** The order in which tiles on tile layers are rendered. Valid values are ``right-down`` (the default), ``right-up``, ``left-down`` and ``left-up``. In all cases, the map is drawn row-by-row. (only supported for orthogonal maps at the moment)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:44
+msgid "**width:** The map width in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:45
+msgid "**height:** The map height in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:46
+msgid "**tilewidth:** The width of a tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:47
+msgid "**tileheight:** The height of a tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:48
+msgid "**hexsidelength:** Only for hexagonal maps. Determines the width or height (depending on the staggered axis) of the tile's edge, in pixels."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:51
+msgid "**staggeraxis:** For staggered and hexagonal maps, determines which axis (\"x\" or \"y\") is staggered. (since 0.11)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:53
+msgid "**staggerindex:** For staggered and hexagonal maps, determines whether the \"even\" or \"odd\" indexes along the staggered axis are shifted. (since 0.11)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:56
+msgid "**backgroundcolor:** The background color of the map. (optional, may include alpha value since 0.15 in the form ``#AARRGGBB``)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:58
+msgid "**nextobjectid:** Stores the next available ID for new objects. This number is stored to prevent reuse of the same ID after objects have been removed. (since 0.11)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:62
+msgid "The ``tilewidth`` and ``tileheight`` properties determine the general grid size of the map. The individual tiles may have different sizes. Larger tiles will extend at the top and right (anchored to the bottom left)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:67
+msgid "A map contains three different kinds of layers. Tile layers were once the only type, and are simply called ``layer``, object layers have the ``objectgroup`` tag and image layers use the ``imagelayer`` tag. The order in which these layers appear is the order in which the layers are rendered by Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:73
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-tileset`, :ref:`tmx-layer`, :ref:`tmx-objectgroup`, :ref:`tmx-imagelayer`, :ref:`tmx-group` (since 1.0)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:80
+msgid "<tileset>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:82
+msgid "**firstgid:** The first global tile ID of this tileset (this global ID maps to the first tile in this tileset)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:84
+msgid "**source:** If this tileset is stored in an external TSX (Tile Set XML) file, this attribute refers to that file. That TSX file has the same structure as the ``<tileset>`` element described here. (There is the firstgid attribute missing and this source attribute is also not there. These two attributes are kept in the TMX map, since they are map specific.)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:90
+msgid "**name:** The name of this tileset."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:91
+msgid "**tilewidth:** The (maximum) width of the tiles in this tileset."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:92
+msgid "**tileheight:** The (maximum) height of the tiles in this tileset."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:93
+msgid "**spacing:** The spacing in pixels between the tiles in this tileset (applies to the tileset image)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:95
+msgid "**margin:** The margin around the tiles in this tileset (applies to the tileset image)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:97
+msgid "**tilecount:** The number of tiles in this tileset (since 0.13)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:98
+msgid "**columns:** The number of tile columns in the tileset. For image collection tilesets it is editable and is used when displaying the tileset. (since 0.15)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:102
+msgid "If there are multiple ``<tileset>`` elements, they are in ascending order of their ``firstgid`` attribute. The first tileset always has a ``firstgid`` value of 1. Since Tiled 0.15, image collection tilesets do not necessarily number their tiles consecutively since gaps can occur when removing tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:108
+msgid "Can contain: :ref:`tmx-tileoffset`, :ref:`tmx-grid` (since 1.0), :ref:`tmx-properties`, :ref:`tmx-image`, :ref:`tmx-terraintypes`, :ref:`tmx-tileset-tile`, :ref:`tmx-wangsets` (since 1.1)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:115
+msgid "<tileoffset>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:117
+msgid "**x:** Horizontal offset in pixels"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:118
+msgid "**y:** Vertical offset in pixels (positive is down)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:120
+msgid "This element is used to specify an offset in pixels, to be applied when drawing a tile from the related tileset. When not present, no offset is applied."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:127
+msgid "<grid>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:129
+msgid "**orientation:** Orientation of the grid for the tiles in this tileset (``orthogonal`` or ``isometric``)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:131
+msgid "**width:** Width of a grid cell"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:132
+msgid "**height:** Height of a grid cell"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:134
+msgid "This element is only used in case of isometric orientation, and determines how tile overlays for terrain and collision information are rendered."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:141
+msgid "<image>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:143
+msgid "**format:** Used for embedded images, in combination with a ``data`` child element. Valid values are file extensions like ``png``, ``gif``, ``jpg``, ``bmp``, etc."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:146
+msgid "*id:* Used by some versions of Tiled Java. Deprecated and unsupported by Tiled Qt."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:148
+msgid "**source:** The reference to the tileset image file (Tiled supports most common image formats)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:150
+msgid "**trans:** Defines a specific color that is treated as transparent (example value: \"#FF00FF\" for magenta). Up until Tiled 0.12, this value is written out without a ``#`` but this is planned to change."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:153
+msgid "**width:** The image width in pixels (optional, used for tile index correction when the image changes)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:155
+msgid "**height:** The image height in pixels (optional)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:157
+msgid "Note that it is not currently possible to use Tiled to create maps with embedded image data, even though the TMX format supports this. It is possible to create such maps using ``libtiled`` (Qt/C++) or `tmxlib <https://pypi.python.org/pypi/tmxlib>`__ (Python)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:162
+msgid "Can contain: :ref:`tmx-data`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:167
+msgid "<terraintypes>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:169
+msgid "This element defines an array of terrain types, which can be referenced from the ``terrain`` attribute of the ``tile`` element."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:172
+msgid "Can contain: :ref:`tmx-terrain`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:177
+msgid "<terrain>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:179
+msgid "**name:** The name of the terrain type."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:180
+msgid "**tile:** The local tile-id of the tile that represents the terrain visually."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:183
+msgid "Can contain: :ref:`tmx-properties`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:188
+#: ../../reference/tmx-map-format.rst:427
+msgid "<tile>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:190
+msgid "**id:** The local tile ID within its tileset."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:191
+msgid "**type:** The type of the tile. Refers to an object type and is used by tile objects. (optional) (since 1.0)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:193
+msgid "**terrain:** Defines the terrain type of each corner of the tile, given as comma-separated indexes in the terrain types array in the order top-left, top-right, bottom-left, bottom-right. Leaving out a value means that corner has no terrain. (optional)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:197
+msgid "**probability:** A percentage indicating the probability that this tile is chosen when it competes with others while editing with the terrain tool. (optional)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:201
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-image` (since 0.9), :ref:`tmx-objectgroup`, :ref:`tmx-animation`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:207
+msgid "<animation>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:209
+msgid "Contains a list of animation frames."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:211
+msgid "Each tile can have exactly one animation associated with it. In the future, there could be support for multiple named animations on a tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:214
+msgid "Can contain: :ref:`tmx-frame`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:219
+msgid "<frame>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:221
+msgid "**tileid:** The local ID of a tile within the parent :ref:`tmx-tileset`."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:223
+msgid "**duration:** How long (in milliseconds) this frame should be displayed before advancing to the next frame."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:229
+msgid "<wangsets>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:231
+msgid "Contains the list of Wang sets defined for this tileset."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:233
+msgid "Can contain: :ref:`tmx-wangset`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:238
+msgid "<wangset>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:240
+msgid "Defines a list of corner colors and a list of edge colors, and any number of Wang tiles using these colors."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:243
+msgid "**name**: The name of the Wang set."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:244
+msgid "**tile**: The tile ID of the tile representing this Wang set."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:246
+msgid "Can contain: :ref:`tmx-wangcornercolor`, :ref:`tmx-wangedgecolor`, :ref:`tmx-wangtile`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:251
+msgid "<wangcornercolor>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:253
+msgid "A color that can be used to define the corner of a Wang tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:255
+#: ../../reference/tmx-map-format.rst:268
+msgid "**name**: The name of this color."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:256
+#: ../../reference/tmx-map-format.rst:269
+msgid "**color**: The color in ``#RRGGBB`` format (example: ``#c17d11``)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:257
+#: ../../reference/tmx-map-format.rst:270
+msgid "**tile**: The tile ID of the tile representing this color."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:258
+#: ../../reference/tmx-map-format.rst:271
+msgid "**probability**: The relative probability that this color is chosen over others in case of multiple options."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:264
+msgid "<wangedgecolor>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:266
+msgid "A color that can be used to define the edge of a Wang tile."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:277
+msgid "<wangtile>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:279
+msgid "Defines a Wang tile, by referring to a tile in the tileset and associating it with a certain Wang ID."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:282
+msgid "**tileid**: The tile ID."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:283
+msgid "**wangid**: The Wang ID, which is a 32-bit unsigned integer stored in the format ``0xCECECECE`` (where each C is a corner color and each E is an edge color, from right to left clockwise, starting with the top edge)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:291
+msgid "<layer>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:293
+msgid "All ``<tileset>`` tags shall occur before the first ``<layer>`` tag so that parsers may rely on having the tilesets before needing to resolve tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:297
+msgid "**name:** The name of the layer."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:298
+msgid "*x:* The x coordinate of the layer in tiles. Defaults to 0 and can not be changed in Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:299
+msgid "*y:* The y coordinate of the layer in tiles. Defaults to 0 and can not be changed in Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:300
+msgid "**width:** The width of the layer in tiles. Always the same as the map width for fixed-size maps."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:301
+msgid "**height:** The height of the layer in tiles. Always the same as the map height for fixed-size maps."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:302
+#: ../../reference/tmx-map-format.rst:449
+#: ../../reference/tmx-map-format.rst:592
+#: ../../reference/tmx-map-format.rst:610
+msgid "**opacity:** The opacity of the layer as a value from 0 to 1. Defaults to 1."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:303
+#: ../../reference/tmx-map-format.rst:451
+#: ../../reference/tmx-map-format.rst:594
+#: ../../reference/tmx-map-format.rst:612
+msgid "**visible:** Whether the layer is shown (1) or hidden (0). Defaults to 1."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:304
+msgid "**offsetx:** Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:306
+msgid "**offsety:** Rendering offset for this layer in pixels. Defaults to 0. (since 0.14)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:309
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-data`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:314
+msgid "<data>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:316
+msgid "**encoding:** The encoding used to encode the tile layer data. When used, it can be \"base64\" and \"csv\" at the moment."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:318
+msgid "**compression:** The compression used to compress the tile layer data. Tiled supports \"gzip\" and \"zlib\"."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:321
+msgid "When no encoding or compression is given, the tiles are stored as individual XML ``tile`` elements. Next to that, the easiest format to parse is the \"csv\" (comma separated values) format."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:325
+msgid "The base64-encoded and optionally compressed layer data is somewhat more complicated to parse. First you need to base64-decode it, then you may need to decompress it. Now you have an array of bytes, which should be interpreted as an array of unsigned 32-bit integers using little-endian byte ordering."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:331
+msgid "Whatever format you choose for your layer data, you will always end up with so called \"global tile IDs\" (gids). They are global, since they may refer to a tile from any of the tilesets used by the map. In order to find out from which tileset the tile is you need to find the tileset with the highest ``firstgid`` that is still lower or equal than the gid. The tilesets are always stored with increasing ``firstgid``\\ s."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:338
+msgid "Can contain: :ref:`tmx-tilelayer-tile`, :ref:`tmx-chunk`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:341
+msgid "Tile flipping"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:343
+msgid "The highest three bits of the gid store the flipped states. Bit 32 is used for storing whether the tile is horizontally flipped, bit 31 is used for the vertically flipped tiles and bit 30 indicates whether the tile is flipped (anti) diagonally, enabling tile rotation. These bits have to be read and cleared before you can find out which tileset a tile belongs to."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:350
+msgid "When rendering a tile, the order of operation matters. The diagonal flip (x/y axis swap) is done first, followed by the horizontal and vertical flips."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:354
+msgid "The following C++ pseudo-code should make it all clear:"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:404
+msgid "(Since the above code was put together on this wiki page and can't be directly tested, please make sure to report any errors you encounter when basing your parsing code on it, thanks.)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:411
+msgid "<chunk>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:413
+msgid "**x:** The x coordinate of the chunk in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:414
+msgid "**y:** The y coordinate of the chunk in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:415
+msgid "**width:** The width of the chunk in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:416
+msgid "**height:** The height of the chunk in tiles."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:418
+msgid "This is currently added only for infinite maps. The contents of a chunk element is same as that of the ``data`` element, except it stores the data of the area specified in the attributes."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:422
+msgid "Can contain: :ref:`tmx-tilelayer-tile`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:429
+msgid "**gid:** The global tile ID (default: 0)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:431
+msgid "Not to be confused with the ``tile`` element inside a ``tileset``, this element defines the value of a single tile on a tile layer. This is however the most inefficient way of storing the tile layer data, and should generally be avoided."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:439
+msgid "<objectgroup>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:441
+msgid "**name:** The name of the object group."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:442
+msgid "**color:** The color used to display the objects in this group."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:443
+msgid "*x:* The x coordinate of the object group in tiles. Defaults to 0 and can no longer be changed in Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:445
+msgid "*y:* The y coordinate of the object group in tiles. Defaults to 0 and can no longer be changed in Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:447
+msgid "*width:* The width of the object group in tiles. Meaningless."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:448
+msgid "*height:* The height of the object group in tiles. Meaningless."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:452
+msgid "**offsetx:** Rendering offset for this object group in pixels. Defaults to 0. (since 0.14)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:454
+msgid "**offsety:** Rendering offset for this object group in pixels. Defaults to 0. (since 0.14)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:456
+msgid "**draworder:** Whether the objects are drawn according to the order of appearance (\"index\") or sorted by their y-coordinate (\"topdown\"). Defaults to \"topdown\"."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:460
+msgid "The object group is in fact a map layer, and is hence called \"object layer\" in Tiled."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:463
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-object`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:468
+msgid "<object>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:470
+msgid "**id:** Unique ID of the object. Each object that is placed on a map gets a unique id. Even if an object was deleted, no object gets the same ID. Can not be changed in Tiled. (since Tiled 0.11)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:473
+msgid "**name:** The name of the object. An arbitrary string."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:474
+msgid "**type:** The type of the object. An arbitrary string."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:475
+msgid "**x:** The x coordinate of the object in pixels."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:476
+msgid "**y:** The y coordinate of the object in pixels."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:477
+msgid "**width:** The width of the object in pixels (defaults to 0)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:478
+msgid "**height:** The height of the object in pixels (defaults to 0)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:479
+msgid "**rotation:** The rotation of the object in degrees clockwise (defaults to 0)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:481
+msgid "**gid:** A reference to a tile (optional)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:482
+msgid "**visible:** Whether the object is shown (1) or hidden (0). Defaults to 1."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:484
+msgid "**template:** A reference to a :ref:`template file <tmx-template-files>` (optional)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:486
+msgid "While tile layers are very suitable for anything repetitive aligned to the tile grid, sometimes you want to annotate your map with other information, not necessarily aligned to the grid. Hence the objects have their coordinates and size in pixels, but you can still easily align that to the grid when you want to."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:492
+msgid "You generally use objects to add custom information to your tile map, such as spawn points, warps, exits, etc."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:495
+msgid "When the object has a ``gid`` set, then it is represented by the image of the tile with that global ID. The image alignment currently depends on the map orientation. In orthogonal orientation it's aligned to the bottom-left while in isometric it's aligned to the bottom-center."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:500
+msgid "When the object has a ``template`` set, it will borrow all the properties from the specified template, properties saved with the object will have higher priority, i.e. they will override the template properties."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:505
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-ellipse` (since 0.9), :ref:`tmx-polygon`, :ref:`tmx-polyline`, :ref:`tmx-text` (since 1.0), *image*"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:512
+msgid "<ellipse>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:514
+msgid "Used to mark an object as an ellipse. The existing ``x``, ``y``, ``width`` and ``height`` attributes are used to determine the size of the ellipse."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:521
+msgid "<point>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:523
+msgid "Used to mark an object as a point. The existing ``x`` and ``y`` attributes are used to determine the position of the point."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:529
+msgid "<polygon>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:531
+#: ../../reference/tmx-map-format.rst:544
+msgid "**points:** A list of x,y coordinates in pixels."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:533
+msgid "Each ``polygon`` object is made up of a space-delimited list of x,y coordinates. The origin for these coordinates is the location of the parent ``object``. By default, the first point is created as 0,0 denoting that the point will originate exactly where the ``object`` is placed."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:542
+msgid "<polyline>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:546
+msgid "A ``polyline`` follows the same placement definition as a ``polygon`` object."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:552
+msgid "<text>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:554
+msgid "**fontfamily:** The font family used (default: \"sans-serif\")"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:555
+msgid "**pixelsize:** The size of the font in pixels (not using points, because other sizes in the TMX format are also using pixels) (default: 16)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:558
+msgid "**wrap:** Whether word wrapping is enabled (1) or disabled (0). Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:560
+msgid "**color:** Color of the text in ``#AARRGGBB`` or ``#RRGGBB`` format (default: #000000)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:562
+msgid "**bold:** Whether the font is bold (1) or not (0). Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:563
+msgid "**italic:** Whether the font is italic (1) or not (0). Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:564
+msgid "**underline:** Whether a line should be drawn below the text (1) or not (0). Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:566
+msgid "**strikeout:** Whether a line should be drawn through the text (1) or not (0). Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:568
+msgid "**kerning:** Whether kerning should be used while rendering the text (1) or not (0). Default to 1."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:570
+msgid "**halign:** Horizontal alignment of the text within the object (``left`` (default), ``center`` or ``right``)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:572
+msgid "**valign:** Vertical alignment of the text within the object (``top`` (default), ``center`` or ``bottom``)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:575
+msgid "Used to mark an object as a text object. Contains the actual text as character data."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:581
+msgid "<imagelayer>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:583
+msgid "**name:** The name of the image layer."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:584
+msgid "**offsetx:** Rendering offset of the image layer in pixels. Defaults to 0. (since 0.15)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:586
+msgid "**offsety:** Rendering offset of the image layer in pixels. Defaults to 0. (since 0.15)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:588
+msgid "*x:* The x position of the image layer in pixels. (deprecated since 0.15)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:590
+msgid "*y:* The y position of the image layer in pixels. (deprecated since 0.15)"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:596
+msgid "A layer consisting of a single image."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:598
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-image`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:603
+msgid "<group>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:605
+msgid "**name:** The name of the group layer."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:606
+msgid "**offsetx:** Rendering offset of the group layer in pixels. Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:608
+msgid "**offsety:** Rendering offset of the group layer in pixels. Defaults to 0."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:614
+msgid "A group layer, used to organize the layers of the map in a hierarchy. Its attributes ``offsetx``, ``offsety``, ``opacity`` and ``visible`` recursively affect child layers."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:618
+msgid "Can contain: :ref:`tmx-properties`, :ref:`tmx-layer`, :ref:`tmx-objectgroup`, :ref:`tmx-imagelayer`, :ref:`tmx-group`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:624
+msgid "<properties>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:626
+msgid "Can contain: :ref:`tmx-property`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:628
+msgid "Wraps any number of custom properties. Can be used as a child of the ``map``, ``tileset``, ``tile`` (when part of a ``tileset``), ``terrain``, ``layer``, ``objectgroup``, ``object``, ``imagelayer`` and ``group`` elements."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:636
+msgid "<property>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:638
+msgid "**name:** The name of the property."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:639
+msgid "**type:** The type of the property. Can be ``string`` (default), ``int``, ``float``, ``bool``, ``color`` or ``file`` (since 0.16, with ``color`` and ``file`` added in 0.17)."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:642
+msgid "**value:** The value of the property."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:644
+msgid "Boolean properties have a value of either \"true\" or \"false\"."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:646
+msgid "Color properties are stored in the format ``#AARRGGBB``."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:648
+msgid "File properties are stored as paths relative from the location of the map file."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:651
+msgid "When a string property contains newlines, the current version of Tiled will write out the value as characters contained inside the ``property`` element rather than as the ``value`` attribute. It is possible that a future version of the TMX format will switch to always saving property values inside the element rather than as an attribute."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:660
+msgid "Template Files"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:662
+msgid "Templates are saved in their own file, and are referenced by :ref:`objects <tmx-object>` that are template instances."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:668
+msgid "<template>"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:670
+msgid "The template root element contains the saved :ref:`map object <tmx-object>` and a :ref:`tileset <tmx-tileset>` element that points to an external tileset, if the object is a tile object."
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:674
+msgid "Example of a template file:"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:684
+msgid "Can contain: :ref:`tmx-tileset`, :ref:`tmx-object`"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:691
+msgid "Creative Commons License"
+msgstr ""
+
+#: ../../reference/tmx-map-format.rst:693
+msgid "The **TMX Map Format** by http://www.mapeditor.org is licensed under a `Creative Commons Attribution-ShareAlike 3.0 Unported License <http://creativecommons.org/licenses/by-sa/3.0/>`__."
+msgstr ""
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/manual/python.rst tiled-qt-1.2.4+dfsg.1/docs/manual/python.rst
--- tiled-qt-1.2.1+dfsg.1/docs/manual/python.rst	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/manual/python.rst	2019-05-15 15:33:52.000000000 +0000
@@ -13,6 +13,13 @@
 
 There are several `example scripts`_ available in the repository.
 
+.. note::
+
+    Since Tiled 1.2.4, the Python plugin is disabled by default, because
+    depending on which Python version is installed on the system the loading of
+    this plugin may cause a crash (`#2091`_). To use the Python plugin, first
+    enable it in the Preferences.
+
 .. warning::
 
     On Windows, Python is not installed by default. For the Tiled Python
@@ -117,3 +124,4 @@
 .. _example scripts: https://github.com/bjorn/tiled/tree/master/src/plugins/python/scripts
 .. _source file: https://github.com/bjorn/tiled/blob/master/src/plugins/python/tiledbinding.py
 .. _open issues related to Python support: https://github.com/bjorn/tiled/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+python+in%3Atitle
+.. _#2091: https://github.com/bjorn/tiled/issues/2091
diff -Nru tiled-qt-1.2.1+dfsg.1/docs/reference/support-for-tmx-maps.rst tiled-qt-1.2.4+dfsg.1/docs/reference/support-for-tmx-maps.rst
--- tiled-qt-1.2.1+dfsg.1/docs/reference/support-for-tmx-maps.rst	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/docs/reference/support-for-tmx-maps.rst	2019-05-15 15:33:52.000000000 +0000
@@ -86,6 +86,10 @@
    library for parsing Tiled map TMX files. This library could be used
    with MonoGame and Windows Runtime Universal apps.
 
+Clojure
+~~~~~~~
+- `tile-soup <https://github.com/oakes/tile-soup>`__: Parses and validates a TMX file into a map. Automatically decodes Base64 and CSV formatted data and coerces numbers when necessary. Works on both the JVM and in browsers via ClojureScript.
+
 D
 ~
 
diff -Nru tiled-qt-1.2.1+dfsg.1/NEWS.md tiled-qt-1.2.4+dfsg.1/NEWS.md
--- tiled-qt-1.2.1+dfsg.1/NEWS.md	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/NEWS.md	2019-05-15 15:33:52.000000000 +0000
@@ -1,8 +1,44 @@
+### Tiled 1.2.4 (15 May 2019)
+
+* Fixed view boundaries to take into account layer offsets (#2090)
+* Fixed map size when switching infinite off (#2051)
+* Fixed the image cache to check file modification time (#2081)
+* Fixed updating a few things when changing tileset drawing offset
+* Fixed position of tile object outline on isometric maps
+* Fixed saving of tile stamps when using the Shape Fill Tool
+* tBIN plugin: Fixed loading of some tilesets on Linux
+* tBIN plugin: Fixed possible crash when images can't be found (#2106)
+* Python plugin: Disable this plugin by default, to avoid crashes on startup (#2091)
+* JSON plugin: Fixed writing of position for objects without ID
+* Added Swedish translation (by Anton R)
+
+### Tiled 1.2.3 (12 March 2019)
+
+* Fixed cut/copy in Tile Collision Editor (#2075)
+* Fixed crash when trying to add Wang colors without a selected Wang set (#2083)
+* tBIN plugin: Fixed hang when locating missing tileset image (#2068)
+* CSV plugin: Fixed exporting of grouped tile layers
+
+### Tiled 1.2.2 (29 January 2019)
+
+* Added 'json1' plugin that exports to the old JSON format (#2058)
+* Enable the adding of point objects in Tile Collision Editor (#2043)
+* Reload AutoMapping rules when they have changed on disk (by Justin Zheng, #1997)
+* Fixed remembering of last used export filter
+* Fixed label color to update when object layer color is changed (by Justin Zheng, #1976)
+* Fixed stamp and fill tools to adjust when tile probability is changed (by Justin Zheng, #1996)
+* Fixed misbehavior when trying to open non-existing files
+* Fixed mini-map bounds when layer offsets are used in combination with group layers
+* Fixed Templates view missing from the Views menu (#2054)
+* Fixed Copy Path / Open Folder actions for embedded tilesets (#2059)
+* Python plugin: Made the API more complete (#1867)
+* Updated Chinese, German, Korean, Norwegian Bokmål, Portuguese (Portugal) and Ukrainian translations
+
 ### Tiled 1.2.1 (14 November 2018)
 
 * Fixed JSON templates not being visible in Templates view (#2009)
 * Fixed Maps view to show all readable map formats
-* Fixed crash when deleting a command using the context menu (#2014)
+* Fixed crash when deleting a command using the context menu (by Robert Lewicki, #2014)
 * Fixed crash after a world file failed to load
 * Fixed Select None action to be enabled when there is any selection
 * Fixed disappearing of tile types on export/import of a tileset (#2023)
diff -Nru tiled-qt-1.2.1+dfsg.1/qbs/imports/TiledPlugin.qbs tiled-qt-1.2.4+dfsg.1/qbs/imports/TiledPlugin.qbs
--- tiled-qt-1.2.1+dfsg.1/qbs/imports/TiledPlugin.qbs	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/qbs/imports/TiledPlugin.qbs	2019-05-15 15:33:52.000000000 +0000
@@ -22,10 +22,10 @@
         "QT_NO_FOREACH",
         "QT_NO_URL_CAST_FROM_STRING"
     ]
-    bundle.isBundle: false
 
     Properties {
         condition: qbs.targetOS.contains("macos")
+        bundle.isBundle: false
         cpp.cxxFlags: ["-Wno-unknown-pragmas"]
     }
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/imagecache.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/imagecache.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/imagecache.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/imagecache.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -29,6 +29,7 @@
 #include "imagecache.h"
 
 #include <QBitmap>
+#include <QFileInfo>
 
 namespace Tiled {
 
@@ -53,36 +54,62 @@
     return h;
 }
 
+LoadedImage::LoadedImage(const QString &fileName)
+    : image(fileName)
+    , lastModified(QFileInfo(fileName).lastModified())
+{}
+
+LoadedPixmap::LoadedPixmap(const LoadedImage &cachedImage)
+    : pixmap(QPixmap::fromImage(cachedImage))
+    , lastModified(cachedImage.lastModified)
+{}
+
+
+QHash<QString, LoadedImage> ImageCache::sLoadedImages;
+QHash<QString, LoadedPixmap> ImageCache::sLoadedPixmaps;
+QHash<TilesheetParameters, CutTiles> ImageCache::sCutTiles;
 
-QHash<QString, QImage> ImageCache::sLoadedImages;
-QHash<QString, QPixmap> ImageCache::sLoadedPixmaps;
-QHash<TilesheetParameters, QVector<QPixmap>> ImageCache::sCutTiles;
-
-QImage ImageCache::loadImage(const QString &fileName)
+LoadedImage ImageCache::loadImage(const QString &fileName)
 {
     auto it = sLoadedImages.find(fileName);
-    if (it == sLoadedImages.end())
-        it = sLoadedImages.insert(fileName, QImage(fileName));
+
+    bool found = it != sLoadedImages.end();
+    bool old = found && it.value().lastModified < QFileInfo(fileName).lastModified();
+
+    if (old)
+        remove(fileName);
+    if (old || !found)
+        it = sLoadedImages.insert(fileName, LoadedImage(fileName));
+
     return it.value();
 }
 
 QPixmap ImageCache::loadPixmap(const QString &fileName)
 {
     auto it = sLoadedPixmaps.find(fileName);
-    if (it == sLoadedPixmaps.end())
-        it = sLoadedPixmaps.insert(fileName, QPixmap::fromImage(loadImage(fileName)));
+
+    bool found = it != sLoadedPixmaps.end();
+    bool old = found && it.value().lastModified < QFileInfo(fileName).lastModified();
+
+    if (old)
+        remove(fileName);
+    if (old || !found)
+        it = sLoadedPixmaps.insert(fileName, LoadedPixmap(loadImage(fileName)));
+
     return it.value();
 }
 
-static QVector<QPixmap> cutTilesImpl(const TilesheetParameters &p)
+static CutTiles cutTilesImpl(const TilesheetParameters &p)
 {
     Q_ASSERT(p.tileWidth > 0 && p.tileHeight > 0);
 
-    const QImage image(ImageCache::loadImage(p.fileName));
+    const LoadedImage loadedImage = ImageCache::loadImage(p.fileName);
+    const QImage &image = loadedImage.image;
     const int stopWidth = image.width() - p.tileWidth;
     const int stopHeight = image.height() - p.tileHeight;
 
-    QVector<QPixmap> tiles;
+    CutTiles result;
+    result.lastModified = loadedImage.lastModified;
 
     for (int y = p.margin; y <= stopHeight; y += p.tileHeight + p.spacing) {
         for (int x = p.margin; x <= stopWidth; x += p.tileWidth + p.spacing) {
@@ -94,18 +121,25 @@
                 tilePixmap.setMask(QBitmap::fromImage(mask));
             }
 
-            tiles.append(tilePixmap);
+            result.tiles.append(tilePixmap);
         }
     }
 
-    return tiles;
+    return result;
 }
 
 QVector<QPixmap> ImageCache::cutTiles(const TilesheetParameters &parameters)
 {
     auto it = sCutTiles.find(parameters);
-    if (it == sCutTiles.end())
+
+    bool found = it != sCutTiles.end();
+    bool old = found && it.value().lastModified < QFileInfo(parameters.fileName).lastModified();
+
+    if (old)
+        remove(parameters.fileName);
+    if (old || !found)
         it = sCutTiles.insert(parameters, cutTilesImpl(parameters));
+
     return it.value();
 }
 
@@ -115,7 +149,7 @@
     sLoadedPixmaps.remove(fileName);
 
     // Also remove any previously cut tiles
-    QMutableHashIterator<TilesheetParameters, QVector<QPixmap>> it(sCutTiles);
+    QMutableHashIterator<TilesheetParameters, CutTiles> it(sCutTiles);
     while (it.hasNext()) {
         if (it.next().key().fileName == fileName)
             it.remove();
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/imagecache.h tiled-qt-1.2.4+dfsg.1/src/libtiled/imagecache.h
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/imagecache.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/imagecache.h	2019-05-15 15:33:52.000000000 +0000
@@ -32,6 +32,7 @@
 #include "tiled_global.h"
 
 #include <QColor>
+#include <QDateTime>
 #include <QHash>
 #include <QImage>
 #include <QPixmap>
@@ -53,18 +54,47 @@
 
 uint TILEDSHARED_EXPORT qHash(const TilesheetParameters &key, uint seed = 0) Q_DECL_NOTHROW;
 
+struct LoadedImage
+{
+    explicit LoadedImage(const QString &fileName);
+
+    operator const QImage &() const { return image; }
+
+    QImage image;
+    QDateTime lastModified;
+};
+
+struct LoadedPixmap
+{
+    explicit LoadedPixmap(const LoadedImage &cachedImage);
+
+    operator const QPixmap &() const { return pixmap; }
+
+    QPixmap pixmap;
+    QDateTime lastModified;
+};
+
+struct CutTiles
+{
+    operator const QVector<QPixmap> &() const { return tiles; }
+
+    QVector<QPixmap> tiles;
+    QDateTime lastModified;
+};
+
 class TILEDSHARED_EXPORT ImageCache
 {
 public:
-    static QImage loadImage(const QString &fileName);
+    static LoadedImage loadImage(const QString &fileName);
     static QPixmap loadPixmap(const QString &fileName);
     static QVector<QPixmap> cutTiles(const TilesheetParameters &parameters);
 
     static void remove(const QString &fileName);
 
-    static QHash<QString, QImage> sLoadedImages;
-    static QHash<QString, QPixmap> sLoadedPixmaps;
-    static QHash<TilesheetParameters, QVector<QPixmap>> sCutTiles;
+private:
+    static QHash<QString, LoadedImage> sLoadedImages;
+    static QHash<QString, LoadedPixmap> sLoadedPixmaps;
+    static QHash<TilesheetParameters, CutTiles> sCutTiles;
 };
 
 } // namespace Tiled
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/isometricrenderer.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/isometricrenderer.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/isometricrenderer.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/isometricrenderer.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -281,7 +281,7 @@
             const Cell &cell = layer->cellAt(columnItr);
             if (!cell.isEmpty()) {
                 Tile *tile = cell.tile();
-                QSize size = tile ? tile->size() : map()->tileSize();
+                QSize size = (tile && !tile->image().isNull()) ? tile->size() : map()->tileSize();
                 renderer.render(cell, QPointF(x, (qreal)y / 2), size,
                                 CellRenderer::BottomLeft);
             }
@@ -343,12 +343,22 @@
 
         if (testFlag(ShowTileObjectOutlines)) {
             QPointF tileOffset;
+            QPointF scale(1.0, 1.0);
 
-            if (const Tile *tile = cell.tile())
+            if (const Tile *tile = cell.tile()) {
                 tileOffset = tile->offset();
 
-            QRectF rect(QPointF(pos.x() - size.width() / 2 + tileOffset.x(),
-                                pos.y() - size.height() + tileOffset.y()),
+                const QPixmap &image = tile->image();
+                const QSizeF imageSize = image.size();
+
+                if (!imageSize.isEmpty()) {
+                    scale = QPointF(size.width() / imageSize.width(),
+                                    size.height() / imageSize.height());
+                }
+            }
+
+            QRectF rect(QPointF(pos.x() - size.width() / 2 + tileOffset.x() * scale.x(),
+                                pos.y() - size.height() + tileOffset.y() * scale.y()),
                         size);
 
             pen.setStyle(Qt::SolidLine);
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/libtiled.qbs tiled-qt-1.2.4+dfsg.1/src/libtiled/libtiled.qbs
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/libtiled.qbs	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/libtiled.qbs	2019-05-15 15:33:52.000000000 +0000
@@ -26,8 +26,11 @@
         cpp.cxxFlags: ["-Wno-unknown-pragmas"]
     }
 
-    bundle.isBundle: false
-    cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined
+    Properties {
+        condition: qbs.targetOS.contains("darwin")
+        bundle.isBundle: false
+        cpp.sonamePrefix: "@rpath"
+    }
 
     files: [
         "compression.cpp",
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/map.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/map.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/map.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/map.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -128,8 +128,11 @@
 {
     QMargins offsetMargins;
 
-    for (const Layer *layer : mLayers) {
-        const QPointF offset = layer->offset();
+    for (const Layer *layer : allLayers()) {
+        if (layer->isGroupLayer())
+            continue;
+
+        const QPointF offset = layer->totalOffset();
         offsetMargins = maxMargins(QMargins(qCeil(-offset.x()),
                                             qCeil(-offset.y()),
                                             qCeil(offset.x()),
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/maptovariantconverter.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/maptovariantconverter.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/maptovariantconverter.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/maptovariantconverter.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -53,7 +53,7 @@
     QVariantMap mapVariant;
 
     mapVariant[QLatin1String("type")] = QLatin1String("map");
-    mapVariant[QLatin1String("version")] = 1.2;
+    mapVariant[QLatin1String("version")] = (mVersion == 2) ? 1.2 : 1.1;
     mapVariant[QLatin1String("tiledversion")] = QCoreApplication::applicationVersion();
     mapVariant[QLatin1String("orientation")] = orientationToString(map.orientation());
     mapVariant[QLatin1String("renderorder")] = renderOrderToString(map.renderOrder());
@@ -144,7 +144,7 @@
         tilesetVariant[QLatin1String("type")] = QLatin1String("tileset");
 
         // Include version in external tilesets
-        tilesetVariant[QLatin1String("version")] = 1.2;
+        tilesetVariant[QLatin1String("version")] = (mVersion == 2) ? 1.2 : 1.1;
         tilesetVariant[QLatin1String("tiledversion")] = QCoreApplication::applicationVersion();
     }
 
@@ -196,12 +196,27 @@
 
     // Write the properties, terrain, external image, object group and
     // animation for those tiles that have them.
+
+    // Used for version 1
+    QVariantMap tilePropertiesVariant;
+    QVariantMap tilePropertyTypesVariant;
+    QVariantMap tilesVariantMap;
+
+    // Used for version 2
     QVariantList tilesVariant;
+
     for (const Tile *tile  : tileset.tiles()) {
         const Properties properties = tile->properties();
         QVariantMap tileVariant;
 
-        addProperties(tileVariant, properties);
+        if (mVersion == 1) {
+            if (!properties.isEmpty()) {
+                tilePropertiesVariant[QString::number(tile->id())] = toVariant(properties);
+                tilePropertyTypesVariant[QString::number(tile->id())] = propertyTypesToVariant(properties);
+            }
+        } else {
+            addProperties(tileVariant, properties);
+        }
 
         if (!tile->type().isEmpty())
             tileVariant[QLatin1String("type")] = tile->type();
@@ -237,11 +252,23 @@
         }
 
         if (!tileVariant.empty()) {
-            tileVariant[QLatin1String("id")] = tile->id();
-            tilesVariant << tileVariant;
+            if (mVersion == 1) {
+                tilesVariantMap[QString::number(tile->id())] = tileVariant;
+            } else {
+                tileVariant[QLatin1String("id")] = tile->id();
+                tilesVariant << tileVariant;
+            }
         }
     }
-    if (!tilesVariant.empty())
+
+    if (!tilePropertiesVariant.empty()) {
+        tilesetVariant[QLatin1String("tileproperties")] = tilePropertiesVariant;
+        tilesetVariant[QLatin1String("tilepropertytypes")] = tilePropertyTypesVariant;
+    }
+
+    if (!tilesVariantMap.empty())
+        tilesetVariant[QLatin1String("tiles")] = tilesVariantMap;
+    else if (!tilesVariant.empty())
         tilesetVariant[QLatin1String("tiles")] = tilesVariant;
 
     // Write terrains
@@ -272,6 +299,33 @@
     return tilesetVariant;
 }
 
+QVariant MapToVariantConverter::toVariant(const Properties &properties) const
+{
+    QVariantMap variantMap;
+
+    Properties::const_iterator it = properties.constBegin();
+    Properties::const_iterator it_end = properties.constEnd();
+    for (; it != it_end; ++it) {
+        const QVariant value = toExportValue(it.value(), mMapDir);
+        variantMap[it.key()] = value;
+    }
+
+    return variantMap;
+}
+
+QVariant MapToVariantConverter::propertyTypesToVariant(const Properties &properties) const
+{
+    QVariantMap variantMap;
+
+    Properties::const_iterator it = properties.constBegin();
+    Properties::const_iterator it_end = properties.constEnd();
+    for (; it != it_end; ++it)
+        variantMap[it.key()] = typeToName(it.value().userType());
+
+    return variantMap;
+}
+
+
 QVariant MapToVariantConverter::toVariant(const WangSet &wangSet) const
 {
     QVariantMap wangSetVariant;
@@ -466,7 +520,7 @@
         if (!object.cell().isEmpty())
             objectVariant[QLatin1String("gid")] = mGidMapper.cellToGid(object.cell());
 
-    if (id != 0) {
+    if (!object.isTemplateBase()) {
         objectVariant[QLatin1String("x")] = object.x();
         objectVariant[QLatin1String("y")] = object.y();
     }
@@ -660,20 +714,38 @@
     if (properties.isEmpty())
         return;
 
-    QVariantList propertiesVariantList;
+    if (mVersion == 1) {
+        QVariantMap propertiesMap;
+        QVariantMap propertyTypesMap;
+
+        Properties::const_iterator it = properties.constBegin();
+        Properties::const_iterator it_end = properties.constEnd();
+        for (; it != it_end; ++it) {
+            int type = it.value().userType();
+            const QVariant value = toExportValue(it.value(), mMapDir);
 
-    Properties::const_iterator it = properties.constBegin();
-    Properties::const_iterator it_end = properties.constEnd();
-    for (; it != it_end; ++it) {
-        int type = it.value().userType();
-        const QVariant value = toExportValue(it.value(), mMapDir);
+            propertiesMap[it.key()] = value;
+            propertyTypesMap[it.key()] = typeToName(type);
+        }
 
-        QVariantMap propertyVariantMap;
-        propertyVariantMap[QLatin1String("name")] = it.key();
-        propertyVariantMap[QLatin1String("value")] = value;
-        propertyVariantMap[QLatin1String("type")] = typeToName(type);
-        propertiesVariantList << propertyVariantMap;
-    }
+        variantMap[QLatin1String("properties")] = propertiesMap;
+        variantMap[QLatin1String("propertytypes")] = propertyTypesMap;
+    } else {
+        QVariantList propertiesVariantList;
+
+        Properties::const_iterator it = properties.constBegin();
+        Properties::const_iterator it_end = properties.constEnd();
+        for (; it != it_end; ++it) {
+            int type = it.value().userType();
+            const QVariant value = toExportValue(it.value(), mMapDir);
+
+            QVariantMap propertyVariantMap;
+            propertyVariantMap[QLatin1String("name")] = it.key();
+            propertyVariantMap[QLatin1String("value")] = value;
+            propertyVariantMap[QLatin1String("type")] = typeToName(type);
+            propertiesVariantList << propertyVariantMap;
+        }
 
-    variantMap[QLatin1String("properties")] = propertiesVariantList;
+        variantMap[QLatin1String("properties")] = propertiesVariantList;
+    }
 }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/maptovariantconverter.h tiled-qt-1.2.4+dfsg.1/src/libtiled/maptovariantconverter.h
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/maptovariantconverter.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/maptovariantconverter.h	2019-05-15 15:33:52.000000000 +0000
@@ -37,11 +37,17 @@
 /**
  * Converts Map instances to QVariant. Meant to be used together with
  * JsonWriter.
+ *
+ * The 'version' is interpreted as follows:
+ *  1: The JSON format used by Tiled 1.1 and earlier
+ *  2: The simplified JSON format used from Tiled 1.2 onwards
  */
 class TILEDSHARED_EXPORT MapToVariantConverter
 {
 public:
-    MapToVariantConverter() {}
+    explicit MapToVariantConverter(int version = 2)
+        : mVersion(version)
+    {}
 
     /**
      * Converts the given \a map to a QVariant. The \a mapDir is used to
@@ -58,6 +64,8 @@
 
 private:
     QVariant toVariant(const Tileset &tileset, int firstGid) const;
+    QVariant toVariant(const Properties &properties) const;
+    QVariant propertyTypesToVariant(const Properties &properties) const;
     QVariant toVariant(const WangSet &wangSet) const;
     QVariant toVariant(const WangColor &wangColor) const;
     QVariant toVariant(const QList<Layer*> &layers, Map::LayerDataFormat format) const;
@@ -79,6 +87,7 @@
     void addProperties(QVariantMap &variantMap,
                        const Properties &properties) const;
 
+    int mVersion;
     QDir mMapDir;
     GidMapper mGidMapper;
 };
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/orthogonalrenderer.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/orthogonalrenderer.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/orthogonalrenderer.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/orthogonalrenderer.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -324,7 +324,7 @@
                 continue;
 
             Tile *tile = cell.tile();
-            QSize size = tile ? tile->size() : map()->tileSize();
+            QSize size = (tile && !tile->image().isNull()) ? tile->size() : map()->tileSize();
             renderer.render(cell,
                             QPointF(x * tileWidth, (y + 1) * tileHeight),
                             size,
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/tilelayer.h tiled-qt-1.2.4+dfsg.1/src/libtiled/tilelayer.h
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/tilelayer.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/tilelayer.h	2019-05-15 15:33:52.000000000 +0000
@@ -74,6 +74,12 @@
         _flags(0)
     {}
 
+    Cell(Tileset *tileset, int tileId) :
+        _tileset(tileset),
+        _tileId(tileId),
+        _flags(0)
+    {}
+
     bool isEmpty() const { return _tileset == nullptr; }
 
     bool operator == (const Cell &other) const
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/tileset.cpp tiled-qt-1.2.4+dfsg.1/src/libtiled/tileset.cpp
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/tileset.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/tileset.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -255,6 +255,8 @@
  * Exists only because the Python plugin interface does not handle QUrl (would
  * be nice to add this). Assumes \a source is a local file when it would
  * otherwise be a relative URL (without scheme).
+ *
+ * \sa setImageSource
  */
 bool Tileset::loadFromImage(const QImage &image, const QString &source)
 {
@@ -291,7 +293,7 @@
     p.margin = mMargin;
     p.transparentColor = mImageReference.transparentColor;
 
-    auto image = ImageCache::loadImage(p.fileName);
+    QImage image = ImageCache::loadImage(p.fileName);
     if (image.isNull()) {
         mImageReference.status = LoadingError;
         return false;
@@ -395,6 +397,19 @@
 }
 
 /**
+ * Exists only because the Python plugin interface does not handle QUrl (would
+ * be nice to add this). Assumes \a source is a local file when it would
+ * otherwise be a relative URL (without scheme).
+ *
+ * \sa loadFromImage
+ */
+void Tileset::setImageSource(const QString &source)
+{
+    const QUrl url(source);
+    setImageSource(url.isRelative() ? QUrl::fromLocalFile(source) : url);
+}
+
+/**
  * Returns the column count that this tileset would have if the tileset
  * image would have the given \a width. This takes into account the tile
  * size, margin and spacing.
diff -Nru tiled-qt-1.2.1+dfsg.1/src/libtiled/tileset.h tiled-qt-1.2.4+dfsg.1/src/libtiled/tileset.h
--- tiled-qt-1.2.1+dfsg.1/src/libtiled/tileset.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/libtiled/tileset.h	2019-05-15 15:33:52.000000000 +0000
@@ -165,6 +165,9 @@
 
     const QUrl &imageSource() const;
     void setImageSource(const QUrl &imageSource);
+    void setImageSource(const QString &url);
+    QString imageSourceString() const;
+
     bool isCollection() const;
 
     int columnCountForWidth(int width) const;
@@ -522,6 +525,15 @@
 }
 
 /**
+ * QString-API for Python.
+ */
+inline QString Tileset::imageSourceString() const
+{
+    const QUrl &url = imageSource();
+    return url.isLocalFile() ? url.toLocalFile() : url.toString();
+}
+
+/**
  * Returns whether this tileset is a collection of images. In this case, the
  * tileset itself has no image source.
  */
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/csv/csvplugin.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/csv/csvplugin.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/csv/csvplugin.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/csv/csvplugin.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -20,6 +20,7 @@
 
 #include "csvplugin.h"
 
+#include "grouplayer.h"
 #include "map.h"
 #include "savefile.h"
 #include "tile.h"
@@ -42,10 +43,7 @@
 
     // Traverse all tile layers
     int currentLayer = 0;
-    for (const Layer *layer : map->layers()) {
-        if (layer->layerType() != Layer::TileLayerType)
-            continue;
-
+    for (const Layer *layer : map->tileLayers()) {
         const TileLayer *tileLayer = static_cast<const TileLayer*>(layer);
 
         SaveFile file(layerPaths.at(currentLayer));
@@ -105,17 +103,20 @@
 
     // Extract file name without extension and path
     QFileInfo fileInfo(fileName);
-    const QString base = fileInfo.completeBaseName() + QLatin1String("_");
+    const QString base = fileInfo.completeBaseName();
     const QString path = fileInfo.path();
 
     // Loop layers to calculate the path for the exported file
-    for (const Layer *layer : map->layers()) {
-        if (layer->layerType() != Layer::TileLayerType)
-            continue;
-
+    for (const Layer *layer : map->tileLayers()) {
         // Get the output file name for this layer
-        const QString layerName = layer->name();
-        const QString layerFileName = base + layerName + QLatin1String(".csv");
+        QString layerNames;
+
+        do {
+            layerNames.prepend(layer->name());
+            layerNames.prepend(QLatin1Char('_'));
+        } while ((layer = layer->parentLayer()));
+
+        const QString layerFileName = base + layerNames + QLatin1String(".csv");
         const QString layerFilePath = QDir(path).filePath(layerFileName);
 
         result.append(layerFilePath);
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json/jsonplugin.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/json/jsonplugin.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json/jsonplugin.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json/jsonplugin.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -145,7 +145,7 @@
 QString JsonMapFormat::nameFilter() const
 {
     if (mSubFormat == Json)
-        return tr("Json map files (*.json)");
+        return tr("JSON map files (*.json)");
     else
         return tr("JavaScript map files (*.js)");
 }
@@ -302,7 +302,7 @@
 
 QString JsonTilesetFormat::nameFilter() const
 {
-    return tr("Json tileset files (*.json)");
+    return tr("JSON tileset files (*.json)");
 }
 
 QString JsonTilesetFormat::shortName() const
@@ -406,7 +406,7 @@
 
 QString JsonObjectTemplateFormat::nameFilter() const
 {
-    return tr("Json template files (*.json)");
+    return tr("JSON template files (*.json)");
 }
 
 QString JsonObjectTemplateFormat::shortName() const
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json1.pro tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json1.pro
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json1.pro	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json1.pro	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,10 @@
+include(../plugin.pri)
+
+DEFINES += JSON_LIBRARY
+
+SOURCES += jsonplugin.cpp \
+    qjsonparser/json.cpp
+
+HEADERS += jsonplugin.h \
+    json_global.h \
+    qjsonparser/json.h
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json1.qbs tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json1.qbs
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json1.qbs	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json1.qbs	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,14 @@
+import qbs 1.0
+
+TiledPlugin {
+    cpp.defines: base.concat(["JSON_LIBRARY"])
+
+    files: [
+        "json_global.h",
+        "jsonplugin.cpp",
+        "jsonplugin.h",
+        "plugin.json",
+        "qjsonparser/json.cpp",
+        "qjsonparser/json.h",
+    ]
+}
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json_global.h tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json_global.h
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/json_global.h	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/json_global.h	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ * JSON Tiled Plugin
+ * Copyright 2011, Porfírio José Pereira Ribeiro <porfirioribeiro@gmail.com>
+ * Copyright 2011, Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
+ *
+ * This file is part of Tiled.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QtCore/qglobal.h>
+
+#if defined(JSON_LIBRARY)
+#  define JSONSHARED_EXPORT Q_DECL_EXPORT
+#else
+#  define JSONSHARED_EXPORT Q_DECL_IMPORT
+#endif
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/jsonplugin.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/json1/jsonplugin.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/jsonplugin.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/jsonplugin.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,422 @@
+/*
+ * JSON Tiled Plugin
+ * Copyright 2011, Porfírio José Pereira Ribeiro <porfirioribeiro@gmail.com>
+ * Copyright 2011, Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
+ *
+ * This file is part of Tiled.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "jsonplugin.h"
+
+#include "maptovariantconverter.h"
+#include "varianttomapconverter.h"
+#include "savefile.h"
+
+#include "qjsonparser/json.h"
+
+#include <QFile>
+#include <QFileInfo>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QTextStream>
+
+namespace Json {
+
+void JsonPlugin::initialize()
+{
+    addObject(new JsonMapFormat(JsonMapFormat::Json, this));
+    addObject(new JsonMapFormat(JsonMapFormat::JavaScript, this));
+    addObject(new JsonTilesetFormat(this));
+    addObject(new JsonObjectTemplateFormat(this));
+}
+
+
+JsonMapFormat::JsonMapFormat(SubFormat subFormat, QObject *parent)
+    : Tiled::MapFormat(parent)
+    , mSubFormat(subFormat)
+{}
+
+Tiled::Map *JsonMapFormat::read(const QString &fileName)
+{
+    QFile file(fileName);
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for reading.");
+        return nullptr;
+    }
+
+    JsonReader reader;
+    QByteArray contents = file.readAll();
+    if (mSubFormat == JavaScript && contents.size() > 0 && contents[0] != '{') {
+        // Scan past JSONP prefix; look for an open curly at the start of the line
+        int i = contents.indexOf(QLatin1String("\n{"));
+        if (i > 0) {
+            contents.remove(0, i);
+            contents = contents.trimmed(); // potential trailing whitespace
+            if (contents.endsWith(';')) contents.chop(1);
+            if (contents.endsWith(')')) contents.chop(1);
+        }
+    }
+    reader.parse(contents);
+
+    const QVariant variant = reader.result();
+
+    if (!variant.isValid()) {
+        mError = tr("Error parsing file.");
+        return nullptr;
+    }
+
+    Tiled::VariantToMapConverter converter;
+    Tiled::Map *map = converter.toMap(variant, QFileInfo(fileName).dir());
+
+    if (!map)
+        mError = converter.errorString();
+
+    return map;
+}
+
+bool JsonMapFormat::write(const Tiled::Map *map, const QString &fileName)
+{
+    Tiled::SaveFile file(fileName);
+
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for writing.");
+        return false;
+    }
+
+    Tiled::MapToVariantConverter converter{1};
+    QVariant variant = converter.toVariant(*map, QFileInfo(fileName).dir());
+
+    JsonWriter writer;
+    writer.setAutoFormatting(true);
+
+    if (!writer.stringify(variant)) {
+        // This can only happen due to coding error
+        mError = writer.errorString();
+        return false;
+    }
+
+    QTextStream out(file.device());
+    if (mSubFormat == JavaScript) {
+        // Trim and escape name
+        JsonWriter nameWriter;
+        QString baseName = QFileInfo(fileName).baseName();
+        nameWriter.stringify(baseName);
+        out << "(function(name,data){\n if(typeof onTileMapLoaded === 'undefined') {\n";
+        out << "  if(typeof TileMaps === 'undefined') TileMaps = {};\n";
+        out << "  TileMaps[name] = data;\n";
+        out << " } else {\n";
+        out << "  onTileMapLoaded(name,data);\n";
+        out << " }\n";
+        out << " if(typeof module === 'object' && module && module.exports) {\n";
+        out << "  module.exports = data;\n";
+        out << " }})(" << nameWriter.result() << ",\n";
+    }
+    out << writer.result();
+    if (mSubFormat == JavaScript) {
+        out << ");";
+    }
+
+    if (file.error() != QFileDevice::NoError) {
+        mError = tr("Error while writing file:\n%1").arg(file.errorString());
+        return false;
+    }
+
+    if (!file.commit()) {
+        mError = file.errorString();
+        return false;
+    }
+
+    return true;
+}
+
+QString JsonMapFormat::nameFilter() const
+{
+    if (mSubFormat == Json)
+        return tr("JSON map files [Tiled 1.1] (*.json)");
+    else
+        return tr("JavaScript map files [Tiled 1.1] (*.js)");
+}
+
+QString JsonMapFormat::shortName() const
+{
+    if (mSubFormat == Json)
+        return QLatin1String("json1");
+    else
+        return QLatin1String("js1");
+}
+
+bool JsonMapFormat::supportsFile(const QString &fileName) const
+{
+    if (mSubFormat == Json) {
+        if (!fileName.endsWith(QLatin1String(".json"), Qt::CaseInsensitive))
+            return false;
+    } else {
+        if (!fileName.endsWith(QLatin1String(".js"), Qt::CaseInsensitive))
+            return false;
+    }
+
+    QFile file(fileName);
+    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QByteArray contents = file.readAll();
+
+        if (mSubFormat == JavaScript && contents.size() > 0 && contents[0] != '{') {
+            // Scan past JSONP prefix; look for an open curly at the start of the line
+            int i = contents.indexOf(QLatin1String("\n{"));
+            if (i > 0) {
+                contents.remove(0, i);
+                contents = contents.trimmed(); // potential trailing whitespace
+                if (contents.endsWith(';')) contents.chop(1);
+                if (contents.endsWith(')')) contents.chop(1);
+            }
+        }
+
+        const QJsonObject object = QJsonDocument::fromJson(contents).object();
+
+        // This is a good indication, but not present in older map files
+        if (object.value(QLatin1String("type")).toString() == QLatin1String("map"))
+            return true;
+
+        // Guess based on expected property
+        if (object.contains(QLatin1String("orientation")))
+            return true;
+    }
+
+    return false;
+}
+
+QString JsonMapFormat::errorString() const
+{
+    return mError;
+}
+
+
+JsonTilesetFormat::JsonTilesetFormat(QObject *parent)
+    : Tiled::TilesetFormat(parent)
+{
+}
+
+Tiled::SharedTileset JsonTilesetFormat::read(const QString &fileName)
+{
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for reading.");
+        return Tiled::SharedTileset();
+    }
+
+    JsonReader reader;
+    reader.parse(file.readAll());
+
+    const QVariant variant = reader.result();
+
+    if (!variant.isValid()) {
+        mError = tr("Error parsing file.");
+        return Tiled::SharedTileset();
+    }
+
+    Tiled::VariantToMapConverter converter;
+    Tiled::SharedTileset tileset = converter.toTileset(variant,
+                                                       QFileInfo(fileName).dir());
+
+    if (!tileset)
+        mError = converter.errorString();
+    else
+        tileset->setFileName(fileName);
+
+    return tileset;
+}
+
+bool JsonTilesetFormat::supportsFile(const QString &fileName) const
+{
+    if (fileName.endsWith(QLatin1String(".json"), Qt::CaseInsensitive)) {
+        QFile file(fileName);
+
+        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            const QJsonObject object = QJsonDocument::fromJson(file.readAll()).object();
+
+            // This is a good indication, but not present in older external tilesets
+            if (object.value(QLatin1String("type")).toString() == QLatin1String("tileset"))
+                return true;
+
+            // Guess based on some expected properties
+            if (object.contains(QLatin1String("name")) &&
+                object.contains(QLatin1String("tilewidth")) &&
+                object.contains(QLatin1String("tileheight")))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool JsonTilesetFormat::write(const Tiled::Tileset &tileset,
+                              const QString &fileName)
+{
+    Tiled::SaveFile file(fileName);
+
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for writing.");
+        return false;
+    }
+
+    Tiled::MapToVariantConverter converter{1};
+    QVariant variant = converter.toVariant(tileset, QFileInfo(fileName).dir());
+
+    JsonWriter writer;
+    writer.setAutoFormatting(true);
+
+    if (!writer.stringify(variant)) {
+        // This can only happen due to coding error
+        mError = writer.errorString();
+        return false;
+    }
+
+    QTextStream out(file.device());
+    out << writer.result();
+
+    if (file.error() != QFileDevice::NoError) {
+        mError = tr("Error while writing file:\n%1").arg(file.errorString());
+        return false;
+    }
+
+    if (!file.commit()) {
+        mError = file.errorString();
+        return false;
+    }
+
+    return true;
+}
+
+QString JsonTilesetFormat::nameFilter() const
+{
+    return tr("JSON tileset files [Tiled 1.1] (*.json)");
+}
+
+QString JsonTilesetFormat::shortName() const
+{
+    return QLatin1String("json1");
+}
+
+QString JsonTilesetFormat::errorString() const
+{
+    return mError;
+}
+
+JsonObjectTemplateFormat::JsonObjectTemplateFormat(QObject *parent)
+    : Tiled::ObjectTemplateFormat(parent)
+{
+}
+
+Tiled::ObjectTemplate *JsonObjectTemplateFormat::read(const QString &fileName)
+{
+    QFile file(fileName);
+
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for reading.");
+        return nullptr;
+    }
+
+    JsonReader reader;
+    reader.parse(file.readAll());
+
+    const QVariant variant = reader.result();
+
+    if (!variant.isValid()) {
+        mError = tr("Error parsing file.");
+        return nullptr;
+    }
+
+    Tiled::VariantToMapConverter converter;
+    Tiled::ObjectTemplate *objectTemplate = converter.toObjectTemplate(variant,
+                                                                       QFileInfo(fileName).dir());
+
+    if (!objectTemplate)
+        mError = converter.errorString();
+    else
+        objectTemplate->setFileName(fileName);
+
+    return objectTemplate;
+}
+
+bool JsonObjectTemplateFormat::supportsFile(const QString &fileName) const
+{
+    if (fileName.endsWith(QLatin1String(".json"), Qt::CaseInsensitive)) {
+        QFile file(fileName);
+
+        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+            const QJsonObject object = QJsonDocument::fromJson(file.readAll()).object();
+
+            if (object.value(QLatin1String("type")).toString() == QLatin1String("template"))
+                return true;
+        }
+    }
+
+    return false;
+}
+
+bool JsonObjectTemplateFormat::write(const Tiled::ObjectTemplate *objectTemplate, const QString &fileName)
+{
+    Tiled::SaveFile file(fileName);
+
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        mError = tr("Could not open file for writing.");
+        return false;
+    }
+
+    Tiled::MapToVariantConverter converter{1};
+    QVariant variant = converter.toVariant(*objectTemplate, QFileInfo(fileName).dir());
+
+    JsonWriter writer;
+    writer.setAutoFormatting(true);
+
+    if (!writer.stringify(variant)) {
+        // This can only happen due to coding error
+        mError = writer.errorString();
+        return false;
+    }
+
+    QTextStream out(file.device());
+    out << writer.result();
+
+    if (file.error() != QFileDevice::NoError) {
+        mError = tr("Error while writing file:\n%1").arg(file.errorString());
+        return false;
+    }
+
+    if (!file.commit()) {
+        mError = file.errorString();
+        return false;
+    }
+
+    return true;
+}
+
+QString JsonObjectTemplateFormat::nameFilter() const
+{
+    return tr("JSON template files [Tiled 1.1] (*.json)");
+}
+
+QString JsonObjectTemplateFormat::shortName() const
+{
+    return QLatin1String("json1");
+}
+
+QString JsonObjectTemplateFormat::errorString() const
+{
+    return mError;
+}
+
+} // namespace Json
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/jsonplugin.h tiled-qt-1.2.4+dfsg.1/src/plugins/json1/jsonplugin.h
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/jsonplugin.h	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/jsonplugin.h	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,120 @@
+/*
+ * JSON Tiled Plugin
+ * Copyright 2011, Porfírio José Pereira Ribeiro <porfirioribeiro@gmail.com>
+ * Copyright 2011, Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
+ *
+ * This file is part of Tiled.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "json_global.h"
+
+#include "mapformat.h"
+#include "objecttemplateformat.h"
+#include "plugin.h"
+#include "tilesetformat.h"
+
+#include <QObject>
+
+namespace Tiled {
+class Map;
+}
+
+namespace Json {
+
+class JSONSHARED_EXPORT JsonPlugin : public Tiled::Plugin
+{
+    Q_OBJECT
+    Q_INTERFACES(Tiled::Plugin)
+    Q_PLUGIN_METADATA(IID "org.mapeditor.Plugin" FILE "plugin.json")
+
+public:
+    void initialize() override;
+};
+
+
+class JSONSHARED_EXPORT JsonMapFormat : public Tiled::MapFormat
+{
+    Q_OBJECT
+    Q_INTERFACES(Tiled::MapFormat)
+
+public:
+    enum SubFormat {
+        Json,
+        JavaScript,
+    };
+
+    JsonMapFormat(SubFormat subFormat, QObject *parent = nullptr);
+
+    Tiled::Map *read(const QString &fileName) override;
+    bool supportsFile(const QString &fileName) const override;
+
+    bool write(const Tiled::Map *map, const QString &fileName) override;
+
+    QString nameFilter() const override;
+    QString shortName() const override;
+    QString errorString() const override;
+
+protected:
+    QString mError;
+    SubFormat mSubFormat;
+};
+
+
+class JSONSHARED_EXPORT JsonTilesetFormat : public Tiled::TilesetFormat
+{
+    Q_OBJECT
+    Q_INTERFACES(Tiled::TilesetFormat)
+
+public:
+    JsonTilesetFormat(QObject *parent = nullptr);
+
+    Tiled::SharedTileset read(const QString &fileName) override;
+    bool supportsFile(const QString &fileName) const override;
+
+    bool write(const Tiled::Tileset &tileset, const QString &fileName) override;
+
+    QString nameFilter() const override;
+    QString shortName() const override;
+    QString errorString() const override;
+
+protected:
+    QString mError;
+};
+
+class JSONSHARED_EXPORT JsonObjectTemplateFormat : public Tiled::ObjectTemplateFormat
+{
+    Q_OBJECT
+    Q_INTERFACES(Tiled::ObjectTemplateFormat)
+
+public:
+    JsonObjectTemplateFormat(QObject *parent = nullptr);
+
+    Tiled::ObjectTemplate *read(const QString &fileName) override;
+    bool supportsFile(const QString &fileName) const override;
+
+    bool write(const Tiled::ObjectTemplate *objectTemplate, const QString &fileName) override;
+
+    QString nameFilter() const override;
+    QString shortName() const override;
+    QString errorString() const override;
+
+protected:
+    QString mError;
+};
+
+} // namespace Json
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/plugin.json tiled-qt-1.2.4+dfsg.1/src/plugins/json1/plugin.json
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/plugin.json	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/plugin.json	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1 @@
+{ "defaultEnable": false }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/json.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/json.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/json.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/json.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,446 @@
+/****************************************************************************
+**
+** Copyright (c) 2010 Girish Ramakrishnan <girish@forwardbias.in>
+**
+** Use, modification and distribution is allowed without limitation,
+** warranty, liability or support of any kind.
+**
+****************************************************************************/
+
+#include "json.h"
+#include "jsonparser.cpp"
+
+#include <QTextCodec>
+#include <qnumeric.h>
+
+/*!
+  \class JsonReader
+  \reentrant
+
+  \brief The JsonReader class provides a fast parser for reading
+  well-formed JSON into a QVariant.
+
+  The parser converts JSON types into QVariant types. For example, JSON
+  arrays are translated into QVariantList and JSON objects are translated 
+  into QVariantMap. For example,
+  \code
+  JsonReader reader;
+  if (reader.parse(QString("{ \"id\": 123, \"class\": \"JsonReader\", \"authors\": [\"Denis\",\"Ettrich\",\"Girish\"] }"))) {
+    QVariant result = reader.result();
+    QVariantMap map = result.toMap(); // the JSON object
+    qDebug() << map.count(); // 3
+    qDebug() << map["id"].toInt(); // 123
+    qDebug() << map["class"].toString(); // "JsonReader"
+    QVariantList list = map["authors"].toList();
+    qDebug() << list[2].toString(); // "Girish"
+  } else {
+    qDebug() << reader.errorString();
+  }
+  \endcode
+
+  As seen above, the reader converts the JSON into a QVariant with arbitrary nesting.
+  A complete listing of JSON to QVariant conversion is documented at parse().
+
+  JsonWriter can be used to convert a QVariant into JSON string.
+*/
+
+/*!
+  Constructs a JSON reader.
+ */
+JsonReader::JsonReader()
+{
+}
+
+/*!
+  Destructor
+ */
+JsonReader::~JsonReader()
+{
+}
+
+/*!
+  Parses the JSON \a ba as a QVariant.
+
+  If the parse succeeds, this function returns true and the QVariant can
+  be accessed using result(). If the parse fails, this function returns
+  false and the error message can be accessed using errorMessage().
+
+  The encoding of \ba is auto-detected based on the pattern of nulls in the
+  initial 4 octets as described in "Section 3. Encoding" of RFC 2647. If an 
+  encoding could not be auto-detected, this function assumes UTF-8.
+
+  The conversion from JSON type into QVariant type is as listed below:
+  \table
+  \row
+  \o false
+  \o QVariant::Bool with the value false.
+  \row
+  \o true
+  \o QVariant::Bool with the value true.
+  \row
+  \o null
+  \o QVariant::Invalid i.e QVariant()
+  \row
+  \o object
+  \o QVariant::Map i.e QVariantMap
+  \row
+  \o array
+  \o QVariant::List i.e QVariantList
+  \row
+  \o string
+  \o QVariant::String i.e QString
+  \row
+  \o number
+  \o QVariant::Double or QVariant::LongLong. If the JSON number contains a '.' or 'e' 
+     or 'E', QVariant::Double is used.
+  \endtable
+
+  The byte array \ba may or may not contain a BOM.
+ */
+bool JsonReader::parse(const QByteArray &ba)
+{
+    QTextCodec *codec = QTextCodec::codecForUtfText(ba, 0); // try BOM detection
+    if (!codec) {
+        int mib = 106; // utf-8
+
+        if (ba.length() > 3) { // auto-detect
+            const char *data = ba.constData();
+            if (data[0] != 0) {
+                if (data[1] != 0)
+                    mib = 106; // utf-8
+                else if (data[2] != 0)
+                    mib = 1014; // utf16 le
+                else
+                    mib = 1019; // utf32 le
+            } else if (data[1] != 0)
+                mib = 1013; // utf16 be
+            else
+                mib = 1018; // utf32 be
+        }
+        codec = QTextCodec::codecForMib(mib);
+    }
+    QString str = codec->toUnicode(ba);
+    return parse(str);
+}
+
+/*!
+  Parses the JSON string \a str as a QVariant.
+
+  If the parse succeeds, this function returns true and the QVariant can
+  be accessed using result(). If the parse fails, this function returns
+  false and the error message can be accessed using errorMessage().
+ */
+bool JsonReader::parse(const QString &str)
+{
+    JsonLexer lexer(str);
+    JsonParser parser;
+    if (!parser.parse(&lexer)) {
+        m_errorString = parser.errorMessage();
+        m_result = QVariant();
+        return false;
+    }
+    m_errorString.clear();
+    m_result = parser.result();
+    return true;
+}
+
+/*!
+  Returns the result of the last parse() call.
+
+  If parse() failed, this function returns an invalid QVariant.
+ */
+QVariant JsonReader::result() const
+{
+    return m_result;
+}
+
+/*!
+  Returns the error message for the last parse() call.
+
+  If parse() succeeded, this functions return an empty string. The error message
+  should be used for debugging purposes only.
+ */
+QString JsonReader::errorString() const
+{
+    return m_errorString;
+}
+
+/*!
+  \class JsonWriter
+  \reentrant
+
+  \brief The JsonWriter class converts a QVariant into a JSON string.
+
+  The writer converts specific supported types stored in a QVariant into JSON.
+  For example,
+  \code
+    QVariantMap map;
+    map["id"] = 123;
+    map["class"] = "JsonWriter";
+    QVariantList list;
+    list << "Denis" << "Ettrich" << "Girish";
+    map["authors"] = list;
+
+    JsonWriter writer;
+    if (writer.stringify(map)) {
+        QString json = writer.result();
+        qDebug() << json; // {"authors": ["Denis", "Ettrich", "Girish"], "class": "JsonWriter", "id": 123 }
+    } else {
+        qDebug() << "Failed to stringify " << writer.errorString();
+    }
+  \endcode
+
+  The list of QVariant types that the writer supports is listed in stringify(). Note that
+  custom C++ types registered using Q_DECLARE_METATYPE are not supported.
+*/
+
+/*!
+  Creates a JsonWriter.
+ */
+JsonWriter::JsonWriter()
+    : m_autoFormatting(false), m_autoFormattingIndent(4, QLatin1Char(' '))
+{
+}
+
+/*!
+  Destructor.
+ */
+JsonWriter::~JsonWriter()
+{
+}
+
+/*!
+  Enables auto formatting if \a enable is \c true, otherwise
+  disables it.
+ 
+  When auto formatting is enabled, the writer automatically inserts
+  spaces and new lines to make the output more human readable.
+ 
+  The default value is \c false.
+ */
+void JsonWriter::setAutoFormatting(bool enable)
+{
+    m_autoFormatting = enable;
+}
+
+/*!
+  Returns \c true if auto formattting is enabled, otherwise \c false.
+ */
+bool JsonWriter::autoFormatting() const
+{
+    return m_autoFormatting;
+}
+
+/*!
+  Sets the number of spaces or tabs used for indentation when
+  auto-formatting is enabled. Positive numbers indicate spaces,
+  negative numbers tabs.
+
+  The default indentation is 4.
+
+  \sa setAutoFormatting()
+*/
+void JsonWriter::setAutoFormattingIndent(int spacesOrTabs)
+{
+    m_autoFormattingIndent = QString(qAbs(spacesOrTabs), QLatin1Char(spacesOrTabs >= 0 ? ' ' : '\t'));
+}
+
+/*!
+  Retuns the numbers of spaces or tabs used for indentation when
+  auto-formatting is enabled. Positive numbers indicate spaces,
+  negative numbers tabs.
+
+  The default indentation is 4.
+
+  \sa setAutoFormatting()
+*/
+int JsonWriter::autoFormattingIndent() const
+{
+    return m_autoFormattingIndent.count(QLatin1Char(' ')) - m_autoFormattingIndent.count(QLatin1Char('\t'));
+}
+
+/*! \internal
+  Inserts escape character \ for characters in string as described in JSON specification.
+ */
+static QString escape(const QVariant &variant)
+{
+    QString str = variant.toString();
+    QString res;
+    res.reserve(str.length());
+    for (int i = 0; i < str.length(); i++) {
+        if (str[i] == QLatin1Char('\b')) {
+            res += QLatin1String("\\b");
+        } else if (str[i] == QLatin1Char('\f')) {
+            res += QLatin1String("\\f");
+        } else if (str[i] == QLatin1Char('\n')) {
+            res += QLatin1String("\\n");
+        } else if (str[i] == QLatin1Char('\r')) {
+            res += QLatin1String("\\r");
+        } else if (str[i] == QLatin1Char('\t')) {
+            res += QLatin1String("\\t");
+        } else if (str[i] == QLatin1Char('\"')) {
+            res += QLatin1String("\\\"");
+        } else if (str[i] == QLatin1Char('\\')) {
+            res += QLatin1String("\\\\");
+        } else if (str[i] == QLatin1Char('/')) {
+            res += QLatin1String("\\/");
+        } else if (str[i].unicode() > 127) {
+            res += QLatin1String("\\u") + QString::number(str[i].unicode(), 16).rightJustified(4, QLatin1Char('0'));
+        } else {
+            res += str[i];
+        }
+    }
+    return res;
+}
+
+/*! \internal
+  Stringifies \a variant.
+ */
+void JsonWriter::stringify(const QVariant &variant, int depth)
+{
+    if (variant.type() == QVariant::List || variant.type() == QVariant::StringList) {
+        m_result += QLatin1Char('[');
+        QVariantList list = variant.toList();
+        for (int i = 0; i < list.count(); i++) {
+            if (i != 0) {
+                m_result += QLatin1Char(',');
+                if (m_autoFormatting)
+                    m_result += QLatin1Char(' ');
+            }
+            stringify(list[i], depth+1);
+        }
+        m_result += QLatin1Char(']');
+    } else if (variant.type() == QVariant::Map) {
+        QString indent = m_autoFormattingIndent.repeated(depth);
+        QVariantMap map = variant.toMap();
+        if (m_autoFormatting && depth != 0) {
+            m_result += QLatin1Char('\n');
+            m_result += indent;
+            m_result += QLatin1String("{\n");
+        } else {
+            m_result += QLatin1Char('{');
+        }
+        for (QVariantMap::const_iterator it = map.constBegin(); it != map.constEnd(); ++it) {
+            if (it != map.constBegin()) {
+                m_result += QLatin1Char(',');
+                if (m_autoFormatting)
+                    m_result += QLatin1Char('\n');
+            }
+            if (m_autoFormatting)
+                m_result += indent + QLatin1Char(' ');
+            m_result += QLatin1Char('\"') + escape(it.key()) + QLatin1String("\":");
+            stringify(it.value(), depth+1);
+        }
+        if (m_autoFormatting) {
+            m_result += QLatin1Char('\n');
+            m_result += indent;
+        }
+        m_result += QLatin1Char('}');
+    } else if (variant.type() == QVariant::String || variant.type() == QVariant::ByteArray) {
+        m_result += QLatin1Char('\"') + escape(variant) + QLatin1Char('\"');
+    } else if (variant.type() == QVariant::Double || (int)variant.type() == (int)QMetaType::Float) {
+        double d = variant.toDouble();
+        if (qIsFinite(d))
+            m_result += QString::number(variant.toDouble(), 'g', 15);
+        else
+            m_result += QLatin1String("null");
+    } else if (variant.type() == QVariant::Bool) {
+        m_result += variant.toBool() ? QLatin1String("true") : QLatin1String("false");
+    } else if (variant.type() == QVariant::Invalid) {
+        m_result += QLatin1String("null");
+    } else if (variant.type() == QVariant::ULongLong) {
+        m_result += QString::number(variant.toULongLong());
+    } else if (variant.type() == QVariant::LongLong) {
+        m_result += QString::number(variant.toLongLong());
+    } else if (variant.type() == QVariant::Int) {
+        m_result += QString::number(variant.toInt());
+    } else if (variant.type() == QVariant::UInt) {
+        m_result += QString::number(variant.toUInt());
+    } else if (variant.type() == QVariant::Char) {
+        QChar c = variant.toChar();
+        if (c.unicode() > 127)
+            m_result += QLatin1String("\"\\u") + QString::number(c.unicode(), 16).rightJustified(4, QLatin1Char('0')) + QLatin1Char('\"');
+        else
+            m_result += QLatin1Char('\"') + c + QLatin1Char('\"');
+    } else if (variant.canConvert<qlonglong>()) {
+        m_result += QString::number(variant.toLongLong());
+    } else if (variant.canConvert<QString>()) {
+        m_result += QLatin1Char('\"') + escape(variant) + QLatin1Char('\"');
+    } else {
+        if (!m_errorString.isEmpty())
+            m_errorString.append(QLatin1Char('\n'));
+        QString msg = QString::fromLatin1("Unsupported type %1 (id: %2)").arg(QString::fromUtf8(variant.typeName())).arg(variant.userType());
+        m_errorString.append(msg);
+        qWarning() << "JsonWriter::stringify - " << msg;
+        m_result += QLatin1String("null");
+    }
+}
+
+/*!
+  Converts the variant \a var into a JSON string.
+
+  The stringizer converts \a var into JSON based on the type of it's contents. The supported
+  types and their conversion into JSON is as listed below:
+
+  \table
+  \row
+  \o QVariant::List, QVariant::StringList
+  \o JSON array []
+  \row
+  \o QVariant::Map
+  \o JSON object {}
+  \row
+  \o QVariant::String, QVariant::ByteArray
+  \o JSON string encapsulated in double quotes. String contents are escaped using '\' if necessary.
+  \row
+  \o QVariant::Double, QMetaType::Float
+  \o JSON number with a precision 15. Infinity and NaN are converted into null.
+  \row
+  \o QVariant::Bool
+  \o JSON boolean true and false
+  \row
+  \o QVariant::Invalid
+  \o JSON null
+  \row
+  \o QVariant::ULongLong, QVariant::LongLong, QVariant::Int, QVariant::UInt, 
+  \o JSON number
+  \row
+  \o QVariant::Char
+  \o JSON string. Non-ASCII characters are converted into the \uXXXX notation.
+  \endtable
+
+  As a fallback, the writer attempts to convert a type not listed above into a long long or a
+  QString using QVariant::canConvert. See the QVariant documentation for possible conversions.
+
+  JsonWriter does not support stringizing custom user types stored in the QVariant. Any such
+  value would be converted into JSON null.
+ */
+bool JsonWriter::stringify(const QVariant &var)
+{
+    m_errorString.clear();
+    m_result.clear();
+    stringify(var, 0 /* depth */);
+    return m_errorString.isEmpty();
+}
+
+/*!
+  Returns the result of the last stringify() call.
+
+  If stringify() failed, this function returns a null QString.
+ */
+QString JsonWriter::result() const
+{
+    return m_result;
+}
+
+/*!
+  Returns the error message for the last stringify() call.
+
+  If stringify() succeeded, this functions return an empty string. The error message
+  should be used for debugging purposes only.
+ */
+QString JsonWriter::errorString() const
+{
+    return m_errorString;
+}
+
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/json.h tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/json.h
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/json.h	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/json.h	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (c) 2010 Girish Ramakrishnan <girish@forwardbias.in>
+**
+** Use, modification and distribution is allowed without limitation,
+** warranty, liability or support of any kind.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QByteArray>
+#include <QVariant>
+
+class JsonReader
+{
+public:
+    JsonReader();
+    ~JsonReader();
+
+    bool parse(const QByteArray &ba);
+    bool parse(const QString &str);
+
+    QVariant result() const;
+
+    QString errorString() const;
+
+private:
+    QVariant m_result;
+    QString m_errorString;
+};
+
+class JsonWriter
+{
+public:
+    JsonWriter();
+    ~JsonWriter();
+
+    bool stringify(const QVariant &variant);
+
+    QString result() const;
+
+    QString errorString() const;
+
+    void setAutoFormatting(bool autoFormat);
+    bool autoFormatting() const;
+
+    void setAutoFormattingIndent(int spaceOrTabs);
+    int autoFormattingIndent() const;
+
+private:
+    void stringify(const QVariant &variant, int depth);
+
+    QString m_result;
+    QString m_errorString;
+    bool m_autoFormatting;
+    QString m_autoFormattingIndent;
+};
+
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/jsonparser.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/jsonparser.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/jsonparser.cpp	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/jsonparser.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,527 @@
+// This file was generated by qlalr - DO NOT EDIT!
+#ifndef JSONPARSER_CPP
+#define JSONPARSER_CPP
+
+class JsonGrammar
+{
+public:
+  enum VariousConstants {
+    EOF_SYMBOL = 0,
+    ERROR = 12,
+    T_COLON = 7,
+    T_COMMA = 8,
+    T_FALSE = 9,
+    T_LCURLYBRACKET = 3,
+    T_LSQUAREBRACKET = 5,
+    T_NULL = 11,
+    T_NUMBER = 2,
+    T_RCURLYBRACKET = 4,
+    T_RSQUAREBRACKET = 6,
+    T_STRING = 1,
+    T_TRUE = 10,
+
+    ACCEPT_STATE = 12,
+    RULE_COUNT = 17,
+    STATE_COUNT = 27,
+    TERMINAL_COUNT = 13,
+    NON_TERMINAL_COUNT = 7,
+
+    GOTO_INDEX_OFFSET = 27,
+    GOTO_INFO_OFFSET = 37,
+    GOTO_CHECK_OFFSET = 37
+  };
+
+  static const char  *const    spell [];
+  static const short             lhs [];
+  static const short             rhs [];
+
+#ifndef QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+  static const int     rule_index [];
+  static const int      rule_info [];
+#endif // QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+
+  static const short    goto_default [];
+  static const short  action_default [];
+  static const short    action_index [];
+  static const short     action_info [];
+  static const short    action_check [];
+
+  static inline int nt_action (int state, int nt)
+  {
+    const int yyn = action_index [GOTO_INDEX_OFFSET + state] + nt;
+    if (yyn < 0 || action_check [GOTO_CHECK_OFFSET + yyn] != nt)
+      return goto_default [nt];
+
+    return action_info [GOTO_INFO_OFFSET + yyn];
+  }
+
+  static inline int t_action (int state, int token)
+  {
+    const int yyn = action_index [state] + token;
+
+    if (yyn < 0 || action_check [yyn] != token)
+      return - action_default [state];
+
+    return action_info [yyn];
+  }
+};
+
+
+const char *const JsonGrammar::spell [] = {
+  "end of file", "string", "number", "{", "}", "[", "]", ":", ",", "false", 
+  "true", "null", "error", 
+#ifndef QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+"Root", "Value", "Object", "Members", "Array", "Values", "$accept"
+#endif // QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+};
+
+const short JsonGrammar::lhs [] = {
+  13, 15, 16, 16, 16, 14, 14, 14, 14, 14, 
+  14, 14, 17, 18, 18, 18, 19};
+
+const short JsonGrammar::rhs [] = {
+  1, 3, 3, 5, 0, 1, 1, 1, 1, 1, 
+  1, 1, 3, 1, 3, 0, 2};
+
+
+#ifndef QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+const int JsonGrammar::rule_info [] = {
+    13, 14
+  , 15, 3, 16, 4
+  , 16, 1, 7, 14
+  , 16, 16, 8, 1, 7, 14
+  , 16
+  , 14, 9
+  , 14, 10
+  , 14, 11
+  , 14, 15
+  , 14, 17
+  , 14, 2
+  , 14, 1
+  , 17, 5, 18, 6
+  , 18, 14
+  , 18, 18, 8, 14
+  , 18
+  , 19, 13, 0};
+
+const int JsonGrammar::rule_index [] = {
+  0, 2, 6, 10, 16, 17, 19, 21, 23, 25, 
+  27, 29, 31, 35, 37, 41, 42};
+#endif // QLALR_NO_JSONGRAMMAR_DEBUG_INFO
+
+const short JsonGrammar::action_default [] = {
+  0, 10, 9, 0, 6, 5, 16, 8, 11, 12, 
+  7, 1, 17, 0, 0, 0, 2, 0, 0, 4, 
+  0, 3, 14, 0, 0, 13, 15};
+
+const short JsonGrammar::goto_default [] = {
+  3, 11, 2, 13, 1, 23, 0};
+
+const short JsonGrammar::action_index [] = {
+  24, -13, -13, 12, -13, -1, 24, -13, -13, -13, 
+  -13, -13, -13, 1, -5, 2, -13, -6, 24, -13, 
+  24, -13, -13, -2, 24, -13, -13, 
+
+  -7, -7, -7, -7, -7, -7, 1, -7, -7, -7, 
+  -7, -7, -7, -7, -7, -7, -7, -7, 0, -7, 
+  -1, -7, -7, -7, 5, -7, -7};
+
+const short JsonGrammar::action_info [] = {
+  14, 18, 20, 17, 25, 16, 24, 0, 0, 15, 
+  0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 
+  0, 0, 0, 0, 0, 9, 8, 5, 0, 6, 
+  0, 0, 0, 4, 10, 7, 0, 
+
+  21, 19, 22, 0, 0, 0, 26, 0, 0, 0, 
+  0, 0};
+
+const short JsonGrammar::action_check [] = {
+  1, 7, 7, 1, 6, 4, 8, -1, -1, 8, 
+  -1, -1, 0, -1, -1, -1, -1, -1, -1, -1, 
+  -1, -1, -1, -1, -1, 1, 2, 3, -1, 5, 
+  -1, -1, -1, 9, 10, 11, -1, 
+
+  1, 1, 1, -1, -1, -1, 1, -1, -1, -1, 
+  -1, -1};
+
+
+#line 29 "json.g"
+
+/****************************************************************************
+**
+** Copyright (c) 2010 Girish Ramakrishnan <girish@forwardbias.in>
+** Copyright (c) 2011 Denis Dzyubenko <shadone@gmail.com>
+**
+** Use, modification and distribution is allowed without limitation,
+** warranty, liability or support of any kind.
+**
+****************************************************************************/
+
+#ifndef JSONPARSER_P_H
+#define JSONPARSER_P_H
+
+#include <QString>
+#include <QVariant>
+#include <QVector>
+
+class JsonLexer
+{
+public:
+    JsonLexer(const QString &string);
+    ~JsonLexer();
+
+    int lex();
+    QVariant symbol() const { return m_symbol; }
+    int lineNumber() const { return m_lineNumber; }
+    int pos() const { return m_pos; }
+
+private:
+    int parseNumber();
+    int parseString();
+    int parseKeyword();
+
+    QString m_strdata;
+    int m_lineNumber;
+    int m_pos;
+    QVariant m_symbol;
+};
+
+class JsonParser : protected JsonGrammar
+{
+public:
+    JsonParser();
+    ~JsonParser();
+
+    bool parse(JsonLexer *lex);
+    QVariant result() const { return m_result; }
+    QString errorMessage() const { return QString::fromLatin1("%1 at line %2 pos %3").arg(m_errorMessage).arg(m_errorLineNumber).arg(m_errorPos); }
+
+private:
+    void reallocateStack();
+
+    inline QVariant &sym(int index)
+    { return m_symStack[m_tos + index - 1]; }
+    inline QVariantMap &map(int index)
+    { return m_mapStack[m_tos + index - 1]; }
+    inline QVariantList &list(int index)
+    { return m_listStack[m_tos + index - 1]; }
+
+    int m_tos;
+    QVector<int> m_stateStack;
+    QVector<QVariant> m_symStack;
+    QVector<QVariantMap> m_mapStack;
+    QVector<QVariantList> m_listStack;
+    QString m_errorMessage;
+    int m_errorLineNumber;
+    int m_errorPos;
+    QVariant m_result;
+};
+
+#endif // JSONPARSER_P_H
+
+#line 103 "json.g"
+
+/****************************************************************************
+**
+** Copyright (c) 2010 Girish Ramakrishnan <girish@forwardbias.in>
+** Copyright (c) 2011 Denis Dzyubenko <shadone@gmail.com>
+**
+** Use, modification and distribution is allowed without limitation,
+** warranty, liability or support of any kind.
+**
+****************************************************************************/
+
+#include <QtDebug>
+
+#define L1C(c) ushort(uchar(c))
+
+JsonLexer::JsonLexer(const QString &str)
+    : m_strdata(str), m_lineNumber(1), m_pos(0)
+{
+}
+
+
+
+JsonLexer::~JsonLexer()
+{
+}
+
+int JsonLexer::parseString()
+{
+    bool esc = false;
+    ++m_pos; // skip initial "
+    int start = m_pos;
+
+    const ushort *uc = m_strdata.utf16();
+    const int remaining = m_strdata.length() - m_pos;
+    int i;
+    for (i = 0; i < remaining; ++i) {
+        const ushort c = uc[m_pos + i];
+        if (c == L1C('\"')) {
+            m_symbol = QString((QChar *)uc + m_pos, i);
+            m_pos += i;
+            ++m_pos; // eat quote
+            return JsonGrammar::T_STRING;
+        } else if (c == L1C('\\')) {
+            ++m_pos; // eat backslash
+            esc = true;
+            break;
+        }
+    }
+
+    QString str;
+    if (i) {
+        str.resize(i);
+        memcpy((char *)str.utf16(), uc + start, i * 2);
+        m_pos += i;
+    }
+
+    for (; m_pos < m_strdata.length(); ++m_pos) {
+        const ushort c = uc[m_pos];
+        if (esc) {
+            if (c == L1C('b')) str += QLatin1Char('\b');
+            else if (c == L1C('f')) str += QLatin1Char('\f');
+            else if (c == L1C('n')) str += QLatin1Char('\n');
+            else if (c == L1C('r')) str += QLatin1Char('\r');
+            else if (c == L1C('t')) str += QLatin1Char('\t');
+            else if (c == L1C('\\')) str += QLatin1Char('\\');
+            else if (c == L1C('\"')) str += QLatin1Char('\"');
+            else if (c == L1C('u') && m_pos+4<m_strdata.length()-1) {
+                QString u = m_strdata.mid(m_pos+1, 4);
+                str += QChar(u.toUShort(0, 16));
+                m_pos += 4;
+            } else {
+                str += QChar(c);
+            }
+            esc = false;
+        } else if (c == L1C('\\')) {
+            esc = true;
+        } else if (c == L1C('\"')) {
+            m_symbol = str;
+            ++m_pos;
+            return JsonGrammar::T_STRING;
+        } else {
+            str += QChar(c);
+        }
+    }
+    return JsonGrammar::ERROR;
+}
+
+int JsonLexer::parseNumber()
+{
+    int start = m_pos;
+    bool isDouble = false;
+    const ushort *uc = m_strdata.utf16();
+    const int l = m_strdata.length();
+    const int negative = (uc[m_pos] == L1C('-') ? ++m_pos, -1 : (uc[m_pos] == L1C('+') ? ++m_pos, 1 : 1));
+    qlonglong value = 0;
+    for (; m_pos < l; ++m_pos) {
+        const ushort &c = uc[m_pos];
+        if (c == L1C('+') || c == L1C('-'))
+            continue;
+        if (c == L1C('.') || c == L1C('e') || c == L1C('E')) {
+            isDouble = true;
+            continue;
+        }
+        if (c >= L1C('0') && c <= L1C('9')) {
+            if (!isDouble) {
+                value *= 10;
+                value += c - L1C('0');
+            }
+            continue;
+        }
+        break;
+    }
+    if (!isDouble) {
+        m_symbol = value * negative;
+    } else {
+        QString number = QString::fromRawData((QChar *)uc+start, m_pos-start);
+        m_symbol = number.toDouble();
+    }
+    return JsonGrammar::T_NUMBER;
+}
+
+int JsonLexer::parseKeyword()
+{
+    int start = m_pos;
+    for (; m_pos < m_strdata.length(); ++m_pos) {
+        const ushort c = m_strdata.at(m_pos).unicode();
+        if (c >= L1C('a') && c <= L1C('z'))
+            continue;
+        break;
+    }
+    const ushort *k = (const ushort *)m_strdata.constData() + start;
+    const int l = m_pos-start;
+    if (l == 4) {
+        static const ushort true_data[] = { 't', 'r', 'u', 'e' };
+        static const ushort null_data[] = { 'n', 'u', 'l', 'l' };
+        if (!memcmp(k, true_data, 4 * sizeof(ushort)))
+            return JsonGrammar::T_TRUE;
+        if (!memcmp(k, null_data, 4 * sizeof(ushort)))
+            return JsonGrammar::T_NULL;
+    } else if (l == 5) {
+        static const ushort false_data[] = { 'f', 'a', 'l', 's', 'e' };
+        if (!memcmp(k, false_data, 5 * sizeof(ushort)))
+            return JsonGrammar::T_FALSE;
+    }
+    return JsonGrammar::ERROR;
+}
+
+int JsonLexer::lex()
+{
+    m_symbol.clear();
+
+    const ushort *uc = m_strdata.utf16();
+    const int len = m_strdata.length();
+    while (m_pos < len) {
+        const ushort c = uc[m_pos];
+        switch (c) {
+        case L1C('['): ++m_pos; return JsonGrammar::T_LSQUAREBRACKET;
+        case L1C(']'): ++m_pos; return JsonGrammar::T_RSQUAREBRACKET;
+        case L1C('{'): ++m_pos; return JsonGrammar::T_LCURLYBRACKET;
+        case L1C('}'): ++m_pos; return JsonGrammar::T_RCURLYBRACKET;
+        case L1C(':'): ++m_pos; return JsonGrammar::T_COLON;
+        case L1C(','): ++m_pos; return JsonGrammar::T_COMMA;
+        case L1C(' '): case L1C('\r'): case L1C('\t'): ++m_pos; break;
+        case L1C('\n'): ++m_pos; ++m_lineNumber; break;
+        case L1C('"'): return parseString();
+        default:
+            if (c == L1C('+') || c == L1C('-') || (c >= L1C('0') && c <= L1C('9'))) {
+                return parseNumber();
+            }
+            if (c >= L1C('a') && c <= L1C('z')) {
+                return parseKeyword();
+            }
+            return JsonGrammar::ERROR;
+        }
+    }
+    return JsonGrammar::EOF_SYMBOL;
+}
+#undef L1C
+
+JsonParser::JsonParser()
+    : m_tos(0)
+    , m_errorLineNumber(-1)
+    , m_errorPos(-1)
+{
+}
+
+JsonParser::~JsonParser()
+{
+}
+
+void JsonParser::reallocateStack()
+{
+    int size = m_stateStack.size();
+    if (size == 0)
+        size = 128;
+    else
+        size <<= 1;
+
+    m_symStack.resize(size);
+    m_mapStack.resize(size);
+    m_listStack.resize(size);
+    m_stateStack.resize(size);
+}
+
+bool JsonParser::parse(JsonLexer *lexer)
+{
+    const int INITIAL_STATE = 0;
+    int yytoken = -1;
+    reallocateStack();
+    m_tos = 0;
+    m_stateStack[++m_tos] = INITIAL_STATE;
+
+    while (true) {
+        const int state = m_stateStack[m_tos];
+        if (yytoken == -1 && -TERMINAL_COUNT != action_index[state]) {
+            yytoken = lexer->lex();
+        }
+        int act = t_action(state, yytoken);
+        if (act == ACCEPT_STATE)
+            return true;
+        else if (act > 0) {
+            if (++m_tos == m_stateStack.size())
+                reallocateStack();
+            m_stateStack[m_tos] = act;
+            m_symStack[m_tos] = lexer->symbol();
+            yytoken = -1;
+        } else if (act < 0) {
+            int r = -act-1;
+            m_tos -= rhs[r];
+            act = m_stateStack.at(m_tos++);
+            switch (r) {
+
+#line 334 "json.g"
+          case 0: { m_result = sym(1); break; } 
+#line 337 "json.g"
+          case 1: { sym(1) = map(2); break; } 
+#line 340 "json.g"
+          case 2: { QVariantMap m; m.insert(sym(1).toString(), sym(3)); map(1) = m; break; } 
+#line 343 "json.g"
+          case 3: { map(1).insert(sym(3).toString(), sym(5)); break; } 
+#line 346 "json.g"
+          case 4: { map(1) = QVariantMap(); break; } 
+#line 349 "json.g"
+          case 5: { sym(1) = QVariant(false); break; } 
+#line 352 "json.g"
+          case 6: { sym(1) = QVariant(true); break; } 
+#line 361 "json.g"
+          case 12: { sym(1) = list(2); break; } 
+#line 364 "json.g"
+          case 13: { QVariantList l; l.append(sym(1)); list(1) = l; break; } 
+#line 367 "json.g"
+          case 14: { list(1).append(sym(3)); break; } 
+#line 370 "json.g"
+          case 15: { list(1) = QVariantList(); break; } 
+#line 372 "json.g"
+
+            } // switch
+            m_stateStack[m_tos] = nt_action(act, lhs[r] - TERMINAL_COUNT);
+        } else {
+            int ers = state;
+            int shifts = 0;
+            int reduces = 0;
+            int expected_tokens[3];
+            for (int tk = 0; tk < TERMINAL_COUNT; ++tk) {
+                int k = t_action(ers, tk);
+
+                if (! k)
+                  continue;
+                else if (k < 0)
+                  ++reduces;
+                else if (spell[tk]) {
+                    if (shifts < 3)
+                      expected_tokens[shifts] = tk;
+                    ++shifts;
+                }
+            }
+
+            m_errorLineNumber = lexer->lineNumber();
+            m_errorPos = lexer->pos();
+            m_errorMessage.clear();
+            if (shifts && shifts < 3) {
+                bool first = true;
+
+                for (int s = 0; s < shifts; ++s) {
+                    if (first)
+                      m_errorMessage += QLatin1String("Expected ");
+                    else
+                      m_errorMessage += QLatin1String(", ");
+
+                    first = false;
+                    m_errorMessage += QLatin1String("'");
+                    m_errorMessage += QLatin1String(spell[expected_tokens[s]]);
+                    m_errorMessage += QLatin1String("'");
+                }
+            }
+            return false;
+        }
+    }
+
+    return false;
+}
+
+
+#endif // JSONPARSER_CPP
+
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/qjsonparser.pri tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/qjsonparser.pri
--- tiled-qt-1.2.1+dfsg.1/src/plugins/json1/qjsonparser/qjsonparser.pri	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/json1/qjsonparser/qjsonparser.pri	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,5 @@
+INCLUDEPATH += $$PWD
+
+SOURCES += json.cpp
+HEADERS += json.h
+
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/plugins.pro tiled-qt-1.2.4+dfsg.1/src/plugins/plugins.pro
--- tiled-qt-1.2.1+dfsg.1/src/plugins/plugins.pro	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/plugins.pro	2019-05-15 15:33:52.000000000 +0000
@@ -5,6 +5,7 @@
           flare \
           gmx \
           json \
+          json1 \
           lua \
           replicaisland \
           tbin \
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/plugins.qbs tiled-qt-1.2.4+dfsg.1/src/plugins/plugins.qbs
--- tiled-qt-1.2.1+dfsg.1/src/plugins/plugins.qbs	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/plugins.qbs	2019-05-15 15:33:52.000000000 +0000
@@ -8,6 +8,7 @@
         "flare",
         "gmx",
         "json",
+        "json1",
         "lua",
         "python",
         "replicaisland",
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/python/plugin.json tiled-qt-1.2.4+dfsg.1/src/plugins/python/plugin.json
--- tiled-qt-1.2.1+dfsg.1/src/plugins/python/plugin.json	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/python/plugin.json	2019-05-15 15:33:52.000000000 +0000
@@ -1 +1 @@
-{ "defaultEnable": true }
+{ "defaultEnable": false }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/python/pythonbind.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/python/pythonbind.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/python/pythonbind.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/python/pythonbind.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -85,13 +85,14 @@
 
 
 #include "pythonplugin.h"
-#include "map.h"
+#include "grouplayer.h"
+#include "imagelayer.h"
 #include "layer.h"
-#include "tile.h"
+#include "map.h"
 #include "mapobject.h"
-#include "imagelayer.h"
-#include "tilelayer.h"
 #include "objectgroup.h"
+#include "tile.h"
+#include "tilelayer.h"
 #include "tileset.h"
 #include <QImage>
 #include <QFileDialog>
@@ -115,6 +116,16 @@
 
 typedef struct {
     PyObject_HEAD
+    QPoint *obj;
+    PyBindGenWrapperFlags flags:8;
+} PyQPoint;
+
+
+extern PyTypeObject PyQPoint_Type;
+
+
+typedef struct {
+    PyObject_HEAD
     QPointF *obj;
     PyBindGenWrapperFlags flags:8;
 } PyQPointF;
@@ -125,6 +136,16 @@
 
 typedef struct {
     PyObject_HEAD
+    QSize *obj;
+    PyBindGenWrapperFlags flags:8;
+} PyQSize;
+
+
+extern PyTypeObject PyQSize_Type;
+
+
+typedef struct {
+    PyObject_HEAD
     QSizeF *obj;
     PyBindGenWrapperFlags flags:8;
 } PyQSizeF;
@@ -333,12 +354,12 @@
 
 typedef struct {
     PyObject_HEAD
-    Tiled::MapObject *obj;
+    Tiled::GroupLayer *obj;
     PyBindGenWrapperFlags flags:8;
-} PyTiledMapObject;
+} PyTiledGroupLayer;
 
 
-extern PyTypeObject PyTiledMapObject_Type;
+extern PyTypeObject PyTiledGroupLayer_Type;
 
 
 typedef struct {
@@ -353,6 +374,16 @@
 
 typedef struct {
     PyObject_HEAD
+    Tiled::MapObject *obj;
+    PyBindGenWrapperFlags flags:8;
+} PyTiledMapObject;
+
+
+extern PyTypeObject PyTiledMapObject_Type;
+
+
+typedef struct {
+    PyObject_HEAD
     Tiled::LoggingInterface *obj;
     PyBindGenWrapperFlags flags:8;
 } PyTiledLoggingInterface;
@@ -376,24 +407,75 @@
 
 
 
+
+static int
+_wrap_PyQPoint__tp_init__0(PyQPoint *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    PyQPoint *ctor_arg;
+    const char *keywords[] = {"ctor_arg", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQPoint_Type, &ctor_arg)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QPoint(*((PyQPoint *) ctor_arg)->obj);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
 static int
-_wrap_PyQPointF__tp_init(PyQPointF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPoint__tp_init__1(PyQPoint *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    float x;
-    float y;
+    int x;
+    int y;
     const char *keywords[] = {"x", "y", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "ff", (char **) keywords, &x, &y)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "ii", (char **) keywords, &x, &y)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
         return -1;
     }
-    self->obj = new QPointF(x, y);
+    self->obj = new QPoint(x, y);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
+int _wrap_PyQPoint__tp_init(PyQPoint *self, PyObject *args, PyObject *kwargs)
+{
+    int retval;
+    PyObject *error_list;
+    PyObject *exceptions[2] = {0,};
+    retval = _wrap_PyQPoint__tp_init__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyQPoint__tp_init__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    error_list = PyList_New(2);
+    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
+    Py_DECREF(exceptions[0]);
+    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
+    Py_DECREF(exceptions[1]);
+    PyErr_SetObject(PyExc_TypeError, error_list);
+    Py_DECREF(error_list);
+    return -1;
+}
+
 
 PyObject *
-_wrap_PyQPointF_setX(PyQPointF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPoint_setX(PyQPoint *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
     int x;
@@ -410,7 +492,7 @@
 
 
 PyObject *
-_wrap_PyQPointF_setY(PyQPointF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPoint_setY(PyQPoint *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
     int y;
@@ -427,7 +509,7 @@
 
 
 PyObject *
-_wrap_PyQPointF_x(PyQPointF *self)
+_wrap_PyQPoint_x(PyQPoint *self)
 {
     PyObject *py_retval;
     int retval;
@@ -439,7 +521,7 @@
 
 
 PyObject *
-_wrap_PyQPointF_y(PyQPointF *self)
+_wrap_PyQPoint_y(PyQPoint *self)
 {
     PyObject *py_retval;
     int retval;
@@ -449,18 +531,31 @@
     return py_retval;
 }
 
-static PyMethodDef PyQPointF_methods[] = {
-    {(char *) "setX", (PyCFunction) _wrap_PyQPointF_setX, METH_KEYWORDS|METH_VARARGS, "setX(x)\n\ntype: x: int" },
-    {(char *) "setY", (PyCFunction) _wrap_PyQPointF_setY, METH_KEYWORDS|METH_VARARGS, "setY(y)\n\ntype: y: int" },
-    {(char *) "x", (PyCFunction) _wrap_PyQPointF_x, METH_NOARGS, "x()\n\n" },
-    {(char *) "y", (PyCFunction) _wrap_PyQPointF_y, METH_NOARGS, "y()\n\n" },
+
+static PyObject*
+_wrap_PyQPoint__copy__(PyQPoint *self)
+{
+
+    PyQPoint *py_copy;
+    py_copy = PyObject_New(PyQPoint, &PyQPoint_Type);
+    py_copy->obj = new QPoint(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyQPoint_methods[] = {
+    {(char *) "setX", (PyCFunction) _wrap_PyQPoint_setX, METH_KEYWORDS|METH_VARARGS, "setX(x)\n\ntype: x: int" },
+    {(char *) "setY", (PyCFunction) _wrap_PyQPoint_setY, METH_KEYWORDS|METH_VARARGS, "setY(y)\n\ntype: y: int" },
+    {(char *) "x", (PyCFunction) _wrap_PyQPoint_x, METH_NOARGS, "x()\n\n" },
+    {(char *) "y", (PyCFunction) _wrap_PyQPoint_y, METH_NOARGS, "y()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQPoint__copy__, METH_NOARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
 static void
-_wrap_PyQPointF__tp_dealloc(PyQPointF *self)
+_wrap_PyQPoint__tp_dealloc(PyQPoint *self)
 {
-        QPointF *tmp = self->obj;
+        QPoint *tmp = self->obj;
         self->obj = NULL;
         if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
             delete tmp;
@@ -469,10 +564,10 @@
 }
 
 static PyObject*
-_wrap_PyQPointF__tp_richcompare (PyQPointF *PYBINDGEN_UNUSED(self), PyQPointF *other, int opid)
+_wrap_PyQPoint__tp_richcompare (PyQPoint *PYBINDGEN_UNUSED(self), PyQPoint *other, int opid)
 {
 
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQPointF_Type)) {
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQPoint_Type)) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
@@ -501,13 +596,13 @@
     return Py_NotImplemented;
 }
 
-PyTypeObject PyQPointF_Type = {
+PyTypeObject PyQPoint_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.qt.QPointF",            /* tp_name */
-    sizeof(PyQPointF),                  /* tp_basicsize */
+    (char *) "tiled.qt.QPoint",            /* tp_name */
+    sizeof(PyQPoint),                  /* tp_basicsize */
     0,                                 /* tp_itemsize */
     /* methods */
-    (destructor)_wrap_PyQPointF__tp_dealloc,        /* tp_dealloc */
+    (destructor)_wrap_PyQPoint__tp_dealloc,        /* tp_dealloc */
     (printfunc)0,                      /* tp_print */
     (getattrfunc)NULL,       /* tp_getattr */
     (setattrfunc)NULL,       /* tp_setattr */
@@ -527,14 +622,14 @@
     (setattrofunc)NULL,     /* tp_setattro */
     (PyBufferProcs*)NULL,  /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "QPointF(x, y)",                        /* Documentation string */
+    "QPoint(ctor_arg)\nQPoint(x, y)",                        /* Documentation string */
     (traverseproc)NULL,     /* tp_traverse */
     (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyQPointF__tp_richcompare,   /* tp_richcompare */
+    (richcmpfunc)_wrap_PyQPoint__tp_richcompare,   /* tp_richcompare */
     0,             /* tp_weaklistoffset */
     (getiterfunc)NULL,          /* tp_iter */
     (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyQPointF_methods, /* tp_methods */
+    (struct PyMethodDef*)PyQPoint_methods, /* tp_methods */
     (struct PyMemberDef*)0,              /* tp_members */
     0,                     /* tp_getset */
     NULL,                              /* tp_base */
@@ -542,7 +637,7 @@
     (descrgetfunc)NULL,    /* tp_descr_get */
     (descrsetfunc)NULL,    /* tp_descr_set */
     0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyQPointF__tp_init,             /* tp_init */
+    (initproc)_wrap_PyQPoint__tp_init,             /* tp_init */
     (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
     (newfunc)PyType_GenericNew,               /* tp_new */
     (freefunc)0,             /* tp_free */
@@ -558,45 +653,84 @@
 
 
 
+
 static int
-_wrap_PyQSizeF__tp_init(PyQSizeF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPointF__tp_init__0(PyQPointF *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    float w;
-    float h;
-    const char *keywords[] = {"w", "h", NULL};
+    PyQPointF *ctor_arg;
+    const char *keywords[] = {"ctor_arg", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "ff", (char **) keywords, &w, &h)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQPointF_Type, &ctor_arg)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
         return -1;
     }
-    self->obj = new QSizeF(w, h);
+    self->obj = new QPointF(*((PyQPointF *) ctor_arg)->obj);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
+static int
+_wrap_PyQPointF__tp_init__1(PyQPointF *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    double x;
+    double y;
+    const char *keywords[] = {"x", "y", NULL};
 
-PyObject *
-_wrap_PyQSizeF_height(PyQSizeF *self)
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "dd", (char **) keywords, &x, &y)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QPointF(x, y);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+int _wrap_PyQPointF__tp_init(PyQPointF *self, PyObject *args, PyObject *kwargs)
 {
-    PyObject *py_retval;
     int retval;
-
-    retval = self->obj->height();
-    py_retval = Py_BuildValue((char *) "i", retval);
-    return py_retval;
+    PyObject *error_list;
+    PyObject *exceptions[2] = {0,};
+    retval = _wrap_PyQPointF__tp_init__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyQPointF__tp_init__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    error_list = PyList_New(2);
+    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
+    Py_DECREF(exceptions[0]);
+    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
+    Py_DECREF(exceptions[1]);
+    PyErr_SetObject(PyExc_TypeError, error_list);
+    Py_DECREF(error_list);
+    return -1;
 }
 
 
 PyObject *
-_wrap_PyQSizeF_setHeight(PyQSizeF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPointF_setX(PyQPointF *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int h;
-    const char *keywords[] = {"h", NULL};
+    double x;
+    const char *keywords[] = {"x", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &h)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &x)) {
         return NULL;
     }
-    self->obj->setHeight(h);
+    self->obj->setX(x);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -604,16 +738,16 @@
 
 
 PyObject *
-_wrap_PyQSizeF_setWidth(PyQSizeF *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQPointF_setY(PyQPointF *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int w;
-    const char *keywords[] = {"w", NULL};
+    double y;
+    const char *keywords[] = {"y", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &w)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &y)) {
         return NULL;
     }
-    self->obj->setWidth(w);
+    self->obj->setY(y);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -621,28 +755,53 @@
 
 
 PyObject *
-_wrap_PyQSizeF_width(PyQSizeF *self)
+_wrap_PyQPointF_x(PyQPointF *self)
 {
     PyObject *py_retval;
-    int retval;
+    double retval;
 
-    retval = self->obj->width();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    retval = self->obj->x();
+    py_retval = Py_BuildValue((char *) "d", retval);
     return py_retval;
 }
 
-static PyMethodDef PyQSizeF_methods[] = {
-    {(char *) "height", (PyCFunction) _wrap_PyQSizeF_height, METH_NOARGS, "height()\n\n" },
-    {(char *) "setHeight", (PyCFunction) _wrap_PyQSizeF_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: int" },
-    {(char *) "setWidth", (PyCFunction) _wrap_PyQSizeF_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: int" },
-    {(char *) "width", (PyCFunction) _wrap_PyQSizeF_width, METH_NOARGS, "width()\n\n" },
+
+PyObject *
+_wrap_PyQPointF_y(PyQPointF *self)
+{
+    PyObject *py_retval;
+    double retval;
+
+    retval = self->obj->y();
+    py_retval = Py_BuildValue((char *) "d", retval);
+    return py_retval;
+}
+
+
+static PyObject*
+_wrap_PyQPointF__copy__(PyQPointF *self)
+{
+
+    PyQPointF *py_copy;
+    py_copy = PyObject_New(PyQPointF, &PyQPointF_Type);
+    py_copy->obj = new QPointF(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyQPointF_methods[] = {
+    {(char *) "setX", (PyCFunction) _wrap_PyQPointF_setX, METH_KEYWORDS|METH_VARARGS, "setX(x)\n\ntype: x: double" },
+    {(char *) "setY", (PyCFunction) _wrap_PyQPointF_setY, METH_KEYWORDS|METH_VARARGS, "setY(y)\n\ntype: y: double" },
+    {(char *) "x", (PyCFunction) _wrap_PyQPointF_x, METH_NOARGS, "x()\n\n" },
+    {(char *) "y", (PyCFunction) _wrap_PyQPointF_y, METH_NOARGS, "y()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQPointF__copy__, METH_NOARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
 static void
-_wrap_PyQSizeF__tp_dealloc(PyQSizeF *self)
+_wrap_PyQPointF__tp_dealloc(PyQPointF *self)
 {
-        QSizeF *tmp = self->obj;
+        QPointF *tmp = self->obj;
         self->obj = NULL;
         if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
             delete tmp;
@@ -651,10 +810,10 @@
 }
 
 static PyObject*
-_wrap_PyQSizeF__tp_richcompare (PyQSizeF *PYBINDGEN_UNUSED(self), PyQSizeF *other, int opid)
+_wrap_PyQPointF__tp_richcompare (PyQPointF *PYBINDGEN_UNUSED(self), PyQPointF *other, int opid)
 {
 
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQSizeF_Type)) {
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQPointF_Type)) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
@@ -683,13 +842,13 @@
     return Py_NotImplemented;
 }
 
-PyTypeObject PyQSizeF_Type = {
+PyTypeObject PyQPointF_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.qt.QSizeF",            /* tp_name */
-    sizeof(PyQSizeF),                  /* tp_basicsize */
+    (char *) "tiled.qt.QPointF",            /* tp_name */
+    sizeof(PyQPointF),                  /* tp_basicsize */
     0,                                 /* tp_itemsize */
     /* methods */
-    (destructor)_wrap_PyQSizeF__tp_dealloc,        /* tp_dealloc */
+    (destructor)_wrap_PyQPointF__tp_dealloc,        /* tp_dealloc */
     (printfunc)0,                      /* tp_print */
     (getattrfunc)NULL,       /* tp_getattr */
     (setattrfunc)NULL,       /* tp_setattr */
@@ -709,14 +868,14 @@
     (setattrofunc)NULL,     /* tp_setattro */
     (PyBufferProcs*)NULL,  /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "QSizeF(w, h)",                        /* Documentation string */
+    "QPointF(ctor_arg)\nQPointF(x, y)",                        /* Documentation string */
     (traverseproc)NULL,     /* tp_traverse */
     (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyQSizeF__tp_richcompare,   /* tp_richcompare */
+    (richcmpfunc)_wrap_PyQPointF__tp_richcompare,   /* tp_richcompare */
     0,             /* tp_weaklistoffset */
     (getiterfunc)NULL,          /* tp_iter */
     (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyQSizeF_methods, /* tp_methods */
+    (struct PyMethodDef*)PyQPointF_methods, /* tp_methods */
     (struct PyMemberDef*)0,              /* tp_members */
     0,                     /* tp_getset */
     NULL,                              /* tp_base */
@@ -724,7 +883,7 @@
     (descrgetfunc)NULL,    /* tp_descr_get */
     (descrsetfunc)NULL,    /* tp_descr_set */
     0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyQSizeF__tp_init,             /* tp_init */
+    (initproc)_wrap_PyQPointF__tp_init,             /* tp_init */
     (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
     (newfunc)PyType_GenericNew,               /* tp_new */
     (freefunc)0,             /* tp_free */
@@ -740,41 +899,155 @@
 
 
 
+
 static int
-_wrap_PyQRgb__tp_init(PyQRgb *self, PyObject *args, PyObject *kwargs)
+_wrap_PyQSize__tp_init__0(PyQSize *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    PyQRgb *ctor_arg;
+    PyQSize *ctor_arg;
     const char *keywords[] = {"ctor_arg", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQRgb_Type, &ctor_arg)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQSize_Type, &ctor_arg)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
         return -1;
     }
-    self->obj = new QRgb(*((PyQRgb *) ctor_arg)->obj);
+    self->obj = new QSize(*((PyQSize *) ctor_arg)->obj);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
-
-static PyObject*
-_wrap_PyQRgb__copy__(PyQRgb *self)
+static int
+_wrap_PyQSize__tp_init__1(PyQSize *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
+    int w;
+    int h;
+    const char *keywords[] = {"w", "h", NULL};
 
-    PyQRgb *py_copy;
-    py_copy = PyObject_New(PyQRgb, &PyQRgb_Type);
-    py_copy->obj = new QRgb(*self->obj);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "ii", (char **) keywords, &w, &h)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QSize(w, h);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+int _wrap_PyQSize__tp_init(PyQSize *self, PyObject *args, PyObject *kwargs)
+{
+    int retval;
+    PyObject *error_list;
+    PyObject *exceptions[2] = {0,};
+    retval = _wrap_PyQSize__tp_init__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyQSize__tp_init__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    error_list = PyList_New(2);
+    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
+    Py_DECREF(exceptions[0]);
+    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
+    Py_DECREF(exceptions[1]);
+    PyErr_SetObject(PyExc_TypeError, error_list);
+    Py_DECREF(error_list);
+    return -1;
+}
+
+
+PyObject *
+_wrap_PyQSize_height(PyQSize *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->height();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyQSize_setHeight(PyQSize *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    int h;
+    const char *keywords[] = {"h", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &h)) {
+        return NULL;
+    }
+    self->obj->setHeight(h);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyQSize_setWidth(PyQSize *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    int w;
+    const char *keywords[] = {"w", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &w)) {
+        return NULL;
+    }
+    self->obj->setWidth(w);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyQSize_width(PyQSize *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->width();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+static PyObject*
+_wrap_PyQSize__copy__(PyQSize *self)
+{
+
+    PyQSize *py_copy;
+    py_copy = PyObject_New(PyQSize, &PyQSize_Type);
+    py_copy->obj = new QSize(*self->obj);
     py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return (PyObject*) py_copy;
 }
 
-static PyMethodDef PyQRgb_methods[] = {
-    {(char *) "__copy__", (PyCFunction) _wrap_PyQRgb__copy__, METH_NOARGS, NULL},
+static PyMethodDef PyQSize_methods[] = {
+    {(char *) "height", (PyCFunction) _wrap_PyQSize_height, METH_NOARGS, "height()\n\n" },
+    {(char *) "setHeight", (PyCFunction) _wrap_PyQSize_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: int" },
+    {(char *) "setWidth", (PyCFunction) _wrap_PyQSize_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: int" },
+    {(char *) "width", (PyCFunction) _wrap_PyQSize_width, METH_NOARGS, "width()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQSize__copy__, METH_NOARGS, NULL},
     {NULL, NULL, 0, NULL}
 };
 
 static void
-_wrap_PyQRgb__tp_dealloc(PyQRgb *self)
+_wrap_PyQSize__tp_dealloc(PyQSize *self)
 {
-        QRgb *tmp = self->obj;
+        QSize *tmp = self->obj;
         self->obj = NULL;
         if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
             delete tmp;
@@ -783,10 +1056,10 @@
 }
 
 static PyObject*
-_wrap_PyQRgb__tp_richcompare (PyQRgb *PYBINDGEN_UNUSED(self), PyQRgb *other, int opid)
+_wrap_PyQSize__tp_richcompare (PyQSize *PYBINDGEN_UNUSED(self), PyQSize *other, int opid)
 {
 
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQRgb_Type)) {
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQSize_Type)) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
@@ -815,13 +1088,13 @@
     return Py_NotImplemented;
 }
 
-PyTypeObject PyQRgb_Type = {
+PyTypeObject PyQSize_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.qt.QRgb",            /* tp_name */
-    sizeof(PyQRgb),                  /* tp_basicsize */
+    (char *) "tiled.qt.QSize",            /* tp_name */
+    sizeof(PyQSize),                  /* tp_basicsize */
     0,                                 /* tp_itemsize */
     /* methods */
-    (destructor)_wrap_PyQRgb__tp_dealloc,        /* tp_dealloc */
+    (destructor)_wrap_PyQSize__tp_dealloc,        /* tp_dealloc */
     (printfunc)0,                      /* tp_print */
     (getattrfunc)NULL,       /* tp_getattr */
     (setattrfunc)NULL,       /* tp_setattr */
@@ -841,14 +1114,14 @@
     (setattrofunc)NULL,     /* tp_setattro */
     (PyBufferProcs*)NULL,  /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "QRgb(ctor_arg)",                        /* Documentation string */
+    "QSize(ctor_arg)\nQSize(w, h)",                        /* Documentation string */
     (traverseproc)NULL,     /* tp_traverse */
     (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyQRgb__tp_richcompare,   /* tp_richcompare */
+    (richcmpfunc)_wrap_PyQSize__tp_richcompare,   /* tp_richcompare */
     0,             /* tp_weaklistoffset */
     (getiterfunc)NULL,          /* tp_iter */
     (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyQRgb_methods, /* tp_methods */
+    (struct PyMethodDef*)PyQSize_methods, /* tp_methods */
     (struct PyMemberDef*)0,              /* tp_members */
     0,                     /* tp_getset */
     NULL,                              /* tp_base */
@@ -856,7 +1129,7 @@
     (descrgetfunc)NULL,    /* tp_descr_get */
     (descrsetfunc)NULL,    /* tp_descr_set */
     0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyQRgb__tp_init,             /* tp_init */
+    (initproc)_wrap_PyQSize__tp_init,             /* tp_init */
     (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
     (newfunc)PyType_GenericNew,               /* tp_new */
     (freefunc)0,             /* tp_free */
@@ -874,57 +1147,12 @@
 
 
 static int
-_wrap_PyQColor__tp_init__0(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
-{
-    PyQRgb *col;
-    const char *keywords[] = {"col", NULL};
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQRgb_Type, &col)) {
-        {
-            PyObject *exc_type, *traceback;
-            PyErr_Fetch(&exc_type, return_exception, &traceback);
-            Py_XDECREF(exc_type);
-            Py_XDECREF(traceback);
-        }
-        return -1;
-    }
-    self->obj = new QColor(*((PyQRgb *) col)->obj);
-    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return 0;
-}
-
-static int
-_wrap_PyQColor__tp_init__1(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
-{
-    int r;
-    int g;
-    int b;
-    const char *keywords[] = {"r", "g", "b", NULL};
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iii", (char **) keywords, &r, &g, &b)) {
-        {
-            PyObject *exc_type, *traceback;
-            PyErr_Fetch(&exc_type, return_exception, &traceback);
-            Py_XDECREF(exc_type);
-            Py_XDECREF(traceback);
-        }
-        return -1;
-    }
-    self->obj = new QColor(r, g, b);
-    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return 0;
-}
-
-static int
-_wrap_PyQColor__tp_init__2(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyQSizeF__tp_init__0(PyQSizeF *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    int r;
-    int g;
-    int b;
-    int a;
-    const char *keywords[] = {"r", "g", "b", "a", NULL};
+    PyQSizeF *ctor_arg;
+    const char *keywords[] = {"ctor_arg", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iiii", (char **) keywords, &r, &g, &b, &a)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQSizeF_Type, &ctor_arg)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -933,18 +1161,19 @@
         }
         return -1;
     }
-    self->obj = new QColor(r, g, b, a);
+    self->obj = new QSizeF(*((PyQSizeF *) ctor_arg)->obj);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
 static int
-_wrap_PyQColor__tp_init__3(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyQSizeF__tp_init__1(PyQSizeF *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    PyQColor *ctor_arg;
-    const char *keywords[] = {"ctor_arg", NULL};
+    double w;
+    double h;
+    const char *keywords[] = {"w", "h", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQColor_Type, &ctor_arg)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "dd", (char **) keywords, &w, &h)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -953,47 +1182,30 @@
         }
         return -1;
     }
-    self->obj = new QColor(*((PyQColor *) ctor_arg)->obj);
+    self->obj = new QSizeF(w, h);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
-int _wrap_PyQColor__tp_init(PyQColor *self, PyObject *args, PyObject *kwargs)
+int _wrap_PyQSizeF__tp_init(PyQSizeF *self, PyObject *args, PyObject *kwargs)
 {
     int retval;
     PyObject *error_list;
-    PyObject *exceptions[4] = {0,};
-    retval = _wrap_PyQColor__tp_init__0(self, args, kwargs, &exceptions[0]);
+    PyObject *exceptions[2] = {0,};
+    retval = _wrap_PyQSizeF__tp_init__0(self, args, kwargs, &exceptions[0]);
     if (!exceptions[0]) {
         return retval;
     }
-    retval = _wrap_PyQColor__tp_init__1(self, args, kwargs, &exceptions[1]);
+    retval = _wrap_PyQSizeF__tp_init__1(self, args, kwargs, &exceptions[1]);
     if (!exceptions[1]) {
         Py_DECREF(exceptions[0]);
         return retval;
     }
-    retval = _wrap_PyQColor__tp_init__2(self, args, kwargs, &exceptions[2]);
-    if (!exceptions[2]) {
-        Py_DECREF(exceptions[0]);
-        Py_DECREF(exceptions[1]);
-        return retval;
-    }
-    retval = _wrap_PyQColor__tp_init__3(self, args, kwargs, &exceptions[3]);
-    if (!exceptions[3]) {
-        Py_DECREF(exceptions[0]);
-        Py_DECREF(exceptions[1]);
-        Py_DECREF(exceptions[2]);
-        return retval;
-    }
-    error_list = PyList_New(4);
+    error_list = PyList_New(2);
     PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
     Py_DECREF(exceptions[0]);
     PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
     Py_DECREF(exceptions[1]);
-    PyList_SET_ITEM(error_list, 2, PyObject_Str(exceptions[2]));
-    Py_DECREF(exceptions[2]);
-    PyList_SET_ITEM(error_list, 3, PyObject_Str(exceptions[3]));
-    Py_DECREF(exceptions[3]);
     PyErr_SetObject(PyExc_TypeError, error_list);
     Py_DECREF(error_list);
     return -1;
@@ -1001,69 +1213,99 @@
 
 
 PyObject *
-_wrap_PyQColor_rgb(PyQColor *self)
+_wrap_PyQSizeF_height(PyQSizeF *self)
 {
     PyObject *py_retval;
-    PyQRgb *py_QRgb;
+    double retval;
 
-    QRgb retval = self->obj->rgb();
-    py_QRgb = PyObject_New(PyQRgb, &PyQRgb_Type);
-    py_QRgb->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    py_QRgb->obj = new QRgb(retval);
-    py_retval = Py_BuildValue((char *) "N", py_QRgb);
+    retval = self->obj->height();
+    py_retval = Py_BuildValue((char *) "d", retval);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyQColor_rgba(PyQColor *self)
+_wrap_PyQSizeF_setHeight(PyQSizeF *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    PyQRgb *py_QRgb;
+    double h;
+    const char *keywords[] = {"h", NULL};
 
-    QRgb retval = self->obj->rgba();
-    py_QRgb = PyObject_New(PyQRgb, &PyQRgb_Type);
-    py_QRgb->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    py_QRgb->obj = new QRgb(retval);
-    py_retval = Py_BuildValue((char *) "N", py_QRgb);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &h)) {
+        return NULL;
+    }
+    self->obj->setHeight(h);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
-static PyObject*
-_wrap_PyQColor__copy__(PyQColor *self)
+PyObject *
+_wrap_PyQSizeF_setWidth(PyQSizeF *self, PyObject *args, PyObject *kwargs)
 {
+    PyObject *py_retval;
+    double w;
+    const char *keywords[] = {"w", NULL};
 
-    PyQColor *py_copy;
-    py_copy = PyObject_New(PyQColor, &PyQColor_Type);
-    py_copy->obj = new QColor(*self->obj);
-    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return (PyObject*) py_copy;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &w)) {
+        return NULL;
+    }
+    self->obj->setWidth(w);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
 }
 
-static PyMethodDef PyQColor_methods[] = {
-    {(char *) "rgb", (PyCFunction) _wrap_PyQColor_rgb, METH_NOARGS, "rgb()\n\n" },
-    {(char *) "rgba", (PyCFunction) _wrap_PyQColor_rgba, METH_NOARGS, "rgba()\n\n" },
-    {(char *) "__copy__", (PyCFunction) _wrap_PyQColor__copy__, METH_NOARGS, NULL},
-    {NULL, NULL, 0, NULL}
-};
 
-static void
-_wrap_PyQColor__tp_dealloc(PyQColor *self)
+PyObject *
+_wrap_PyQSizeF_width(PyQSizeF *self)
 {
-        QColor *tmp = self->obj;
-        self->obj = NULL;
-        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
-            delete tmp;
-        }
-    Py_TYPE(self)->tp_free((PyObject*)self);
-}
+    PyObject *py_retval;
+    double retval;
+
+    retval = self->obj->width();
+    py_retval = Py_BuildValue((char *) "d", retval);
+    return py_retval;
+}
+
 
 static PyObject*
-_wrap_PyQColor__tp_richcompare (PyQColor *PYBINDGEN_UNUSED(self), PyQColor *other, int opid)
+_wrap_PyQSizeF__copy__(PyQSizeF *self)
 {
 
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQColor_Type)) {
+    PyQSizeF *py_copy;
+    py_copy = PyObject_New(PyQSizeF, &PyQSizeF_Type);
+    py_copy->obj = new QSizeF(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyQSizeF_methods[] = {
+    {(char *) "height", (PyCFunction) _wrap_PyQSizeF_height, METH_NOARGS, "height()\n\n" },
+    {(char *) "setHeight", (PyCFunction) _wrap_PyQSizeF_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: double" },
+    {(char *) "setWidth", (PyCFunction) _wrap_PyQSizeF_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: double" },
+    {(char *) "width", (PyCFunction) _wrap_PyQSizeF_width, METH_NOARGS, "width()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQSizeF__copy__, METH_NOARGS, NULL},
+    {NULL, NULL, 0, NULL}
+};
+
+static void
+_wrap_PyQSizeF__tp_dealloc(PyQSizeF *self)
+{
+        QSizeF *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject*
+_wrap_PyQSizeF__tp_richcompare (PyQSizeF *PYBINDGEN_UNUSED(self), PyQSizeF *other, int opid)
+{
+
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQSizeF_Type)) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
@@ -1092,13 +1334,13 @@
     return Py_NotImplemented;
 }
 
-PyTypeObject PyQColor_Type = {
+PyTypeObject PyQSizeF_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.qt.QColor",            /* tp_name */
-    sizeof(PyQColor),                  /* tp_basicsize */
+    (char *) "tiled.qt.QSizeF",            /* tp_name */
+    sizeof(PyQSizeF),                  /* tp_basicsize */
     0,                                 /* tp_itemsize */
     /* methods */
-    (destructor)_wrap_PyQColor__tp_dealloc,        /* tp_dealloc */
+    (destructor)_wrap_PyQSizeF__tp_dealloc,        /* tp_dealloc */
     (printfunc)0,                      /* tp_print */
     (getattrfunc)NULL,       /* tp_getattr */
     (setattrfunc)NULL,       /* tp_setattr */
@@ -1118,14 +1360,14 @@
     (setattrofunc)NULL,     /* tp_setattro */
     (PyBufferProcs*)NULL,  /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "QColor(r, g, b, a)\nQColor(ctor_arg)\nQColor(r, g, b)\nQColor(col)",                        /* Documentation string */
+    "QSizeF(ctor_arg)\nQSizeF(w, h)",                        /* Documentation string */
     (traverseproc)NULL,     /* tp_traverse */
     (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyQColor__tp_richcompare,   /* tp_richcompare */
+    (richcmpfunc)_wrap_PyQSizeF__tp_richcompare,   /* tp_richcompare */
     0,             /* tp_weaklistoffset */
     (getiterfunc)NULL,          /* tp_iter */
     (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyQColor_methods, /* tp_methods */
+    (struct PyMethodDef*)PyQSizeF_methods, /* tp_methods */
     (struct PyMemberDef*)0,              /* tp_members */
     0,                     /* tp_getset */
     NULL,                              /* tp_base */
@@ -1133,7 +1375,139 @@
     (descrgetfunc)NULL,    /* tp_descr_get */
     (descrsetfunc)NULL,    /* tp_descr_set */
     0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyQColor__tp_init,             /* tp_init */
+    (initproc)_wrap_PyQSizeF__tp_init,             /* tp_init */
+    (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
+    (newfunc)PyType_GenericNew,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)NULL,             /* tp_is_gc */
+    NULL,                              /* tp_bases */
+    NULL,                              /* tp_mro */
+    NULL,                              /* tp_cache */
+    NULL,                              /* tp_subclasses */
+    NULL,                              /* tp_weaklist */
+    (destructor) NULL                  /* tp_del */
+};
+
+
+
+
+static int
+_wrap_PyQRgb__tp_init(PyQRgb *self, PyObject *args, PyObject *kwargs)
+{
+    PyQRgb *ctor_arg;
+    const char *keywords[] = {"ctor_arg", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQRgb_Type, &ctor_arg)) {
+        return -1;
+    }
+    self->obj = new QRgb(*((PyQRgb *) ctor_arg)->obj);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+
+static PyObject*
+_wrap_PyQRgb__copy__(PyQRgb *self)
+{
+
+    PyQRgb *py_copy;
+    py_copy = PyObject_New(PyQRgb, &PyQRgb_Type);
+    py_copy->obj = new QRgb(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyQRgb_methods[] = {
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQRgb__copy__, METH_NOARGS, NULL},
+    {NULL, NULL, 0, NULL}
+};
+
+static void
+_wrap_PyQRgb__tp_dealloc(PyQRgb *self)
+{
+        QRgb *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject*
+_wrap_PyQRgb__tp_richcompare (PyQRgb *PYBINDGEN_UNUSED(self), PyQRgb *other, int opid)
+{
+
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQRgb_Type)) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+    switch (opid)
+    {
+    case Py_LT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_LE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_EQ:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_NE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    } /* closes switch (opid) */
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+}
+
+PyTypeObject PyQRgb_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    (char *) "tiled.qt.QRgb",            /* tp_name */
+    sizeof(PyQRgb),                  /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)_wrap_PyQRgb__tp_dealloc,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)NULL,       /* tp_getattr */
+    (setattrfunc)NULL,       /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
+    NULL,
+#else
+    (cmpfunc)NULL,           /* tp_compare */
+#endif
+    (reprfunc)NULL,             /* tp_repr */
+    (PyNumberMethods*)NULL,     /* tp_as_number */
+    (PySequenceMethods*)NULL, /* tp_as_sequence */
+    (PyMappingMethods*)NULL,   /* tp_as_mapping */
+    (hashfunc)NULL,             /* tp_hash */
+    (ternaryfunc)NULL,          /* tp_call */
+    (reprfunc)NULL,              /* tp_str */
+    (getattrofunc)NULL,     /* tp_getattro */
+    (setattrofunc)NULL,     /* tp_setattro */
+    (PyBufferProcs*)NULL,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,                      /* tp_flags */
+    "QRgb(ctor_arg)",                        /* Documentation string */
+    (traverseproc)NULL,     /* tp_traverse */
+    (inquiry)NULL,             /* tp_clear */
+    (richcmpfunc)_wrap_PyQRgb__tp_richcompare,   /* tp_richcompare */
+    0,             /* tp_weaklistoffset */
+    (getiterfunc)NULL,          /* tp_iter */
+    (iternextfunc)NULL,     /* tp_iternext */
+    (struct PyMethodDef*)PyQRgb_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    0,                     /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)NULL,    /* tp_descr_get */
+    (descrsetfunc)NULL,    /* tp_descr_set */
+    0,                 /* tp_dictoffset */
+    (initproc)_wrap_PyQRgb__tp_init,             /* tp_init */
     (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
     (newfunc)PyType_GenericNew,               /* tp_new */
     (freefunc)0,             /* tp_free */
@@ -1151,11 +1525,12 @@
 
 
 static int
-_wrap_PyQImage__tp_init__0(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyQColor__tp_init__0(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    const char *keywords[] = {NULL};
+    PyQRgb *col;
+    const char *keywords[] = {"col", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "", (char **) keywords)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQRgb_Type, &col)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -1164,20 +1539,20 @@
         }
         return -1;
     }
-    self->obj = new QImage();
+    self->obj = new QColor(*((PyQRgb *) col)->obj);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
 static int
-_wrap_PyQImage__tp_init__1(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyQColor__tp_init__1(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    int w;
-    int h;
-    QImage::Format f;
-    const char *keywords[] = {"w", "h", "f", NULL};
+    int r;
+    int g;
+    int b;
+    const char *keywords[] = {"r", "g", "b", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iii", (char **) keywords, &w, &h, &f)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iii", (char **) keywords, &r, &g, &b)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -1186,18 +1561,41 @@
         }
         return -1;
     }
-    self->obj = new QImage(w, h, f);
+    self->obj = new QColor(r, g, b);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
 static int
-_wrap_PyQImage__tp_init__2(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyQColor__tp_init__2(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    PyQImage *ctor_arg;
+    int r;
+    int g;
+    int b;
+    int a;
+    const char *keywords[] = {"r", "g", "b", "a", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iiii", (char **) keywords, &r, &g, &b, &a)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QColor(r, g, b, a);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+static int
+_wrap_PyQColor__tp_init__3(PyQColor *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    PyQColor *ctor_arg;
     const char *keywords[] = {"ctor_arg", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQImage_Type, &ctor_arg)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQColor_Type, &ctor_arg)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -1206,32 +1604,285 @@
         }
         return -1;
     }
-    self->obj = new QImage(*((PyQImage *) ctor_arg)->obj);
+    self->obj = new QColor(*((PyQColor *) ctor_arg)->obj);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
-int _wrap_PyQImage__tp_init(PyQImage *self, PyObject *args, PyObject *kwargs)
+int _wrap_PyQColor__tp_init(PyQColor *self, PyObject *args, PyObject *kwargs)
 {
     int retval;
     PyObject *error_list;
-    PyObject *exceptions[3] = {0,};
-    retval = _wrap_PyQImage__tp_init__0(self, args, kwargs, &exceptions[0]);
+    PyObject *exceptions[4] = {0,};
+    retval = _wrap_PyQColor__tp_init__0(self, args, kwargs, &exceptions[0]);
     if (!exceptions[0]) {
         return retval;
     }
-    retval = _wrap_PyQImage__tp_init__1(self, args, kwargs, &exceptions[1]);
+    retval = _wrap_PyQColor__tp_init__1(self, args, kwargs, &exceptions[1]);
     if (!exceptions[1]) {
         Py_DECREF(exceptions[0]);
         return retval;
     }
-    retval = _wrap_PyQImage__tp_init__2(self, args, kwargs, &exceptions[2]);
+    retval = _wrap_PyQColor__tp_init__2(self, args, kwargs, &exceptions[2]);
     if (!exceptions[2]) {
         Py_DECREF(exceptions[0]);
         Py_DECREF(exceptions[1]);
         return retval;
     }
-    error_list = PyList_New(3);
+    retval = _wrap_PyQColor__tp_init__3(self, args, kwargs, &exceptions[3]);
+    if (!exceptions[3]) {
+        Py_DECREF(exceptions[0]);
+        Py_DECREF(exceptions[1]);
+        Py_DECREF(exceptions[2]);
+        return retval;
+    }
+    error_list = PyList_New(4);
+    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
+    Py_DECREF(exceptions[0]);
+    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
+    Py_DECREF(exceptions[1]);
+    PyList_SET_ITEM(error_list, 2, PyObject_Str(exceptions[2]));
+    Py_DECREF(exceptions[2]);
+    PyList_SET_ITEM(error_list, 3, PyObject_Str(exceptions[3]));
+    Py_DECREF(exceptions[3]);
+    PyErr_SetObject(PyExc_TypeError, error_list);
+    Py_DECREF(error_list);
+    return -1;
+}
+
+
+PyObject *
+_wrap_PyQColor_rgb(PyQColor *self)
+{
+    PyObject *py_retval;
+    PyQRgb *py_QRgb;
+
+    QRgb retval = self->obj->rgb();
+    py_QRgb = PyObject_New(PyQRgb, &PyQRgb_Type);
+    py_QRgb->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QRgb->obj = new QRgb(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QRgb);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyQColor_rgba(PyQColor *self)
+{
+    PyObject *py_retval;
+    PyQRgb *py_QRgb;
+
+    QRgb retval = self->obj->rgba();
+    py_QRgb = PyObject_New(PyQRgb, &PyQRgb_Type);
+    py_QRgb->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QRgb->obj = new QRgb(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QRgb);
+    return py_retval;
+}
+
+
+static PyObject*
+_wrap_PyQColor__copy__(PyQColor *self)
+{
+
+    PyQColor *py_copy;
+    py_copy = PyObject_New(PyQColor, &PyQColor_Type);
+    py_copy->obj = new QColor(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyQColor_methods[] = {
+    {(char *) "rgb", (PyCFunction) _wrap_PyQColor_rgb, METH_NOARGS, "rgb()\n\n" },
+    {(char *) "rgba", (PyCFunction) _wrap_PyQColor_rgba, METH_NOARGS, "rgba()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyQColor__copy__, METH_NOARGS, NULL},
+    {NULL, NULL, 0, NULL}
+};
+
+static void
+_wrap_PyQColor__tp_dealloc(PyQColor *self)
+{
+        QColor *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject*
+_wrap_PyQColor__tp_richcompare (PyQColor *PYBINDGEN_UNUSED(self), PyQColor *other, int opid)
+{
+
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyQColor_Type)) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+    switch (opid)
+    {
+    case Py_LT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_LE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_EQ:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_NE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    } /* closes switch (opid) */
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+}
+
+PyTypeObject PyQColor_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    (char *) "tiled.qt.QColor",            /* tp_name */
+    sizeof(PyQColor),                  /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)_wrap_PyQColor__tp_dealloc,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)NULL,       /* tp_getattr */
+    (setattrfunc)NULL,       /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
+    NULL,
+#else
+    (cmpfunc)NULL,           /* tp_compare */
+#endif
+    (reprfunc)NULL,             /* tp_repr */
+    (PyNumberMethods*)NULL,     /* tp_as_number */
+    (PySequenceMethods*)NULL, /* tp_as_sequence */
+    (PyMappingMethods*)NULL,   /* tp_as_mapping */
+    (hashfunc)NULL,             /* tp_hash */
+    (ternaryfunc)NULL,          /* tp_call */
+    (reprfunc)NULL,              /* tp_str */
+    (getattrofunc)NULL,     /* tp_getattro */
+    (setattrofunc)NULL,     /* tp_setattro */
+    (PyBufferProcs*)NULL,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,                      /* tp_flags */
+    "QColor(r, g, b, a)\nQColor(ctor_arg)\nQColor(r, g, b)\nQColor(col)",                        /* Documentation string */
+    (traverseproc)NULL,     /* tp_traverse */
+    (inquiry)NULL,             /* tp_clear */
+    (richcmpfunc)_wrap_PyQColor__tp_richcompare,   /* tp_richcompare */
+    0,             /* tp_weaklistoffset */
+    (getiterfunc)NULL,          /* tp_iter */
+    (iternextfunc)NULL,     /* tp_iternext */
+    (struct PyMethodDef*)PyQColor_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    0,                     /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)NULL,    /* tp_descr_get */
+    (descrsetfunc)NULL,    /* tp_descr_set */
+    0,                 /* tp_dictoffset */
+    (initproc)_wrap_PyQColor__tp_init,             /* tp_init */
+    (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
+    (newfunc)PyType_GenericNew,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)NULL,             /* tp_is_gc */
+    NULL,                              /* tp_bases */
+    NULL,                              /* tp_mro */
+    NULL,                              /* tp_cache */
+    NULL,                              /* tp_subclasses */
+    NULL,                              /* tp_weaklist */
+    (destructor) NULL                  /* tp_del */
+};
+
+
+
+
+
+static int
+_wrap_PyQImage__tp_init__0(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    const char *keywords[] = {NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "", (char **) keywords)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QImage();
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+static int
+_wrap_PyQImage__tp_init__1(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    int w;
+    int h;
+    QImage::Format f;
+    const char *keywords[] = {"w", "h", "f", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iii", (char **) keywords, &w, &h, &f)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QImage(w, h, f);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+static int
+_wrap_PyQImage__tp_init__2(PyQImage *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    PyQImage *ctor_arg;
+    const char *keywords[] = {"ctor_arg", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQImage_Type, &ctor_arg)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new QImage(*((PyQImage *) ctor_arg)->obj);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+int _wrap_PyQImage__tp_init(PyQImage *self, PyObject *args, PyObject *kwargs)
+{
+    int retval;
+    PyObject *error_list;
+    PyObject *exceptions[3] = {0,};
+    retval = _wrap_PyQImage__tp_init__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyQImage__tp_init__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    retval = _wrap_PyQImage__tp_init__2(self, args, kwargs, &exceptions[2]);
+    if (!exceptions[2]) {
+        Py_DECREF(exceptions[0]);
+        Py_DECREF(exceptions[1]);
+        return retval;
+    }
+    error_list = PyList_New(3);
     PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
     Py_DECREF(exceptions[0]);
     PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
@@ -2573,23 +3224,23 @@
 
 
 
-bool isImageLayerAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::ImageLayer*>(map->layerAt(idx)) != 0);
+bool isImageLayerAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::ImageLayer*>(map->layerAt(index)) != 0);
 }
-bool isTileLayerAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::TileLayer*>(map->layerAt(idx)) != 0);
+bool isTileLayerAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::TileLayer*>(map->layerAt(index)) != 0);
 }
-bool isObjectGroupAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::ObjectGroup*>(map->layerAt(idx)) != 0);
+bool isObjectGroupAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::ObjectGroup*>(map->layerAt(index)) != 0);
 }
-Tiled::ImageLayer* imageLayerAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::ImageLayer*>(map->layerAt(idx));
+Tiled::ImageLayer* imageLayerAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::ImageLayer*>(map->layerAt(index));
 }
-Tiled::TileLayer* tileLayerAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::TileLayer*>(map->layerAt(idx));
+Tiled::TileLayer* tileLayerAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::TileLayer*>(map->layerAt(index));
 }
-Tiled::ObjectGroup* objectGroupAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::ObjectGroup*>(map->layerAt(idx));
+Tiled::ObjectGroup* objectGroupAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::ObjectGroup*>(map->layerAt(index));
 }
 
 
@@ -2621,11 +3272,21 @@
     if (m == NULL) {
         return NULL;
     }
+    /* Register the 'QPoint' class */
+    if (PyType_Ready(&PyQPoint_Type)) {
+        return NULL;
+    }
+    PyModule_AddObject(m, (char *) "QPoint", (PyObject *) &PyQPoint_Type);
     /* Register the 'QPointF' class */
     if (PyType_Ready(&PyQPointF_Type)) {
         return NULL;
     }
     PyModule_AddObject(m, (char *) "QPointF", (PyObject *) &PyQPointF_Type);
+    /* Register the 'QSize' class */
+    if (PyType_Ready(&PyQSize_Type)) {
+        return NULL;
+    }
+    PyModule_AddObject(m, (char *) "QSize", (PyObject *) &PyQSize_Type);
     /* Register the 'QSizeF' class */
     if (PyType_Ready(&PyQSizeF_Type)) {
         return NULL;
@@ -3178,6 +3839,21 @@
 
 
 PyObject *
+_wrap_PyTiledTile_size(PyTiledTile *self)
+{
+    PyObject *py_retval;
+    PyQSize *py_QSize;
+
+    QSize retval = self->obj->size();
+    py_QSize = PyObject_New(PyQSize, &PyQSize_Type);
+    py_QSize->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QSize->obj = new QSize(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QSize);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTile_tileset(PyTiledTile *self)
 {
     PyObject *py_retval;
@@ -3213,6 +3889,7 @@
     {(char *) "id", (PyCFunction) _wrap_PyTiledTile_id, METH_NOARGS, "id()\n\n" },
     {(char *) "image", (PyCFunction) _wrap_PyTiledTile_image, METH_NOARGS, "image()\n\n" },
     {(char *) "setImage", (PyCFunction) _wrap_PyTiledTile_setImage, METH_KEYWORDS|METH_VARARGS, "setImage(image)\n\ntype: image: QPixmap const &" },
+    {(char *) "size", (PyCFunction) _wrap_PyTiledTile_size, METH_NOARGS, "size()\n\n" },
     {(char *) "tileset", (PyCFunction) _wrap_PyTiledTile_tileset, METH_NOARGS, "tileset()\n\n" },
     {(char *) "width", (PyCFunction) _wrap_PyTiledTile_width, METH_NOARGS, "width()\n\n" },
     {NULL, NULL, 0, NULL}
@@ -3377,6 +4054,46 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_findTile(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    Tiled::Tile *retval;
+    int id;
+    const char *keywords[] = {"id", NULL};
+    PyTiledTile *py_Tile;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &id)) {
+        return NULL;
+    }
+    retval = self->obj->findTile(id);
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    py_Tile = PyObject_New(PyTiledTile, &PyTiledTile_Type);
+    py_Tile->obj = retval;
+    py_Tile->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_Tile);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledTileset_gridSize(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    PyQSize *py_QSize;
+
+    QSize retval = self->obj->gridSize();
+    py_QSize = PyObject_New(PyQSize, &PyQSize_Type);
+    py_QSize->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QSize->obj = new QSize(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QSize);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_imageHeight(PyTiledTileset *self)
 {
     PyObject *py_retval;
@@ -3389,6 +4106,18 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_imageSourceString(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    QString retval;
+
+    retval = self->obj->imageSourceString();
+    py_retval = Py_BuildValue((char *) "s", retval.toUtf8().data());
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_imageWidth(PyTiledTileset *self)
 {
     PyObject *py_retval;
@@ -3401,6 +4130,18 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_isCollection(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isCollection();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_isExternal(PyTiledTileset *self)
 {
     PyObject *py_retval;
@@ -3432,6 +4173,18 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_loadImage(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->loadImage();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_margin(PyTiledTileset *self)
 {
     PyObject *py_retval;
@@ -3456,6 +4209,18 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_rowCount(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->rowCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_setFileName(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -3474,6 +4239,41 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_setGridSize(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    PyQSize *gridSize;
+    const char *keywords[] = {"gridSize", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQSize_Type, &gridSize)) {
+        return NULL;
+    }
+    self->obj->setGridSize(*((PyQSize *) gridSize)->obj);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledTileset_setImageSource(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    const char *source;
+    Py_ssize_t source_len;
+    const char *keywords[] = {"source", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#", (char **) keywords, &source, &source_len)) {
+        return NULL;
+    }
+    self->obj->setImageSource(QString::fromUtf8(source));
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_setName(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -3492,6 +4292,23 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_setTileOffset(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    PyQPoint *offset;
+    const char *keywords[] = {"offset", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQPoint_Type, &offset)) {
+        return NULL;
+    }
+    self->obj->setTileOffset(*((PyQPoint *) offset)->obj);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_setTransparentColor(PyTiledTileset *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -3558,6 +4375,21 @@
 
 
 PyObject *
+_wrap_PyTiledTileset_tileOffset(PyTiledTileset *self)
+{
+    PyObject *py_retval;
+    PyQPoint *py_QPoint;
+
+    QPoint retval = self->obj->tileOffset();
+    py_QPoint = PyObject_New(PyQPoint, &PyQPoint_Type);
+    py_QPoint->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QPoint->obj = new QPoint(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QPoint);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledTileset_tileSpacing(PyTiledTileset *self)
 {
     PyObject *py_retval;
@@ -3599,18 +4431,28 @@
     {(char *) "columnCount", (PyCFunction) _wrap_PyTiledTileset_columnCount, METH_NOARGS, "columnCount()\n\n" },
     {(char *) "create", (PyCFunction) _wrap_PyTiledTileset_create, METH_KEYWORDS|METH_VARARGS|METH_STATIC, "create(name, tileWidth, tileHeight, tileSpacing, margin)\n\ntype: name: QString\ntype: tileWidth: int\ntype: tileHeight: int\ntype: tileSpacing: int\ntype: margin: int" },
     {(char *) "fileName", (PyCFunction) _wrap_PyTiledTileset_fileName, METH_NOARGS, "fileName()\n\n" },
+    {(char *) "findTile", (PyCFunction) _wrap_PyTiledTileset_findTile, METH_KEYWORDS|METH_VARARGS, "findTile(id)\n\ntype: id: int" },
+    {(char *) "gridSize", (PyCFunction) _wrap_PyTiledTileset_gridSize, METH_NOARGS, "gridSize()\n\n" },
     {(char *) "imageHeight", (PyCFunction) _wrap_PyTiledTileset_imageHeight, METH_NOARGS, "imageHeight()\n\n" },
+    {(char *) "imageSourceString", (PyCFunction) _wrap_PyTiledTileset_imageSourceString, METH_NOARGS, "imageSourceString()\n\n" },
     {(char *) "imageWidth", (PyCFunction) _wrap_PyTiledTileset_imageWidth, METH_NOARGS, "imageWidth()\n\n" },
+    {(char *) "isCollection", (PyCFunction) _wrap_PyTiledTileset_isCollection, METH_NOARGS, "isCollection()\n\n" },
     {(char *) "isExternal", (PyCFunction) _wrap_PyTiledTileset_isExternal, METH_NOARGS, "isExternal()\n\n" },
     {(char *) "loadFromImage", (PyCFunction) _wrap_PyTiledTileset_loadFromImage, METH_KEYWORDS|METH_VARARGS, "loadFromImage(img, file)\n\ntype: img: QImage const &\ntype: file: QString" },
+    {(char *) "loadImage", (PyCFunction) _wrap_PyTiledTileset_loadImage, METH_NOARGS, "loadImage()\n\n" },
     {(char *) "margin", (PyCFunction) _wrap_PyTiledTileset_margin, METH_NOARGS, "margin()\n\n" },
     {(char *) "name", (PyCFunction) _wrap_PyTiledTileset_name, METH_NOARGS, "name()\n\n" },
+    {(char *) "rowCount", (PyCFunction) _wrap_PyTiledTileset_rowCount, METH_NOARGS, "rowCount()\n\n" },
     {(char *) "setFileName", (PyCFunction) _wrap_PyTiledTileset_setFileName, METH_KEYWORDS|METH_VARARGS, "setFileName(name)\n\ntype: name: QString" },
+    {(char *) "setGridSize", (PyCFunction) _wrap_PyTiledTileset_setGridSize, METH_KEYWORDS|METH_VARARGS, "setGridSize(gridSize)\n\ntype: gridSize: QSize" },
+    {(char *) "setImageSource", (PyCFunction) _wrap_PyTiledTileset_setImageSource, METH_KEYWORDS|METH_VARARGS, "setImageSource(source)\n\ntype: source: QString" },
     {(char *) "setName", (PyCFunction) _wrap_PyTiledTileset_setName, METH_KEYWORDS|METH_VARARGS, "setName(name)\n\ntype: name: QString" },
+    {(char *) "setTileOffset", (PyCFunction) _wrap_PyTiledTileset_setTileOffset, METH_KEYWORDS|METH_VARARGS, "setTileOffset(offset)\n\ntype: offset: QPoint" },
     {(char *) "setTransparentColor", (PyCFunction) _wrap_PyTiledTileset_setTransparentColor, METH_KEYWORDS|METH_VARARGS, "setTransparentColor(col)\n\ntype: col: QColor" },
     {(char *) "tileAt", (PyCFunction) _wrap_PyTiledTileset_tileAt, METH_KEYWORDS|METH_VARARGS, "tileAt(id)\n\ntype: id: int" },
     {(char *) "tileCount", (PyCFunction) _wrap_PyTiledTileset_tileCount, METH_NOARGS, "tileCount()\n\n" },
     {(char *) "tileHeight", (PyCFunction) _wrap_PyTiledTileset_tileHeight, METH_NOARGS, "tileHeight()\n\n" },
+    {(char *) "tileOffset", (PyCFunction) _wrap_PyTiledTileset_tileOffset, METH_NOARGS, "tileOffset()\n\n" },
     {(char *) "tileSpacing", (PyCFunction) _wrap_PyTiledTileset_tileSpacing, METH_NOARGS, "tileSpacing()\n\n" },
     {(char *) "tileWidth", (PyCFunction) _wrap_PyTiledTileset_tileWidth, METH_NOARGS, "tileWidth()\n\n" },
     {(char *) "transparentColor", (PyCFunction) _wrap_PyTiledTileset_transparentColor, METH_NOARGS, "transparentColor()\n\n" },
@@ -3880,6 +4722,46 @@
 
 
 PyObject *
+_wrap_PyTiledLayer_asGroupLayer(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    Tiled::GroupLayer *retval;
+    PyTiledGroupLayer *py_GroupLayer;
+
+    retval = self->obj->asGroupLayer();
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    py_GroupLayer = PyObject_New(PyTiledGroupLayer, &PyTiledGroupLayer_Type);
+    py_GroupLayer->obj = retval;
+    py_GroupLayer->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_GroupLayer);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_asImageLayer(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    Tiled::ImageLayer *retval;
+    PyTiledImageLayer *py_ImageLayer;
+
+    retval = self->obj->asImageLayer();
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    py_ImageLayer = PyObject_New(PyTiledImageLayer, &PyTiledImageLayer_Type);
+    py_ImageLayer->obj = retval;
+    py_ImageLayer->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_ImageLayer);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledLayer_asObjectGroup(PyTiledLayer *self)
 {
     PyObject *py_retval;
@@ -3920,6 +4802,90 @@
 
 
 PyObject *
+_wrap_PyTiledLayer_isGroupLayer(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isGroupLayer();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isHidden(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isHidden();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isImageLayer(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isImageLayer();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isLocked(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isLocked();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isObjectGroup(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isObjectGroup();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isTileLayer(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isTileLayer();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledLayer_isUnlocked(PyTiledLayer *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isUnlocked();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledLayer_isVisible(PyTiledLayer *self)
 {
     PyObject *py_retval;
@@ -3976,6 +4942,25 @@
 
 
 PyObject *
+_wrap_PyTiledLayer_setLocked(PyTiledLayer *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    bool locked;
+    PyObject *py_locked;
+    const char *keywords[] = {"locked", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O", (char **) keywords, &py_locked)) {
+        return NULL;
+    }
+    locked = (bool) PyObject_IsTrue(py_locked);
+    self->obj->setLocked(locked);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledLayer_setName(PyTiledLayer *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -4105,12 +5090,22 @@
 }
 
 static PyMethodDef PyTiledLayer_methods[] = {
+    {(char *) "asGroupLayer", (PyCFunction) _wrap_PyTiledLayer_asGroupLayer, METH_NOARGS, "asGroupLayer()\n\n" },
+    {(char *) "asImageLayer", (PyCFunction) _wrap_PyTiledLayer_asImageLayer, METH_NOARGS, "asImageLayer()\n\n" },
     {(char *) "asObjectGroup", (PyCFunction) _wrap_PyTiledLayer_asObjectGroup, METH_NOARGS, "asObjectGroup()\n\n" },
     {(char *) "asTileLayer", (PyCFunction) _wrap_PyTiledLayer_asTileLayer, METH_NOARGS, "asTileLayer()\n\n" },
+    {(char *) "isGroupLayer", (PyCFunction) _wrap_PyTiledLayer_isGroupLayer, METH_NOARGS, "isGroupLayer()\n\n" },
+    {(char *) "isHidden", (PyCFunction) _wrap_PyTiledLayer_isHidden, METH_NOARGS, "isHidden()\n\n" },
+    {(char *) "isImageLayer", (PyCFunction) _wrap_PyTiledLayer_isImageLayer, METH_NOARGS, "isImageLayer()\n\n" },
+    {(char *) "isLocked", (PyCFunction) _wrap_PyTiledLayer_isLocked, METH_NOARGS, "isLocked()\n\n" },
+    {(char *) "isObjectGroup", (PyCFunction) _wrap_PyTiledLayer_isObjectGroup, METH_NOARGS, "isObjectGroup()\n\n" },
+    {(char *) "isTileLayer", (PyCFunction) _wrap_PyTiledLayer_isTileLayer, METH_NOARGS, "isTileLayer()\n\n" },
+    {(char *) "isUnlocked", (PyCFunction) _wrap_PyTiledLayer_isUnlocked, METH_NOARGS, "isUnlocked()\n\n" },
     {(char *) "isVisible", (PyCFunction) _wrap_PyTiledLayer_isVisible, METH_NOARGS, "isVisible()\n\n" },
     {(char *) "map", (PyCFunction) _wrap_PyTiledLayer_map, METH_NOARGS, "map()\n\n" },
     {(char *) "name", (PyCFunction) _wrap_PyTiledLayer_name, METH_NOARGS, "name()\n\n" },
     {(char *) "opacity", (PyCFunction) _wrap_PyTiledLayer_opacity, METH_NOARGS, "opacity()\n\n" },
+    {(char *) "setLocked", (PyCFunction) _wrap_PyTiledLayer_setLocked, METH_KEYWORDS|METH_VARARGS, "setLocked(locked)\n\ntype: locked: bool" },
     {(char *) "setName", (PyCFunction) _wrap_PyTiledLayer_setName, METH_KEYWORDS|METH_VARARGS, "setName(name)\n\ntype: name: QString" },
     {(char *) "setOpacity", (PyCFunction) _wrap_PyTiledLayer_setOpacity, METH_KEYWORDS|METH_VARARGS, "setOpacity(opacity)\n\ntype: opacity: double" },
     {(char *) "setPosition", (PyCFunction) _wrap_PyTiledLayer_setPosition, METH_KEYWORDS|METH_VARARGS, "setPosition(x, y)\n\ntype: x: int\ntype: y: int" },
@@ -4298,11 +5293,11 @@
 _wrap_PyTiledMap_addLayer__0(PyTiledMap *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
     PyObject *py_retval;
-    PyTiledImageLayer *l;
-    Tiled::ImageLayer *l_ptr;
+    PyTiledTileLayer *l;
+    Tiled::TileLayer *l_ptr;
     const char *keywords[] = {"l", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledImageLayer_Type, &l)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledTileLayer_Type, &l)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -4325,11 +5320,11 @@
 _wrap_PyTiledMap_addLayer__1(PyTiledMap *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
     PyObject *py_retval;
-    PyTiledTileLayer *l;
-    Tiled::TileLayer *l_ptr;
+    PyTiledObjectGroup *l;
+    Tiled::ObjectGroup *l_ptr;
     const char *keywords[] = {"l", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledTileLayer_Type, &l)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledObjectGroup_Type, &l)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -4352,11 +5347,11 @@
 _wrap_PyTiledMap_addLayer__2(PyTiledMap *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
     PyObject *py_retval;
-    PyTiledObjectGroup *l;
-    Tiled::ObjectGroup *l_ptr;
+    PyTiledImageLayer *l;
+    Tiled::ImageLayer *l_ptr;
     const char *keywords[] = {"l", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledObjectGroup_Type, &l)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledImageLayer_Type, &l)) {
         {
             PyObject *exc_type, *traceback;
             PyErr_Fetch(&exc_type, return_exception, &traceback);
@@ -4375,33 +5370,69 @@
     return py_retval;
 }
 
-PyObject * _wrap_PyTiledMap_addLayer(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+PyObject *
+_wrap_PyTiledMap_addLayer__3(PyTiledMap *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
 {
-    PyObject * retval;
-    PyObject *error_list;
-    PyObject *exceptions[3] = {0,};
-    retval = _wrap_PyTiledMap_addLayer__0(self, args, kwargs, &exceptions[0]);
-    if (!exceptions[0]) {
-        return retval;
-    }
-    retval = _wrap_PyTiledMap_addLayer__1(self, args, kwargs, &exceptions[1]);
-    if (!exceptions[1]) {
-        Py_DECREF(exceptions[0]);
-        return retval;
-    }
-    retval = _wrap_PyTiledMap_addLayer__2(self, args, kwargs, &exceptions[2]);
-    if (!exceptions[2]) {
-        Py_DECREF(exceptions[0]);
+    PyObject *py_retval;
+    PyTiledGroupLayer *l;
+    Tiled::GroupLayer *l_ptr;
+    const char *keywords[] = {"l", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledGroupLayer_Type, &l)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return NULL;
+    }
+    l_ptr = (l ? l->obj : NULL);
+    self->obj->addLayer(l_ptr);
+    if (l) {
+        l->obj = NULL;
+    }
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+PyObject * _wrap_PyTiledMap_addLayer(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject * retval;
+    PyObject *error_list;
+    PyObject *exceptions[4] = {0,};
+    retval = _wrap_PyTiledMap_addLayer__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyTiledMap_addLayer__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    retval = _wrap_PyTiledMap_addLayer__2(self, args, kwargs, &exceptions[2]);
+    if (!exceptions[2]) {
+        Py_DECREF(exceptions[0]);
         Py_DECREF(exceptions[1]);
         return retval;
     }
-    error_list = PyList_New(3);
+    retval = _wrap_PyTiledMap_addLayer__3(self, args, kwargs, &exceptions[3]);
+    if (!exceptions[3]) {
+        Py_DECREF(exceptions[0]);
+        Py_DECREF(exceptions[1]);
+        Py_DECREF(exceptions[2]);
+        return retval;
+    }
+    error_list = PyList_New(4);
     PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
     Py_DECREF(exceptions[0]);
     PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
     Py_DECREF(exceptions[1]);
     PyList_SET_ITEM(error_list, 2, PyObject_Str(exceptions[2]));
     Py_DECREF(exceptions[2]);
+    PyList_SET_ITEM(error_list, 3, PyObject_Str(exceptions[3]));
+    Py_DECREF(exceptions[3]);
     PyErr_SetObject(PyExc_TypeError, error_list);
     Py_DECREF(error_list);
     return NULL;
@@ -4426,6 +5457,33 @@
 
 
 PyObject *
+_wrap_PyTiledMap_backgroundColor(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    PyQColor *py_QColor;
+
+    QColor retval = self->obj->backgroundColor();
+    py_QColor = PyObject_New(PyQColor, &PyQColor_Type);
+    py_QColor->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QColor->obj = new QColor(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QColor);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_groupLayerCount(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->groupLayerCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_height(PyTiledMap *self)
 {
     PyObject *py_retval;
@@ -4438,6 +5496,30 @@
 
 
 PyObject *
+_wrap_PyTiledMap_hexSideLength(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->hexSideLength();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_imageLayerCount(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->imageLayerCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_indexOfTileset(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -4455,6 +5537,18 @@
 
 
 PyObject *
+_wrap_PyTiledMap_infinite(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->infinite();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_insertTileset(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -4496,14 +5590,14 @@
 {
     PyObject *py_retval;
     Tiled::Layer *retval;
-    int idx;
-    const char *keywords[] = {"idx", NULL};
+    int index;
+    const char *keywords[] = {"index", NULL};
     PyTiledLayer *py_Layer;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &index)) {
         return NULL;
     }
-    retval = self->obj->layerAt(idx);
+    retval = self->obj->layerAt(index);
     if (!(retval)) {
         Py_INCREF(Py_None);
         return Py_None;
@@ -4529,6 +5623,30 @@
 
 
 PyObject *
+_wrap_PyTiledMap_nextLayerId(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->nextLayerId();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_nextObjectId(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->nextObjectId();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_objectGroupCount(PyTiledMap *self)
 {
     PyObject *py_retval;
@@ -4570,6 +5688,18 @@
 
 
 PyObject *
+_wrap_PyTiledMap_renderOrder(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    Tiled::Map::RenderOrder retval;
+
+    retval = self->obj->renderOrder();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_replaceTileset(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -4588,6 +5718,23 @@
 
 
 PyObject *
+_wrap_PyTiledMap_setBackgroundColor(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    PyQColor *col;
+    const char *keywords[] = {"col", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQColor_Type, &col)) {
+        return NULL;
+    }
+    self->obj->setBackgroundColor(*((PyQColor *) col)->obj);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
+
+
+PyObject *
 _wrap_PyTiledMap_setHeight(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
@@ -4605,16 +5752,16 @@
 
 
 PyObject *
-_wrap_PyTiledMap_setOrientation(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMap_setHexSideLength(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    Tiled::Map::Orientation o;
-    const char *keywords[] = {"o", NULL};
+    int hexSideLength;
+    const char *keywords[] = {"hexSideLength", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &o)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &hexSideLength)) {
         return NULL;
     }
-    self->obj->setOrientation(o);
+    self->obj->setHexSideLength(hexSideLength);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -4622,16 +5769,18 @@
 
 
 PyObject *
-_wrap_PyTiledMap_setWidth(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMap_setInfinite(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int w;
-    const char *keywords[] = {"w", NULL};
+    bool infinite;
+    PyObject *py_infinite;
+    const char *keywords[] = {"infinite", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &w)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O", (char **) keywords, &py_infinite)) {
         return NULL;
     }
-    self->obj->setWidth(w);
+    infinite = (bool) PyObject_IsTrue(py_infinite);
+    self->obj->setInfinite(infinite);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -4639,134 +5788,311 @@
 
 
 PyObject *
-_wrap_PyTiledMap_tileHeight(PyTiledMap *self)
+_wrap_PyTiledMap_setNextLayerId(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int retval;
+    int nextLayerId;
+    const char *keywords[] = {"nextLayerId", NULL};
 
-    retval = self->obj->tileHeight();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &nextLayerId)) {
+        return NULL;
+    }
+    self->obj->setNextLayerId(nextLayerId);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMap_tileLayerCount(PyTiledMap *self)
+_wrap_PyTiledMap_setNextObjectId(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int retval;
+    int nextObjectId;
+    const char *keywords[] = {"nextObjectId", NULL};
 
-    retval = self->obj->tileLayerCount();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &nextObjectId)) {
+        return NULL;
+    }
+    self->obj->setNextObjectId(nextObjectId);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMap_tileWidth(PyTiledMap *self)
+_wrap_PyTiledMap_setOrientation(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int retval;
+    Tiled::Map::Orientation orientation;
+    const char *keywords[] = {"orientation", NULL};
 
-    retval = self->obj->tileWidth();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &orientation)) {
+        return NULL;
+    }
+    self->obj->setOrientation(orientation);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMap_tilesetAt(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMap_setRenderOrder(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int idx;
-    const char *keywords[] = {"idx", NULL};
-    PyTiledSharedTileset *py_SharedTileset;
+    Tiled::Map::RenderOrder renderOrder;
+    const char *keywords[] = {"renderOrder", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &renderOrder)) {
         return NULL;
     }
-    Tiled::SharedTileset retval = self->obj->tilesetAt(idx);
-    py_SharedTileset = PyObject_New(PyTiledSharedTileset, &PyTiledSharedTileset_Type);
-    py_SharedTileset->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    py_SharedTileset->obj = new Tiled::SharedTileset(retval);
-    py_retval = Py_BuildValue((char *) "N", py_SharedTileset);
+    self->obj->setRenderOrder(renderOrder);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMap_tilesetCount(PyTiledMap *self)
+_wrap_PyTiledMap_setStaggerAxis(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int retval;
+    Tiled::Map::StaggerAxis staggerAxis;
+    const char *keywords[] = {"staggerAxis", NULL};
 
-    retval = self->obj->tilesetCount();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &staggerAxis)) {
+        return NULL;
+    }
+    self->obj->setStaggerAxis(staggerAxis);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMap_width(PyTiledMap *self)
+_wrap_PyTiledMap_setStaggerIndex(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int retval;
+    Tiled::Map::StaggerIndex staggerIndex;
+    const char *keywords[] = {"staggerIndex", NULL};
 
-    retval = self->obj->width();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &staggerIndex)) {
+        return NULL;
+    }
+    self->obj->setStaggerIndex(staggerIndex);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
-static PyObject*
-_wrap_PyTiledMap__copy__(PyTiledMap *self)
+PyObject *
+_wrap_PyTiledMap_setWidth(PyTiledMap *self, PyObject *args, PyObject *kwargs)
 {
+    PyObject *py_retval;
+    int w;
+    const char *keywords[] = {"w", NULL};
 
-    PyTiledMap *py_copy;
-    py_copy = PyObject_New(PyTiledMap, &PyTiledMap_Type);
-    py_copy->obj = new Tiled::Map(*self->obj);
-    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return (PyObject*) py_copy;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &w)) {
+        return NULL;
+    }
+    self->obj->setWidth(w);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
 }
 
-static PyMethodDef PyTiledMap_methods[] = {
-    {(char *) "addLayer", (PyCFunction) _wrap_PyTiledMap_addLayer, METH_KEYWORDS|METH_VARARGS, NULL },
-    {(char *) "addTileset", (PyCFunction) _wrap_PyTiledMap_addTileset, METH_KEYWORDS|METH_VARARGS, "addTileset(tileset)\n\ntype: tileset: SharedTileset" },
-    {(char *) "height", (PyCFunction) _wrap_PyTiledMap_height, METH_NOARGS, "height()\n\n" },
-    {(char *) "indexOfTileset", (PyCFunction) _wrap_PyTiledMap_indexOfTileset, METH_KEYWORDS|METH_VARARGS, "indexOfTileset(tileset)\n\ntype: tileset: SharedTileset const &" },
-    {(char *) "insertTileset", (PyCFunction) _wrap_PyTiledMap_insertTileset, METH_KEYWORDS|METH_VARARGS, "insertTileset(pos, tileset)\n\ntype: pos: int\ntype: tileset: SharedTileset" },
-    {(char *) "isTilesetUsed", (PyCFunction) _wrap_PyTiledMap_isTilesetUsed, METH_KEYWORDS|METH_VARARGS, "isTilesetUsed(tileset)\n\ntype: tileset: Tileset const *" },
-    {(char *) "layerAt", (PyCFunction) _wrap_PyTiledMap_layerAt, METH_KEYWORDS|METH_VARARGS, "layerAt(idx)\n\ntype: idx: int" },
-    {(char *) "layerCount", (PyCFunction) _wrap_PyTiledMap_layerCount, METH_NOARGS, "layerCount()\n\n" },
-    {(char *) "objectGroupCount", (PyCFunction) _wrap_PyTiledMap_objectGroupCount, METH_NOARGS, "objectGroupCount()\n\n" },
-    {(char *) "orientation", (PyCFunction) _wrap_PyTiledMap_orientation, METH_NOARGS, "orientation()\n\n" },
-    {(char *) "removeTilesetAt", (PyCFunction) _wrap_PyTiledMap_removeTilesetAt, METH_KEYWORDS|METH_VARARGS, "removeTilesetAt(pos)\n\ntype: pos: int" },
-    {(char *) "replaceTileset", (PyCFunction) _wrap_PyTiledMap_replaceTileset, METH_KEYWORDS|METH_VARARGS, "replaceTileset(oldTileset, newTileset)\n\ntype: oldTileset: SharedTileset\ntype: newTileset: SharedTileset" },
-    {(char *) "setHeight", (PyCFunction) _wrap_PyTiledMap_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: int" },
-    {(char *) "setOrientation", (PyCFunction) _wrap_PyTiledMap_setOrientation, METH_KEYWORDS|METH_VARARGS, "setOrientation(o)\n\ntype: o: Tiled::Map::Orientation" },
-    {(char *) "setWidth", (PyCFunction) _wrap_PyTiledMap_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: int" },
-    {(char *) "tileHeight", (PyCFunction) _wrap_PyTiledMap_tileHeight, METH_NOARGS, "tileHeight()\n\n" },
-    {(char *) "tileLayerCount", (PyCFunction) _wrap_PyTiledMap_tileLayerCount, METH_NOARGS, "tileLayerCount()\n\n" },
-    {(char *) "tileWidth", (PyCFunction) _wrap_PyTiledMap_tileWidth, METH_NOARGS, "tileWidth()\n\n" },
-    {(char *) "tilesetAt", (PyCFunction) _wrap_PyTiledMap_tilesetAt, METH_KEYWORDS|METH_VARARGS, "tilesetAt(idx)\n\ntype: idx: int" },
-    {(char *) "tilesetCount", (PyCFunction) _wrap_PyTiledMap_tilesetCount, METH_NOARGS, "tilesetCount()\n\n" },
-    {(char *) "width", (PyCFunction) _wrap_PyTiledMap_width, METH_NOARGS, "width()\n\n" },
-    {(char *) "__copy__", (PyCFunction) _wrap_PyTiledMap__copy__, METH_NOARGS, NULL},
-    {NULL, NULL, 0, NULL}
-};
 
-static void
-_wrap_PyTiledMap__tp_dealloc(PyTiledMap *self)
+PyObject *
+_wrap_PyTiledMap_staggerAxis(PyTiledMap *self)
 {
-        Tiled::Map *tmp = self->obj;
-        self->obj = NULL;
-        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
-            delete tmp;
-        }
-    Py_TYPE(self)->tp_free((PyObject*)self);
-}
+    PyObject *py_retval;
+    Tiled::Map::StaggerAxis retval;
 
-static PyObject*
+    retval = self->obj->staggerAxis();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_staggerIndex(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    Tiled::Map::StaggerIndex retval;
+
+    retval = self->obj->staggerIndex();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tileHeight(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->tileHeight();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tileLayerCount(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->tileLayerCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tileSize(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    PyQSize *py_QSize;
+
+    QSize retval = self->obj->tileSize();
+    py_QSize = PyObject_New(PyQSize, &PyQSize_Type);
+    py_QSize->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_QSize->obj = new QSize(retval);
+    py_retval = Py_BuildValue((char *) "N", py_QSize);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tileWidth(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->tileWidth();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tilesetAt(PyTiledMap *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    int index;
+    const char *keywords[] = {"index", NULL};
+    PyTiledSharedTileset *py_SharedTileset;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &index)) {
+        return NULL;
+    }
+    Tiled::SharedTileset retval = self->obj->tilesetAt(index);
+    py_SharedTileset = PyObject_New(PyTiledSharedTileset, &PyTiledSharedTileset_Type);
+    py_SharedTileset->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_SharedTileset->obj = new Tiled::SharedTileset(retval);
+    py_retval = Py_BuildValue((char *) "N", py_SharedTileset);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_tilesetCount(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->tilesetCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMap_width(PyTiledMap *self)
+{
+    PyObject *py_retval;
+    int retval;
+
+    retval = self->obj->width();
+    py_retval = Py_BuildValue((char *) "i", retval);
+    return py_retval;
+}
+
+
+static PyObject*
+_wrap_PyTiledMap__copy__(PyTiledMap *self)
+{
+
+    PyTiledMap *py_copy;
+    py_copy = PyObject_New(PyTiledMap, &PyTiledMap_Type);
+    py_copy->obj = new Tiled::Map(*self->obj);
+    py_copy->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return (PyObject*) py_copy;
+}
+
+static PyMethodDef PyTiledMap_methods[] = {
+    {(char *) "addLayer", (PyCFunction) _wrap_PyTiledMap_addLayer, METH_KEYWORDS|METH_VARARGS, NULL },
+    {(char *) "addTileset", (PyCFunction) _wrap_PyTiledMap_addTileset, METH_KEYWORDS|METH_VARARGS, "addTileset(tileset)\n\ntype: tileset: SharedTileset" },
+    {(char *) "backgroundColor", (PyCFunction) _wrap_PyTiledMap_backgroundColor, METH_NOARGS, "backgroundColor()\n\n" },
+    {(char *) "groupLayerCount", (PyCFunction) _wrap_PyTiledMap_groupLayerCount, METH_NOARGS, "groupLayerCount()\n\n" },
+    {(char *) "height", (PyCFunction) _wrap_PyTiledMap_height, METH_NOARGS, "height()\n\n" },
+    {(char *) "hexSideLength", (PyCFunction) _wrap_PyTiledMap_hexSideLength, METH_NOARGS, "hexSideLength()\n\n" },
+    {(char *) "imageLayerCount", (PyCFunction) _wrap_PyTiledMap_imageLayerCount, METH_NOARGS, "imageLayerCount()\n\n" },
+    {(char *) "indexOfTileset", (PyCFunction) _wrap_PyTiledMap_indexOfTileset, METH_KEYWORDS|METH_VARARGS, "indexOfTileset(tileset)\n\ntype: tileset: SharedTileset const &" },
+    {(char *) "infinite", (PyCFunction) _wrap_PyTiledMap_infinite, METH_NOARGS, "infinite()\n\n" },
+    {(char *) "insertTileset", (PyCFunction) _wrap_PyTiledMap_insertTileset, METH_KEYWORDS|METH_VARARGS, "insertTileset(pos, tileset)\n\ntype: pos: int\ntype: tileset: SharedTileset" },
+    {(char *) "isTilesetUsed", (PyCFunction) _wrap_PyTiledMap_isTilesetUsed, METH_KEYWORDS|METH_VARARGS, "isTilesetUsed(tileset)\n\ntype: tileset: Tileset const *" },
+    {(char *) "layerAt", (PyCFunction) _wrap_PyTiledMap_layerAt, METH_KEYWORDS|METH_VARARGS, "layerAt(index)\n\ntype: index: int" },
+    {(char *) "layerCount", (PyCFunction) _wrap_PyTiledMap_layerCount, METH_NOARGS, "layerCount()\n\n" },
+    {(char *) "nextLayerId", (PyCFunction) _wrap_PyTiledMap_nextLayerId, METH_NOARGS, "nextLayerId()\n\n" },
+    {(char *) "nextObjectId", (PyCFunction) _wrap_PyTiledMap_nextObjectId, METH_NOARGS, "nextObjectId()\n\n" },
+    {(char *) "objectGroupCount", (PyCFunction) _wrap_PyTiledMap_objectGroupCount, METH_NOARGS, "objectGroupCount()\n\n" },
+    {(char *) "orientation", (PyCFunction) _wrap_PyTiledMap_orientation, METH_NOARGS, "orientation()\n\n" },
+    {(char *) "removeTilesetAt", (PyCFunction) _wrap_PyTiledMap_removeTilesetAt, METH_KEYWORDS|METH_VARARGS, "removeTilesetAt(pos)\n\ntype: pos: int" },
+    {(char *) "renderOrder", (PyCFunction) _wrap_PyTiledMap_renderOrder, METH_NOARGS, "renderOrder()\n\n" },
+    {(char *) "replaceTileset", (PyCFunction) _wrap_PyTiledMap_replaceTileset, METH_KEYWORDS|METH_VARARGS, "replaceTileset(oldTileset, newTileset)\n\ntype: oldTileset: SharedTileset\ntype: newTileset: SharedTileset" },
+    {(char *) "setBackgroundColor", (PyCFunction) _wrap_PyTiledMap_setBackgroundColor, METH_KEYWORDS|METH_VARARGS, "setBackgroundColor(col)\n\ntype: col: QColor" },
+    {(char *) "setHeight", (PyCFunction) _wrap_PyTiledMap_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: int" },
+    {(char *) "setHexSideLength", (PyCFunction) _wrap_PyTiledMap_setHexSideLength, METH_KEYWORDS|METH_VARARGS, "setHexSideLength(hexSideLength)\n\ntype: hexSideLength: int" },
+    {(char *) "setInfinite", (PyCFunction) _wrap_PyTiledMap_setInfinite, METH_KEYWORDS|METH_VARARGS, "setInfinite(infinite)\n\ntype: infinite: bool" },
+    {(char *) "setNextLayerId", (PyCFunction) _wrap_PyTiledMap_setNextLayerId, METH_KEYWORDS|METH_VARARGS, "setNextLayerId(nextLayerId)\n\ntype: nextLayerId: int" },
+    {(char *) "setNextObjectId", (PyCFunction) _wrap_PyTiledMap_setNextObjectId, METH_KEYWORDS|METH_VARARGS, "setNextObjectId(nextObjectId)\n\ntype: nextObjectId: int" },
+    {(char *) "setOrientation", (PyCFunction) _wrap_PyTiledMap_setOrientation, METH_KEYWORDS|METH_VARARGS, "setOrientation(orientation)\n\ntype: orientation: Tiled::Map::Orientation" },
+    {(char *) "setRenderOrder", (PyCFunction) _wrap_PyTiledMap_setRenderOrder, METH_KEYWORDS|METH_VARARGS, "setRenderOrder(renderOrder)\n\ntype: renderOrder: Tiled::Map::RenderOrder" },
+    {(char *) "setStaggerAxis", (PyCFunction) _wrap_PyTiledMap_setStaggerAxis, METH_KEYWORDS|METH_VARARGS, "setStaggerAxis(staggerAxis)\n\ntype: staggerAxis: Tiled::Map::StaggerAxis" },
+    {(char *) "setStaggerIndex", (PyCFunction) _wrap_PyTiledMap_setStaggerIndex, METH_KEYWORDS|METH_VARARGS, "setStaggerIndex(staggerIndex)\n\ntype: staggerIndex: Tiled::Map::StaggerIndex" },
+    {(char *) "setWidth", (PyCFunction) _wrap_PyTiledMap_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: int" },
+    {(char *) "staggerAxis", (PyCFunction) _wrap_PyTiledMap_staggerAxis, METH_NOARGS, "staggerAxis()\n\n" },
+    {(char *) "staggerIndex", (PyCFunction) _wrap_PyTiledMap_staggerIndex, METH_NOARGS, "staggerIndex()\n\n" },
+    {(char *) "tileHeight", (PyCFunction) _wrap_PyTiledMap_tileHeight, METH_NOARGS, "tileHeight()\n\n" },
+    {(char *) "tileLayerCount", (PyCFunction) _wrap_PyTiledMap_tileLayerCount, METH_NOARGS, "tileLayerCount()\n\n" },
+    {(char *) "tileSize", (PyCFunction) _wrap_PyTiledMap_tileSize, METH_NOARGS, "tileSize()\n\n" },
+    {(char *) "tileWidth", (PyCFunction) _wrap_PyTiledMap_tileWidth, METH_NOARGS, "tileWidth()\n\n" },
+    {(char *) "tilesetAt", (PyCFunction) _wrap_PyTiledMap_tilesetAt, METH_KEYWORDS|METH_VARARGS, "tilesetAt(index)\n\ntype: index: int" },
+    {(char *) "tilesetCount", (PyCFunction) _wrap_PyTiledMap_tilesetCount, METH_NOARGS, "tilesetCount()\n\n" },
+    {(char *) "width", (PyCFunction) _wrap_PyTiledMap_width, METH_NOARGS, "width()\n\n" },
+    {(char *) "__copy__", (PyCFunction) _wrap_PyTiledMap__copy__, METH_NOARGS, NULL},
+    {NULL, NULL, 0, NULL}
+};
+
+static void
+_wrap_PyTiledMap__tp_dealloc(PyTiledMap *self)
+{
+        Tiled::Map *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject*
 _wrap_PyTiledMap__tp_richcompare (PyTiledMap *PYBINDGEN_UNUSED(self), PyTiledMap *other, int opid)
 {
 
@@ -5680,150 +7006,221 @@
 
 
 
-
-static int
-_wrap_PyTiledMapObject__tp_init__0(PyTiledMapObject *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
-{
-    const char *keywords[] = {NULL};
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "", (char **) keywords)) {
-        {
-            PyObject *exc_type, *traceback;
-            PyErr_Fetch(&exc_type, return_exception, &traceback);
-            Py_XDECREF(exc_type);
-            Py_XDECREF(traceback);
-        }
-        return -1;
-    }
-    self->obj = new Tiled::MapObject();
-    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return 0;
-}
-
 static int
-_wrap_PyTiledMapObject__tp_init__1(PyTiledMapObject *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+_wrap_PyTiledGroupLayer__tp_init(PyTiledGroupLayer *self, PyObject *args, PyObject *kwargs)
 {
     const char *name;
     Py_ssize_t name_len;
-    const char *type;
-    Py_ssize_t type_len;
-    PyQPointF *pos;
-    PyQSizeF *size;
-    const char *keywords[] = {"name", "type", "pos", "size", NULL};
+    int x;
+    int y;
+    const char *keywords[] = {"name", "x", "y", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#s#O!O!", (char **) keywords, &name, &name_len, &type, &type_len, &PyQPointF_Type, &pos, &PyQSizeF_Type, &size)) {
-        {
-            PyObject *exc_type, *traceback;
-            PyErr_Fetch(&exc_type, return_exception, &traceback);
-            Py_XDECREF(exc_type);
-            Py_XDECREF(traceback);
-        }
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#ii", (char **) keywords, &name, &name_len, &x, &y)) {
         return -1;
     }
-    self->obj = new Tiled::MapObject(QString::fromUtf8(name), QString::fromUtf8(type), *((PyQPointF *) pos)->obj, *((PyQSizeF *) size)->obj);
+    self->obj = new Tiled::GroupLayer(QString::fromUtf8(name), x, y);
     self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
     return 0;
 }
 
-int _wrap_PyTiledMapObject__tp_init(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
-{
-    int retval;
-    PyObject *error_list;
-    PyObject *exceptions[2] = {0,};
-    retval = _wrap_PyTiledMapObject__tp_init__0(self, args, kwargs, &exceptions[0]);
-    if (!exceptions[0]) {
-        return retval;
-    }
-    retval = _wrap_PyTiledMapObject__tp_init__1(self, args, kwargs, &exceptions[1]);
-    if (!exceptions[1]) {
-        Py_DECREF(exceptions[0]);
-        return retval;
-    }
-    error_list = PyList_New(2);
-    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
-    Py_DECREF(exceptions[0]);
-    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
-    Py_DECREF(exceptions[1]);
-    PyErr_SetObject(PyExc_TypeError, error_list);
-    Py_DECREF(error_list);
-    return -1;
-}
-
 
 PyObject *
-_wrap_PyTiledMapObject_cell(PyTiledMapObject *self)
+_wrap_PyTiledGroupLayer_layerAt(PyTiledGroupLayer *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    PyTiledCell *py_Cell;
+    Tiled::Layer *retval;
+    int index;
+    const char *keywords[] = {"index", NULL};
+    PyTiledLayer *py_Layer;
 
-    Tiled::Cell const retval = self->obj->cell();
-    py_Cell = PyObject_New(PyTiledCell, &PyTiledCell_Type);
-    py_Cell->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    py_Cell->obj = new Tiled::Cell(retval);
-    py_retval = Py_BuildValue((char *) "N", py_Cell);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &index)) {
+        return NULL;
+    }
+    retval = self->obj->layerAt(index);
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    py_Layer = PyObject_New(PyTiledLayer, &PyTiledLayer_Type);
+    py_Layer->obj = retval;
+    py_Layer->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_Layer);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_height(PyTiledMapObject *self)
+_wrap_PyTiledGroupLayer_layerCount(PyTiledGroupLayer *self)
 {
     PyObject *py_retval;
-    double retval;
+    int retval;
 
-    retval = self->obj->height();
-    py_retval = Py_BuildValue((char *) "d", retval);
+    retval = self->obj->layerCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
     return py_retval;
 }
 
+static PyMethodDef PyTiledGroupLayer_methods[] = {
+    {(char *) "layerAt", (PyCFunction) _wrap_PyTiledGroupLayer_layerAt, METH_KEYWORDS|METH_VARARGS, "layerAt(index)\n\ntype: index: int" },
+    {(char *) "layerCount", (PyCFunction) _wrap_PyTiledGroupLayer_layerCount, METH_NOARGS, "layerCount()\n\n" },
+    {NULL, NULL, 0, NULL}
+};
 
-PyObject *
-_wrap_PyTiledMapObject_isVisible(PyTiledMapObject *self)
+static void
+_wrap_PyTiledGroupLayer__tp_dealloc(PyTiledGroupLayer *self)
 {
-    PyObject *py_retval;
-    bool retval;
-
-    retval = self->obj->isVisible();
-    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
-    return py_retval;
+        Tiled::GroupLayer *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
 }
 
+static PyObject*
+_wrap_PyTiledGroupLayer__tp_richcompare (PyTiledGroupLayer *PYBINDGEN_UNUSED(self), PyTiledGroupLayer *other, int opid)
+{
 
-PyObject *
-_wrap_PyTiledMapObject_name(PyTiledMapObject *self)
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyTiledGroupLayer_Type)) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+    switch (opid)
+    {
+    case Py_LT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_LE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_EQ:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_NE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    } /* closes switch (opid) */
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+}
+
+PyTypeObject PyTiledGroupLayer_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    (char *) "tiled.Tiled.GroupLayer",            /* tp_name */
+    sizeof(PyTiledGroupLayer),                  /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)_wrap_PyTiledGroupLayer__tp_dealloc,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)NULL,       /* tp_getattr */
+    (setattrfunc)NULL,       /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
+    NULL,
+#else
+    (cmpfunc)NULL,           /* tp_compare */
+#endif
+    (reprfunc)NULL,             /* tp_repr */
+    (PyNumberMethods*)NULL,     /* tp_as_number */
+    (PySequenceMethods*)NULL, /* tp_as_sequence */
+    (PyMappingMethods*)NULL,   /* tp_as_mapping */
+    (hashfunc)NULL,             /* tp_hash */
+    (ternaryfunc)NULL,          /* tp_call */
+    (reprfunc)NULL,              /* tp_str */
+    (getattrofunc)NULL,     /* tp_getattro */
+    (setattrofunc)NULL,     /* tp_setattro */
+    (PyBufferProcs*)NULL,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,                      /* tp_flags */
+    "GroupLayer(name, x, y)",                        /* Documentation string */
+    (traverseproc)NULL,     /* tp_traverse */
+    (inquiry)NULL,             /* tp_clear */
+    (richcmpfunc)_wrap_PyTiledGroupLayer__tp_richcompare,   /* tp_richcompare */
+    0,             /* tp_weaklistoffset */
+    (getiterfunc)NULL,          /* tp_iter */
+    (iternextfunc)NULL,     /* tp_iternext */
+    (struct PyMethodDef*)PyTiledGroupLayer_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    0,                     /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)NULL,    /* tp_descr_get */
+    (descrsetfunc)NULL,    /* tp_descr_set */
+    0,                 /* tp_dictoffset */
+    (initproc)_wrap_PyTiledGroupLayer__tp_init,             /* tp_init */
+    (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
+    (newfunc)PyType_GenericNew,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)NULL,             /* tp_is_gc */
+    NULL,                              /* tp_bases */
+    NULL,                              /* tp_mro */
+    NULL,                              /* tp_cache */
+    NULL,                              /* tp_subclasses */
+    NULL,                              /* tp_weaklist */
+    (destructor) NULL                  /* tp_del */
+};
+
+
+
+
+static int
+_wrap_PyTiledObjectGroup__tp_init(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
-    PyObject *py_retval;
-    QString retval;
+    const char *name;
+    Py_ssize_t name_len;
+    int x;
+    int y;
+    const char *keywords[] = {"name", "x", "y", NULL};
 
-    retval = self->obj->name();
-    py_retval = Py_BuildValue((char *) "s", retval.toUtf8().data());
-    return py_retval;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#ii", (char **) keywords, &name, &name_len, &x, &y)) {
+        return -1;
+    }
+    self->obj = new Tiled::ObjectGroup(QString::fromUtf8(name), x, y);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_rotation(PyTiledMapObject *self)
+_wrap_PyTiledObjectGroup_addObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double retval;
+    PyTiledMapObject *object;
+    Tiled::MapObject *object_ptr;
+    const char *keywords[] = {"object", NULL};
 
-    retval = self->obj->rotation();
-    py_retval = Py_BuildValue((char *) "d", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledMapObject_Type, &object)) {
+        return NULL;
+    }
+    object_ptr = (object ? object->obj : NULL);
+    self->obj->addObject(object_ptr);
+    if (object) {
+        object->obj = NULL;
+    }
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setCell(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledObjectGroup_insertObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    PyTiledCell *c;
-    const char *keywords[] = {"c", NULL};
+    int index;
+    PyTiledMapObject *object;
+    Tiled::MapObject *object_ptr;
+    const char *keywords[] = {"index", "object", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledCell_Type, &c)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iO!", (char **) keywords, &index, &PyTiledMapObject_Type, &object)) {
         return NULL;
     }
-    self->obj->setCell(*((PyTiledCell *) c)->obj);
+    object_ptr = (object ? object->obj : NULL);
+    self->obj->insertObject(index, object_ptr);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -5831,173 +7228,354 @@
 
 
 PyObject *
-_wrap_PyTiledMapObject_setHeight(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledObjectGroup_objectAt(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double h;
-    const char *keywords[] = {"h", NULL};
+    Tiled::MapObject *retval;
+    int index;
+    const char *keywords[] = {"index", NULL};
+    PyTiledMapObject *py_MapObject;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &h)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &index)) {
         return NULL;
     }
-    self->obj->setHeight(h);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    retval = self->obj->objectAt(index);
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    py_MapObject = PyObject_New(PyTiledMapObject, &PyTiledMapObject_Type);
+    py_MapObject->obj = retval;
+    py_MapObject->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_MapObject);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setName(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledObjectGroup_objectCount(PyTiledObjectGroup *self)
 {
     PyObject *py_retval;
-    const char *n;
-    Py_ssize_t n_len;
-    const char *keywords[] = {"n", NULL};
+    int retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#", (char **) keywords, &n, &n_len)) {
-        return NULL;
-    }
-    self->obj->setName(QString::fromUtf8(n));
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    retval = self->obj->objectCount();
+    py_retval = Py_BuildValue((char *) "i", retval);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setPosition(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledObjectGroup_referencesTileset(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    PyQPointF *pos;
-    const char *keywords[] = {"pos", NULL};
+    bool retval;
+    PyTiledTileset *ts;
+    Tiled::Tileset *ts_ptr;
+    const char *keywords[] = {"ts", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQPointF_Type, &pos)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledTileset_Type, &ts)) {
         return NULL;
     }
-    self->obj->setPosition(*((PyQPointF *) pos)->obj);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    ts_ptr = (ts ? ts->obj : NULL);
+    retval = self->obj->referencesTileset(ts_ptr);
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setRotation(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledObjectGroup_removeObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double r;
-    const char *keywords[] = {"r", NULL};
+    int retval;
+    PyTiledMapObject *object;
+    Tiled::MapObject *object_ptr;
+    const char *keywords[] = {"object", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &r)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledMapObject_Type, &object)) {
         return NULL;
     }
-    self->obj->setRotation(r);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    object_ptr = (object ? object->obj : NULL);
+    retval = self->obj->removeObject(object_ptr);
+    py_retval = Py_BuildValue((char *) "i", retval);
     return py_retval;
 }
 
+static PyMethodDef PyTiledObjectGroup_methods[] = {
+    {(char *) "addObject", (PyCFunction) _wrap_PyTiledObjectGroup_addObject, METH_KEYWORDS|METH_VARARGS, "addObject(object)\n\ntype: object: MapObject *" },
+    {(char *) "insertObject", (PyCFunction) _wrap_PyTiledObjectGroup_insertObject, METH_KEYWORDS|METH_VARARGS, "insertObject(index, object)\n\ntype: index: int\ntype: object: MapObject *" },
+    {(char *) "objectAt", (PyCFunction) _wrap_PyTiledObjectGroup_objectAt, METH_KEYWORDS|METH_VARARGS, "objectAt(index)\n\ntype: index: int" },
+    {(char *) "objectCount", (PyCFunction) _wrap_PyTiledObjectGroup_objectCount, METH_NOARGS, "objectCount()\n\n" },
+    {(char *) "referencesTileset", (PyCFunction) _wrap_PyTiledObjectGroup_referencesTileset, METH_KEYWORDS|METH_VARARGS, "referencesTileset(ts)\n\ntype: ts: Tileset *" },
+    {(char *) "removeObject", (PyCFunction) _wrap_PyTiledObjectGroup_removeObject, METH_KEYWORDS|METH_VARARGS, "removeObject(object)\n\ntype: object: MapObject *" },
+    {NULL, NULL, 0, NULL}
+};
+
+static void
+_wrap_PyTiledObjectGroup__tp_dealloc(PyTiledObjectGroup *self)
+{
+        Tiled::ObjectGroup *tmp = self->obj;
+        self->obj = NULL;
+        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
+            delete tmp;
+        }
+    Py_TYPE(self)->tp_free((PyObject*)self);
+}
+
+static PyObject*
+_wrap_PyTiledObjectGroup__tp_richcompare (PyTiledObjectGroup *PYBINDGEN_UNUSED(self), PyTiledObjectGroup *other, int opid)
+{
+
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyTiledObjectGroup_Type)) {
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    }
+    switch (opid)
+    {
+    case Py_LT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_LE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_EQ:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_NE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GE:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    case Py_GT:
+        Py_INCREF(Py_NotImplemented);
+        return Py_NotImplemented;
+    } /* closes switch (opid) */
+    Py_INCREF(Py_NotImplemented);
+    return Py_NotImplemented;
+}
+
+PyTypeObject PyTiledObjectGroup_Type = {
+    PyVarObject_HEAD_INIT(NULL, 0)
+    (char *) "tiled.Tiled.ObjectGroup",            /* tp_name */
+    sizeof(PyTiledObjectGroup),                  /* tp_basicsize */
+    0,                                 /* tp_itemsize */
+    /* methods */
+    (destructor)_wrap_PyTiledObjectGroup__tp_dealloc,        /* tp_dealloc */
+    (printfunc)0,                      /* tp_print */
+    (getattrfunc)NULL,       /* tp_getattr */
+    (setattrfunc)NULL,       /* tp_setattr */
+#if PY_MAJOR_VERSION >= 3
+    NULL,
+#else
+    (cmpfunc)NULL,           /* tp_compare */
+#endif
+    (reprfunc)NULL,             /* tp_repr */
+    (PyNumberMethods*)NULL,     /* tp_as_number */
+    (PySequenceMethods*)NULL, /* tp_as_sequence */
+    (PyMappingMethods*)NULL,   /* tp_as_mapping */
+    (hashfunc)NULL,             /* tp_hash */
+    (ternaryfunc)NULL,          /* tp_call */
+    (reprfunc)NULL,              /* tp_str */
+    (getattrofunc)NULL,     /* tp_getattro */
+    (setattrofunc)NULL,     /* tp_setattro */
+    (PyBufferProcs*)NULL,  /* tp_as_buffer */
+    Py_TPFLAGS_DEFAULT,                      /* tp_flags */
+    "ObjectGroup(name, x, y)",                        /* Documentation string */
+    (traverseproc)NULL,     /* tp_traverse */
+    (inquiry)NULL,             /* tp_clear */
+    (richcmpfunc)_wrap_PyTiledObjectGroup__tp_richcompare,   /* tp_richcompare */
+    0,             /* tp_weaklistoffset */
+    (getiterfunc)NULL,          /* tp_iter */
+    (iternextfunc)NULL,     /* tp_iternext */
+    (struct PyMethodDef*)PyTiledObjectGroup_methods, /* tp_methods */
+    (struct PyMemberDef*)0,              /* tp_members */
+    0,                     /* tp_getset */
+    NULL,                              /* tp_base */
+    NULL,                              /* tp_dict */
+    (descrgetfunc)NULL,    /* tp_descr_get */
+    (descrsetfunc)NULL,    /* tp_descr_set */
+    0,                 /* tp_dictoffset */
+    (initproc)_wrap_PyTiledObjectGroup__tp_init,             /* tp_init */
+    (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
+    (newfunc)PyType_GenericNew,               /* tp_new */
+    (freefunc)0,             /* tp_free */
+    (inquiry)NULL,             /* tp_is_gc */
+    NULL,                              /* tp_bases */
+    NULL,                              /* tp_mro */
+    NULL,                              /* tp_cache */
+    NULL,                              /* tp_subclasses */
+    NULL,                              /* tp_weaklist */
+    (destructor) NULL                  /* tp_del */
+};
+
+
+
+
+
+static int
+_wrap_PyTiledMapObject__tp_init__0(PyTiledMapObject *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    const char *keywords[] = {NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "", (char **) keywords)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new Tiled::MapObject();
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+static int
+_wrap_PyTiledMapObject__tp_init__1(PyTiledMapObject *self, PyObject *args, PyObject *kwargs, PyObject **return_exception)
+{
+    const char *name;
+    Py_ssize_t name_len;
+    const char *type;
+    Py_ssize_t type_len;
+    PyQPointF *pos;
+    PyQSizeF *size;
+    const char *keywords[] = {"name", "type", "pos", "size", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#s#O!O!", (char **) keywords, &name, &name_len, &type, &type_len, &PyQPointF_Type, &pos, &PyQSizeF_Type, &size)) {
+        {
+            PyObject *exc_type, *traceback;
+            PyErr_Fetch(&exc_type, return_exception, &traceback);
+            Py_XDECREF(exc_type);
+            Py_XDECREF(traceback);
+        }
+        return -1;
+    }
+    self->obj = new Tiled::MapObject(QString::fromUtf8(name), QString::fromUtf8(type), *((PyQPointF *) pos)->obj, *((PyQSizeF *) size)->obj);
+    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    return 0;
+}
+
+int _wrap_PyTiledMapObject__tp_init(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+{
+    int retval;
+    PyObject *error_list;
+    PyObject *exceptions[2] = {0,};
+    retval = _wrap_PyTiledMapObject__tp_init__0(self, args, kwargs, &exceptions[0]);
+    if (!exceptions[0]) {
+        return retval;
+    }
+    retval = _wrap_PyTiledMapObject__tp_init__1(self, args, kwargs, &exceptions[1]);
+    if (!exceptions[1]) {
+        Py_DECREF(exceptions[0]);
+        return retval;
+    }
+    error_list = PyList_New(2);
+    PyList_SET_ITEM(error_list, 0, PyObject_Str(exceptions[0]));
+    Py_DECREF(exceptions[0]);
+    PyList_SET_ITEM(error_list, 1, PyObject_Str(exceptions[1]));
+    Py_DECREF(exceptions[1]);
+    PyErr_SetObject(PyExc_TypeError, error_list);
+    Py_DECREF(error_list);
+    return -1;
+}
+
 
 PyObject *
-_wrap_PyTiledMapObject_setShape(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_cell(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    Tiled::MapObject::Shape s;
-    const char *keywords[] = {"s", NULL};
+    PyTiledCell *py_Cell;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &s)) {
-        return NULL;
-    }
-    self->obj->setShape(s);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    Tiled::Cell const retval = self->obj->cell();
+    py_Cell = PyObject_New(PyTiledCell, &PyTiledCell_Type);
+    py_Cell->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
+    py_Cell->obj = new Tiled::Cell(retval);
+    py_retval = Py_BuildValue((char *) "N", py_Cell);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setSize(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_height(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    PyQSizeF *size;
-    const char *keywords[] = {"size", NULL};
+    double retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQSizeF_Type, &size)) {
-        return NULL;
-    }
-    self->obj->setSize(*((PyQSizeF *) size)->obj);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    retval = self->obj->height();
+    py_retval = Py_BuildValue((char *) "d", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMapObject_isVisible(PyTiledMapObject *self)
+{
+    PyObject *py_retval;
+    bool retval;
+
+    retval = self->obj->isVisible();
+    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setType(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_name(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    const char *n;
-    Py_ssize_t n_len;
-    const char *keywords[] = {"n", NULL};
+    QString retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#", (char **) keywords, &n, &n_len)) {
-        return NULL;
-    }
-    self->obj->setType(QString::fromUtf8(n));
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    retval = self->obj->name();
+    py_retval = Py_BuildValue((char *) "s", retval.toUtf8().data());
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setVisible(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_objectGroup(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    bool v;
-    PyObject *py_v;
-    const char *keywords[] = {"v", NULL};
+    Tiled::ObjectGroup *retval;
+    PyTiledObjectGroup *py_ObjectGroup;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O", (char **) keywords, &py_v)) {
-        return NULL;
+    retval = self->obj->objectGroup();
+    if (!(retval)) {
+        Py_INCREF(Py_None);
+        return Py_None;
     }
-    v = (bool) PyObject_IsTrue(py_v);
-    self->obj->setVisible(v);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    py_ObjectGroup = PyObject_New(PyTiledObjectGroup, &PyTiledObjectGroup_Type);
+    py_ObjectGroup->obj = retval;
+    py_ObjectGroup->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
+    py_retval = Py_BuildValue((char *) "N", py_ObjectGroup);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setWidth(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_rotation(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    double w;
-    const char *keywords[] = {"w", NULL};
+    double retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &w)) {
-        return NULL;
-    }
-    self->obj->setWidth(w);
-    Py_INCREF(Py_None);
-    py_retval = Py_None;
+    retval = self->obj->rotation();
+    py_retval = Py_BuildValue((char *) "d", retval);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_setX(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_setCell(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double x;
-    const char *keywords[] = {"x", NULL};
+    PyTiledCell *c;
+    const char *keywords[] = {"c", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &x)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledCell_Type, &c)) {
         return NULL;
     }
-    self->obj->setX(x);
+    self->obj->setCell(*((PyTiledCell *) c)->obj);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -6005,16 +7583,16 @@
 
 
 PyObject *
-_wrap_PyTiledMapObject_setY(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_setHeight(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double y;
-    const char *keywords[] = {"y", NULL};
+    double h;
+    const char *keywords[] = {"h", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &y)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &h)) {
         return NULL;
     }
-    self->obj->setY(y);
+    self->obj->setHeight(h);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -6022,225 +7600,139 @@
 
 
 PyObject *
-_wrap_PyTiledMapObject_shape(PyTiledMapObject *self)
+_wrap_PyTiledMapObject_setName(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    Tiled::MapObject::Shape retval;
+    const char *n;
+    Py_ssize_t n_len;
+    const char *keywords[] = {"n", NULL};
 
-    retval = self->obj->shape();
-    py_retval = Py_BuildValue((char *) "i", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#", (char **) keywords, &n, &n_len)) {
+        return NULL;
+    }
+    self->obj->setName(QString::fromUtf8(n));
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_type(PyTiledMapObject *self)
+_wrap_PyTiledMapObject_setPosition(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    QString retval;
+    PyQPointF *pos;
+    const char *keywords[] = {"pos", NULL};
 
-    retval = self->obj->type();
-    py_retval = Py_BuildValue((char *) "s", retval.toUtf8().data());
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQPointF_Type, &pos)) {
+        return NULL;
+    }
+    self->obj->setPosition(*((PyQPointF *) pos)->obj);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_width(PyTiledMapObject *self)
+_wrap_PyTiledMapObject_setRotation(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double retval;
+    double r;
+    const char *keywords[] = {"r", NULL};
 
-    retval = self->obj->width();
-    py_retval = Py_BuildValue((char *) "d", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &r)) {
+        return NULL;
+    }
+    self->obj->setRotation(r);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_x(PyTiledMapObject *self)
+_wrap_PyTiledMapObject_setShape(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double retval;
+    Tiled::MapObject::Shape s;
+    const char *keywords[] = {"s", NULL};
 
-    retval = self->obj->x();
-    py_retval = Py_BuildValue((char *) "d", retval);
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &s)) {
+        return NULL;
+    }
+    self->obj->setShape(s);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledMapObject_y(PyTiledMapObject *self)
+_wrap_PyTiledMapObject_setSize(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    double retval;
-
-    retval = self->obj->y();
-    py_retval = Py_BuildValue((char *) "d", retval);
-    return py_retval;
-}
-
-static PyMethodDef PyTiledMapObject_methods[] = {
-    {(char *) "cell", (PyCFunction) _wrap_PyTiledMapObject_cell, METH_NOARGS, "cell()\n\n" },
-    {(char *) "height", (PyCFunction) _wrap_PyTiledMapObject_height, METH_NOARGS, "height()\n\n" },
-    {(char *) "isVisible", (PyCFunction) _wrap_PyTiledMapObject_isVisible, METH_NOARGS, "isVisible()\n\n" },
-    {(char *) "name", (PyCFunction) _wrap_PyTiledMapObject_name, METH_NOARGS, "name()\n\n" },
-    {(char *) "rotation", (PyCFunction) _wrap_PyTiledMapObject_rotation, METH_NOARGS, "rotation()\n\n" },
-    {(char *) "setCell", (PyCFunction) _wrap_PyTiledMapObject_setCell, METH_KEYWORDS|METH_VARARGS, "setCell(c)\n\ntype: c: Tiled::Cell const" },
-    {(char *) "setHeight", (PyCFunction) _wrap_PyTiledMapObject_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: double" },
-    {(char *) "setName", (PyCFunction) _wrap_PyTiledMapObject_setName, METH_KEYWORDS|METH_VARARGS, "setName(n)\n\ntype: n: QString" },
-    {(char *) "setPosition", (PyCFunction) _wrap_PyTiledMapObject_setPosition, METH_KEYWORDS|METH_VARARGS, "setPosition(pos)\n\ntype: pos: QPointF" },
-    {(char *) "setRotation", (PyCFunction) _wrap_PyTiledMapObject_setRotation, METH_KEYWORDS|METH_VARARGS, "setRotation(r)\n\ntype: r: double" },
-    {(char *) "setShape", (PyCFunction) _wrap_PyTiledMapObject_setShape, METH_KEYWORDS|METH_VARARGS, "setShape(s)\n\ntype: s: Tiled::MapObject::Shape" },
-    {(char *) "setSize", (PyCFunction) _wrap_PyTiledMapObject_setSize, METH_KEYWORDS|METH_VARARGS, "setSize(size)\n\ntype: size: QSizeF" },
-    {(char *) "setType", (PyCFunction) _wrap_PyTiledMapObject_setType, METH_KEYWORDS|METH_VARARGS, "setType(n)\n\ntype: n: QString" },
-    {(char *) "setVisible", (PyCFunction) _wrap_PyTiledMapObject_setVisible, METH_KEYWORDS|METH_VARARGS, "setVisible(v)\n\ntype: v: bool" },
-    {(char *) "setWidth", (PyCFunction) _wrap_PyTiledMapObject_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: double" },
-    {(char *) "setX", (PyCFunction) _wrap_PyTiledMapObject_setX, METH_KEYWORDS|METH_VARARGS, "setX(x)\n\ntype: x: double" },
-    {(char *) "setY", (PyCFunction) _wrap_PyTiledMapObject_setY, METH_KEYWORDS|METH_VARARGS, "setY(y)\n\ntype: y: double" },
-    {(char *) "shape", (PyCFunction) _wrap_PyTiledMapObject_shape, METH_NOARGS, "shape()\n\n" },
-    {(char *) "type", (PyCFunction) _wrap_PyTiledMapObject_type, METH_NOARGS, "type()\n\n" },
-    {(char *) "width", (PyCFunction) _wrap_PyTiledMapObject_width, METH_NOARGS, "width()\n\n" },
-    {(char *) "x", (PyCFunction) _wrap_PyTiledMapObject_x, METH_NOARGS, "x()\n\n" },
-    {(char *) "y", (PyCFunction) _wrap_PyTiledMapObject_y, METH_NOARGS, "y()\n\n" },
-    {NULL, NULL, 0, NULL}
-};
-
-static void
-_wrap_PyTiledMapObject__tp_dealloc(PyTiledMapObject *self)
-{
-        Tiled::MapObject *tmp = self->obj;
-        self->obj = NULL;
-        if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
-            delete tmp;
-        }
-    Py_TYPE(self)->tp_free((PyObject*)self);
-}
-
-static PyObject*
-_wrap_PyTiledMapObject__tp_richcompare (PyTiledMapObject *PYBINDGEN_UNUSED(self), PyTiledMapObject *other, int opid)
-{
-
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyTiledMapObject_Type)) {
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    }
-    switch (opid)
-    {
-    case Py_LT:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    case Py_LE:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    case Py_EQ:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    case Py_NE:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    case Py_GE:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    case Py_GT:
-        Py_INCREF(Py_NotImplemented);
-        return Py_NotImplemented;
-    } /* closes switch (opid) */
-    Py_INCREF(Py_NotImplemented);
-    return Py_NotImplemented;
-}
+    PyQSizeF *size;
+    const char *keywords[] = {"size", NULL};
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyQSizeF_Type, &size)) {
+        return NULL;
+    }
+    self->obj->setSize(*((PyQSizeF *) size)->obj);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
 
-PyTypeObject PyTiledMapObject_Type = {
-    PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.Tiled.MapObject",            /* tp_name */
-    sizeof(PyTiledMapObject),                  /* tp_basicsize */
-    0,                                 /* tp_itemsize */
-    /* methods */
-    (destructor)_wrap_PyTiledMapObject__tp_dealloc,        /* tp_dealloc */
-    (printfunc)0,                      /* tp_print */
-    (getattrfunc)NULL,       /* tp_getattr */
-    (setattrfunc)NULL,       /* tp_setattr */
-#if PY_MAJOR_VERSION >= 3
-    NULL,
-#else
-    (cmpfunc)NULL,           /* tp_compare */
-#endif
-    (reprfunc)NULL,             /* tp_repr */
-    (PyNumberMethods*)NULL,     /* tp_as_number */
-    (PySequenceMethods*)NULL, /* tp_as_sequence */
-    (PyMappingMethods*)NULL,   /* tp_as_mapping */
-    (hashfunc)NULL,             /* tp_hash */
-    (ternaryfunc)NULL,          /* tp_call */
-    (reprfunc)NULL,              /* tp_str */
-    (getattrofunc)NULL,     /* tp_getattro */
-    (setattrofunc)NULL,     /* tp_setattro */
-    (PyBufferProcs*)NULL,  /* tp_as_buffer */
-    Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "MapObject(name, type, pos, size)\nMapObject()",                        /* Documentation string */
-    (traverseproc)NULL,     /* tp_traverse */
-    (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyTiledMapObject__tp_richcompare,   /* tp_richcompare */
-    0,             /* tp_weaklistoffset */
-    (getiterfunc)NULL,          /* tp_iter */
-    (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyTiledMapObject_methods, /* tp_methods */
-    (struct PyMemberDef*)0,              /* tp_members */
-    0,                     /* tp_getset */
-    NULL,                              /* tp_base */
-    NULL,                              /* tp_dict */
-    (descrgetfunc)NULL,    /* tp_descr_get */
-    (descrsetfunc)NULL,    /* tp_descr_set */
-    0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyTiledMapObject__tp_init,             /* tp_init */
-    (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
-    (newfunc)PyType_GenericNew,               /* tp_new */
-    (freefunc)0,             /* tp_free */
-    (inquiry)NULL,             /* tp_is_gc */
-    NULL,                              /* tp_bases */
-    NULL,                              /* tp_mro */
-    NULL,                              /* tp_cache */
-    NULL,                              /* tp_subclasses */
-    NULL,                              /* tp_weaklist */
-    (destructor) NULL                  /* tp_del */
-};
 
+PyObject *
+_wrap_PyTiledMapObject_setType(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
+{
+    PyObject *py_retval;
+    const char *n;
+    Py_ssize_t n_len;
+    const char *keywords[] = {"n", NULL};
 
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#", (char **) keywords, &n, &n_len)) {
+        return NULL;
+    }
+    self->obj->setType(QString::fromUtf8(n));
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
+}
 
 
-static int
-_wrap_PyTiledObjectGroup__tp_init(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+PyObject *
+_wrap_PyTiledMapObject_setVisible(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
-    const char *name;
-    Py_ssize_t name_len;
-    int x;
-    int y;
-    const char *keywords[] = {"name", "x", "y", NULL};
+    PyObject *py_retval;
+    bool v;
+    PyObject *py_v;
+    const char *keywords[] = {"v", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "s#ii", (char **) keywords, &name, &name_len, &x, &y)) {
-        return -1;
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O", (char **) keywords, &py_v)) {
+        return NULL;
     }
-    self->obj = new Tiled::ObjectGroup(QString::fromUtf8(name), x, y);
-    self->flags = PYBINDGEN_WRAPPER_FLAG_NONE;
-    return 0;
+    v = (bool) PyObject_IsTrue(py_v);
+    self->obj->setVisible(v);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
+    return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_addObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_setWidth(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    PyTiledMapObject *object;
-    Tiled::MapObject *object_ptr;
-    const char *keywords[] = {"object", NULL};
+    double w;
+    const char *keywords[] = {"w", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledMapObject_Type, &object)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &w)) {
         return NULL;
     }
-    object_ptr = (object ? object->obj : NULL);
-    self->obj->addObject(object_ptr);
-    if (object) {
-        object->obj = NULL;
-    }
+    self->obj->setWidth(w);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -6248,19 +7740,16 @@
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_insertObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_setX(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    int idx;
-    PyTiledMapObject *object;
-    Tiled::MapObject *object_ptr;
-    const char *keywords[] = {"idx", "object", NULL};
+    double x;
+    const char *keywords[] = {"x", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "iO!", (char **) keywords, &idx, &PyTiledMapObject_Type, &object)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &x)) {
         return NULL;
     }
-    object_ptr = (object ? object->obj : NULL);
-    self->obj->insertObject(idx, object_ptr);
+    self->obj->setX(x);
     Py_INCREF(Py_None);
     py_retval = Py_None;
     return py_retval;
@@ -6268,93 +7757,112 @@
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_objectAt(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_setY(PyTiledMapObject *self, PyObject *args, PyObject *kwargs)
 {
     PyObject *py_retval;
-    Tiled::MapObject *retval;
-    int index;
-    const char *keywords[] = {"index", NULL};
-    PyTiledMapObject *py_MapObject;
+    double y;
+    const char *keywords[] = {"y", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "i", (char **) keywords, &index)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "d", (char **) keywords, &y)) {
         return NULL;
     }
-    retval = self->obj->objectAt(index);
-    if (!(retval)) {
-        Py_INCREF(Py_None);
-        return Py_None;
-    }
-    py_MapObject = PyObject_New(PyTiledMapObject, &PyTiledMapObject_Type);
-    py_MapObject->obj = retval;
-    py_MapObject->flags = PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED;
-    py_retval = Py_BuildValue((char *) "N", py_MapObject);
+    self->obj->setY(y);
+    Py_INCREF(Py_None);
+    py_retval = Py_None;
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_objectCount(PyTiledObjectGroup *self)
+_wrap_PyTiledMapObject_shape(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    int retval;
+    Tiled::MapObject::Shape retval;
 
-    retval = self->obj->objectCount();
+    retval = self->obj->shape();
     py_retval = Py_BuildValue((char *) "i", retval);
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_referencesTileset(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_type(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    bool retval;
-    PyTiledTileset *ts;
-    Tiled::Tileset *ts_ptr;
-    const char *keywords[] = {"ts", NULL};
+    QString retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledTileset_Type, &ts)) {
-        return NULL;
-    }
-    ts_ptr = (ts ? ts->obj : NULL);
-    retval = self->obj->referencesTileset(ts_ptr);
-    py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
+    retval = self->obj->type();
+    py_retval = Py_BuildValue((char *) "s", retval.toUtf8().data());
     return py_retval;
 }
 
 
 PyObject *
-_wrap_PyTiledObjectGroup_removeObject(PyTiledObjectGroup *self, PyObject *args, PyObject *kwargs)
+_wrap_PyTiledMapObject_width(PyTiledMapObject *self)
 {
     PyObject *py_retval;
-    int retval;
-    PyTiledMapObject *object;
-    Tiled::MapObject *object_ptr;
-    const char *keywords[] = {"object", NULL};
+    double retval;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!", (char **) keywords, &PyTiledMapObject_Type, &object)) {
-        return NULL;
-    }
-    object_ptr = (object ? object->obj : NULL);
-    retval = self->obj->removeObject(object_ptr);
-    py_retval = Py_BuildValue((char *) "i", retval);
+    retval = self->obj->width();
+    py_retval = Py_BuildValue((char *) "d", retval);
     return py_retval;
 }
 
-static PyMethodDef PyTiledObjectGroup_methods[] = {
-    {(char *) "addObject", (PyCFunction) _wrap_PyTiledObjectGroup_addObject, METH_KEYWORDS|METH_VARARGS, "addObject(object)\n\ntype: object: MapObject *" },
-    {(char *) "insertObject", (PyCFunction) _wrap_PyTiledObjectGroup_insertObject, METH_KEYWORDS|METH_VARARGS, "insertObject(idx, object)\n\ntype: idx: int\ntype: object: MapObject *" },
-    {(char *) "objectAt", (PyCFunction) _wrap_PyTiledObjectGroup_objectAt, METH_KEYWORDS|METH_VARARGS, "objectAt(index)\n\ntype: index: int" },
-    {(char *) "objectCount", (PyCFunction) _wrap_PyTiledObjectGroup_objectCount, METH_NOARGS, "objectCount()\n\n" },
-    {(char *) "referencesTileset", (PyCFunction) _wrap_PyTiledObjectGroup_referencesTileset, METH_KEYWORDS|METH_VARARGS, "referencesTileset(ts)\n\ntype: ts: Tileset *" },
-    {(char *) "removeObject", (PyCFunction) _wrap_PyTiledObjectGroup_removeObject, METH_KEYWORDS|METH_VARARGS, "removeObject(object)\n\ntype: object: MapObject *" },
+
+PyObject *
+_wrap_PyTiledMapObject_x(PyTiledMapObject *self)
+{
+    PyObject *py_retval;
+    double retval;
+
+    retval = self->obj->x();
+    py_retval = Py_BuildValue((char *) "d", retval);
+    return py_retval;
+}
+
+
+PyObject *
+_wrap_PyTiledMapObject_y(PyTiledMapObject *self)
+{
+    PyObject *py_retval;
+    double retval;
+
+    retval = self->obj->y();
+    py_retval = Py_BuildValue((char *) "d", retval);
+    return py_retval;
+}
+
+static PyMethodDef PyTiledMapObject_methods[] = {
+    {(char *) "cell", (PyCFunction) _wrap_PyTiledMapObject_cell, METH_NOARGS, "cell()\n\n" },
+    {(char *) "height", (PyCFunction) _wrap_PyTiledMapObject_height, METH_NOARGS, "height()\n\n" },
+    {(char *) "isVisible", (PyCFunction) _wrap_PyTiledMapObject_isVisible, METH_NOARGS, "isVisible()\n\n" },
+    {(char *) "name", (PyCFunction) _wrap_PyTiledMapObject_name, METH_NOARGS, "name()\n\n" },
+    {(char *) "objectGroup", (PyCFunction) _wrap_PyTiledMapObject_objectGroup, METH_NOARGS, "objectGroup()\n\n" },
+    {(char *) "rotation", (PyCFunction) _wrap_PyTiledMapObject_rotation, METH_NOARGS, "rotation()\n\n" },
+    {(char *) "setCell", (PyCFunction) _wrap_PyTiledMapObject_setCell, METH_KEYWORDS|METH_VARARGS, "setCell(c)\n\ntype: c: Tiled::Cell const" },
+    {(char *) "setHeight", (PyCFunction) _wrap_PyTiledMapObject_setHeight, METH_KEYWORDS|METH_VARARGS, "setHeight(h)\n\ntype: h: double" },
+    {(char *) "setName", (PyCFunction) _wrap_PyTiledMapObject_setName, METH_KEYWORDS|METH_VARARGS, "setName(n)\n\ntype: n: QString" },
+    {(char *) "setPosition", (PyCFunction) _wrap_PyTiledMapObject_setPosition, METH_KEYWORDS|METH_VARARGS, "setPosition(pos)\n\ntype: pos: QPointF" },
+    {(char *) "setRotation", (PyCFunction) _wrap_PyTiledMapObject_setRotation, METH_KEYWORDS|METH_VARARGS, "setRotation(r)\n\ntype: r: double" },
+    {(char *) "setShape", (PyCFunction) _wrap_PyTiledMapObject_setShape, METH_KEYWORDS|METH_VARARGS, "setShape(s)\n\ntype: s: Tiled::MapObject::Shape" },
+    {(char *) "setSize", (PyCFunction) _wrap_PyTiledMapObject_setSize, METH_KEYWORDS|METH_VARARGS, "setSize(size)\n\ntype: size: QSizeF" },
+    {(char *) "setType", (PyCFunction) _wrap_PyTiledMapObject_setType, METH_KEYWORDS|METH_VARARGS, "setType(n)\n\ntype: n: QString" },
+    {(char *) "setVisible", (PyCFunction) _wrap_PyTiledMapObject_setVisible, METH_KEYWORDS|METH_VARARGS, "setVisible(v)\n\ntype: v: bool" },
+    {(char *) "setWidth", (PyCFunction) _wrap_PyTiledMapObject_setWidth, METH_KEYWORDS|METH_VARARGS, "setWidth(w)\n\ntype: w: double" },
+    {(char *) "setX", (PyCFunction) _wrap_PyTiledMapObject_setX, METH_KEYWORDS|METH_VARARGS, "setX(x)\n\ntype: x: double" },
+    {(char *) "setY", (PyCFunction) _wrap_PyTiledMapObject_setY, METH_KEYWORDS|METH_VARARGS, "setY(y)\n\ntype: y: double" },
+    {(char *) "shape", (PyCFunction) _wrap_PyTiledMapObject_shape, METH_NOARGS, "shape()\n\n" },
+    {(char *) "type", (PyCFunction) _wrap_PyTiledMapObject_type, METH_NOARGS, "type()\n\n" },
+    {(char *) "width", (PyCFunction) _wrap_PyTiledMapObject_width, METH_NOARGS, "width()\n\n" },
+    {(char *) "x", (PyCFunction) _wrap_PyTiledMapObject_x, METH_NOARGS, "x()\n\n" },
+    {(char *) "y", (PyCFunction) _wrap_PyTiledMapObject_y, METH_NOARGS, "y()\n\n" },
     {NULL, NULL, 0, NULL}
 };
 
 static void
-_wrap_PyTiledObjectGroup__tp_dealloc(PyTiledObjectGroup *self)
+_wrap_PyTiledMapObject__tp_dealloc(PyTiledMapObject *self)
 {
-        Tiled::ObjectGroup *tmp = self->obj;
+        Tiled::MapObject *tmp = self->obj;
         self->obj = NULL;
         if (!(self->flags&PYBINDGEN_WRAPPER_FLAG_OBJECT_NOT_OWNED)) {
             delete tmp;
@@ -6363,10 +7871,10 @@
 }
 
 static PyObject*
-_wrap_PyTiledObjectGroup__tp_richcompare (PyTiledObjectGroup *PYBINDGEN_UNUSED(self), PyTiledObjectGroup *other, int opid)
+_wrap_PyTiledMapObject__tp_richcompare (PyTiledMapObject *PYBINDGEN_UNUSED(self), PyTiledMapObject *other, int opid)
 {
 
-    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyTiledObjectGroup_Type)) {
+    if (!PyObject_IsInstance((PyObject*) other, (PyObject*) &PyTiledMapObject_Type)) {
         Py_INCREF(Py_NotImplemented);
         return Py_NotImplemented;
     }
@@ -6395,13 +7903,13 @@
     return Py_NotImplemented;
 }
 
-PyTypeObject PyTiledObjectGroup_Type = {
+PyTypeObject PyTiledMapObject_Type = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    (char *) "tiled.Tiled.ObjectGroup",            /* tp_name */
-    sizeof(PyTiledObjectGroup),                  /* tp_basicsize */
+    (char *) "tiled.Tiled.MapObject",            /* tp_name */
+    sizeof(PyTiledMapObject),                  /* tp_basicsize */
     0,                                 /* tp_itemsize */
     /* methods */
-    (destructor)_wrap_PyTiledObjectGroup__tp_dealloc,        /* tp_dealloc */
+    (destructor)_wrap_PyTiledMapObject__tp_dealloc,        /* tp_dealloc */
     (printfunc)0,                      /* tp_print */
     (getattrfunc)NULL,       /* tp_getattr */
     (setattrfunc)NULL,       /* tp_setattr */
@@ -6421,14 +7929,14 @@
     (setattrofunc)NULL,     /* tp_setattro */
     (PyBufferProcs*)NULL,  /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                      /* tp_flags */
-    "ObjectGroup(name, x, y)",                        /* Documentation string */
+    "MapObject(name, type, pos, size)\nMapObject()",                        /* Documentation string */
     (traverseproc)NULL,     /* tp_traverse */
     (inquiry)NULL,             /* tp_clear */
-    (richcmpfunc)_wrap_PyTiledObjectGroup__tp_richcompare,   /* tp_richcompare */
+    (richcmpfunc)_wrap_PyTiledMapObject__tp_richcompare,   /* tp_richcompare */
     0,             /* tp_weaklistoffset */
     (getiterfunc)NULL,          /* tp_iter */
     (iternextfunc)NULL,     /* tp_iternext */
-    (struct PyMethodDef*)PyTiledObjectGroup_methods, /* tp_methods */
+    (struct PyMethodDef*)PyTiledMapObject_methods, /* tp_methods */
     (struct PyMemberDef*)0,              /* tp_members */
     0,                     /* tp_getset */
     NULL,                              /* tp_base */
@@ -6436,7 +7944,7 @@
     (descrgetfunc)NULL,    /* tp_descr_get */
     (descrsetfunc)NULL,    /* tp_descr_set */
     0,                 /* tp_dictoffset */
-    (initproc)_wrap_PyTiledObjectGroup__tp_init,             /* tp_init */
+    (initproc)_wrap_PyTiledMapObject__tp_init,             /* tp_init */
     (allocfunc)PyType_GenericAlloc,           /* tp_alloc */
     (newfunc)PyType_GenericNew,               /* tp_new */
     (freefunc)0,             /* tp_free */
@@ -6587,6 +8095,14 @@
 
 
 
+
+
+
+
+
+
+
+
 #if PY_VERSION_HEX >= 0x03000000
 static struct PyModuleDef tiled_Tiled_moduledef = {
     PyModuleDef_HEAD_INIT,
@@ -6665,18 +8181,24 @@
         return NULL;
     }
     PyModule_AddObject(m, (char *) "ImageLayer", (PyObject *) &PyTiledImageLayer_Type);
-    /* Register the 'Tiled::MapObject' class */
-    PyTiledMapObject_Type.tp_base = &PyTiledObject_Type;
-    if (PyType_Ready(&PyTiledMapObject_Type)) {
+    /* Register the 'Tiled::GroupLayer' class */
+    PyTiledGroupLayer_Type.tp_base = &PyTiledLayer_Type;
+    if (PyType_Ready(&PyTiledGroupLayer_Type)) {
         return NULL;
     }
-    PyModule_AddObject(m, (char *) "MapObject", (PyObject *) &PyTiledMapObject_Type);
+    PyModule_AddObject(m, (char *) "GroupLayer", (PyObject *) &PyTiledGroupLayer_Type);
     /* Register the 'Tiled::ObjectGroup' class */
     PyTiledObjectGroup_Type.tp_base = &PyTiledLayer_Type;
     if (PyType_Ready(&PyTiledObjectGroup_Type)) {
         return NULL;
     }
     PyModule_AddObject(m, (char *) "ObjectGroup", (PyObject *) &PyTiledObjectGroup_Type);
+    /* Register the 'Tiled::MapObject' class */
+    PyTiledMapObject_Type.tp_base = &PyTiledObject_Type;
+    if (PyType_Ready(&PyTiledMapObject_Type)) {
+        return NULL;
+    }
+    PyModule_AddObject(m, (char *) "MapObject", (PyObject *) &PyTiledMapObject_Type);
     /* Register the 'Tiled::LoggingInterface' class */
     if (PyType_Ready(&PyTiledLoggingInterface_Type)) {
         return NULL;
@@ -6696,6 +8218,78 @@
         tmp_value = PyLong_FromLong(Tiled::Map::Isometric);
         PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Isometric", tmp_value);
         Py_DECREF(tmp_value);
+         // Tiled::Map::Staggered
+        tmp_value = PyLong_FromLong(Tiled::Map::Staggered);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Staggered", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::Hexagonal
+        tmp_value = PyLong_FromLong(Tiled::Map::Hexagonal);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Hexagonal", tmp_value);
+        Py_DECREF(tmp_value);
+    }
+    {
+        PyObject *tmp_value;
+         // Tiled::Map::XML
+        tmp_value = PyLong_FromLong(Tiled::Map::XML);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "XML", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::Base64
+        tmp_value = PyLong_FromLong(Tiled::Map::Base64);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Base64", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::Base64Gzip
+        tmp_value = PyLong_FromLong(Tiled::Map::Base64Gzip);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Base64Gzip", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::Base64Zlib
+        tmp_value = PyLong_FromLong(Tiled::Map::Base64Zlib);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "Base64Zlib", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::CSV
+        tmp_value = PyLong_FromLong(Tiled::Map::CSV);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "CSV", tmp_value);
+        Py_DECREF(tmp_value);
+    }
+    {
+        PyObject *tmp_value;
+         // Tiled::Map::RightDown
+        tmp_value = PyLong_FromLong(Tiled::Map::RightDown);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "RightDown", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::RightUp
+        tmp_value = PyLong_FromLong(Tiled::Map::RightUp);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "RightUp", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::LeftDown
+        tmp_value = PyLong_FromLong(Tiled::Map::LeftDown);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "LeftDown", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::LeftUp
+        tmp_value = PyLong_FromLong(Tiled::Map::LeftUp);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "LeftUp", tmp_value);
+        Py_DECREF(tmp_value);
+    }
+    {
+        PyObject *tmp_value;
+         // Tiled::Map::StaggerX
+        tmp_value = PyLong_FromLong(Tiled::Map::StaggerX);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "StaggerX", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::StaggerY
+        tmp_value = PyLong_FromLong(Tiled::Map::StaggerY);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "StaggerY", tmp_value);
+        Py_DECREF(tmp_value);
+    }
+    {
+        PyObject *tmp_value;
+         // Tiled::Map::StaggerOdd
+        tmp_value = PyLong_FromLong(Tiled::Map::StaggerOdd);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "StaggerOdd", tmp_value);
+        Py_DECREF(tmp_value);
+         // Tiled::Map::StaggerEven
+        tmp_value = PyLong_FromLong(Tiled::Map::StaggerEven);
+        PyDict_SetItemString((PyObject*) PyTiledMap_Type.tp_dict, "StaggerEven", tmp_value);
+        Py_DECREF(tmp_value);
     }
     {
         PyObject *tmp_value;
@@ -6735,14 +8329,14 @@
     bool retval;
     PyTiledMap *map;
     Tiled::Map *map_ptr;
-    int idx;
-    const char *keywords[] = {"map", "idx", NULL};
+    int index;
+    const char *keywords[] = {"map", "index", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &index)) {
         return NULL;
     }
     map_ptr = (map ? map->obj : NULL);
-    retval = isObjectGroupAt(map_ptr, idx);
+    retval = isObjectGroupAt(map_ptr, index);
     py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
     return py_retval;
 }
@@ -6756,14 +8350,14 @@
     bool retval;
     PyTiledMap *map;
     Tiled::Map *map_ptr;
-    int idx;
-    const char *keywords[] = {"map", "idx", NULL};
+    int index;
+    const char *keywords[] = {"map", "index", NULL};
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &index)) {
         return NULL;
     }
     map_ptr = (map ? map->obj : NULL);
-    retval = isTileLayerAt(map_ptr, idx);
+    retval = isTileLayerAt(map_ptr, index);
     py_retval = Py_BuildValue((char *) "N", PyBool_FromLong(retval));
     return py_retval;
 }
@@ -6799,15 +8393,15 @@
     Tiled::ObjectGroup *retval;
     PyTiledMap *map;
     Tiled::Map *map_ptr;
-    int idx;
-    const char *keywords[] = {"map", "idx", NULL};
+    int index;
+    const char *keywords[] = {"map", "index", NULL};
     PyTiledObjectGroup *py_ObjectGroup;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &index)) {
         return NULL;
     }
     map_ptr = (map ? map->obj : NULL);
-    retval = objectGroupAt(map_ptr, idx);
+    retval = objectGroupAt(map_ptr, index);
     if (!(retval)) {
         Py_INCREF(Py_None);
         return Py_None;
@@ -6828,15 +8422,15 @@
     Tiled::TileLayer *retval;
     PyTiledMap *map;
     Tiled::Map *map_ptr;
-    int idx;
-    const char *keywords[] = {"map", "idx", NULL};
+    int index;
+    const char *keywords[] = {"map", "index", NULL};
     PyTiledTileLayer *py_TileLayer;
 
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &idx)) {
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, (char *) "O!i", (char **) keywords, &PyTiledMap_Type, &map, &index)) {
         return NULL;
     }
     map_ptr = (map ? map->obj : NULL);
-    retval = tileLayerAt(map_ptr, idx);
+    retval = tileLayerAt(map_ptr, index);
     if (!(retval)) {
         Py_INCREF(Py_None);
         return Py_None;
@@ -6850,11 +8444,11 @@
 PyObject * _wrap_tiled_tileLayerAt(PyObject * PYBINDGEN_UNUSED(dummy), PyObject *args, PyObject *kwargs);
 
 static PyMethodDef tiled_functions[] = {
-    {(char *) "isObjectGroupAt", (PyCFunction) _wrap_tiled_isObjectGroupAt, METH_KEYWORDS|METH_VARARGS, "isObjectGroupAt(map, idx)\n\ntype: map: Tiled::Map *\ntype: idx: int" },
-    {(char *) "isTileLayerAt", (PyCFunction) _wrap_tiled_isTileLayerAt, METH_KEYWORDS|METH_VARARGS, "isTileLayerAt(map, idx)\n\ntype: map: Tiled::Map *\ntype: idx: int" },
+    {(char *) "isObjectGroupAt", (PyCFunction) _wrap_tiled_isObjectGroupAt, METH_KEYWORDS|METH_VARARGS, "isObjectGroupAt(map, index)\n\ntype: map: Tiled::Map *\ntype: index: int" },
+    {(char *) "isTileLayerAt", (PyCFunction) _wrap_tiled_isTileLayerAt, METH_KEYWORDS|METH_VARARGS, "isTileLayerAt(map, index)\n\ntype: map: Tiled::Map *\ntype: index: int" },
     {(char *) "loadTilesetFromFile", (PyCFunction) _wrap_tiled_loadTilesetFromFile, METH_KEYWORDS|METH_VARARGS, "loadTilesetFromFile(ts, file)\n\ntype: ts: Tileset *\ntype: file: QString" },
-    {(char *) "objectGroupAt", (PyCFunction) _wrap_tiled_objectGroupAt, METH_KEYWORDS|METH_VARARGS, "objectGroupAt(map, idx)\n\ntype: map: Tiled::Map *\ntype: idx: int" },
-    {(char *) "tileLayerAt", (PyCFunction) _wrap_tiled_tileLayerAt, METH_KEYWORDS|METH_VARARGS, "tileLayerAt(map, idx)\n\ntype: map: Tiled::Map *\ntype: idx: int" },
+    {(char *) "objectGroupAt", (PyCFunction) _wrap_tiled_objectGroupAt, METH_KEYWORDS|METH_VARARGS, "objectGroupAt(map, index)\n\ntype: map: Tiled::Map *\ntype: index: int" },
+    {(char *) "tileLayerAt", (PyCFunction) _wrap_tiled_tileLayerAt, METH_KEYWORDS|METH_VARARGS, "tileLayerAt(map, index)\n\ntype: map: Tiled::Map *\ntype: index: int" },
     {NULL, NULL, 0, NULL}
 };
 /* --- classes --- */
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/python/qtbinding.py tiled-qt-1.2.4+dfsg.1/src/plugins/python/qtbinding.py
--- tiled-qt-1.2.1+dfsg.1/src/plugins/python/qtbinding.py	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/python/qtbinding.py	2019-05-15 15:33:52.000000000 +0000
@@ -120,19 +120,37 @@
   mod.add_include('<QFlags>')
   #mod.add_include('"qtbind.h"')
 
+  cls_qpoint = mod.add_class('QPoint')
+  cls_qpoint.add_copy_constructor()
+  cls_qpoint.add_constructor([('int','x'),('int','y')])
+  cls_qpoint.add_method('x', 'int', [])
+  cls_qpoint.add_method('setX', None, [('int','x')])
+  cls_qpoint.add_method('y', 'int', [])
+  cls_qpoint.add_method('setY', None, [('int','y')])
+
   cls_qpointf = mod.add_class('QPointF')
-  cls_qpointf.add_constructor([('float','x'),('float','y')])
-  cls_qpointf.add_method('x', 'int', [])
-  cls_qpointf.add_method('setX', None, [('int','x')])
-  cls_qpointf.add_method('y', 'int', [])
-  cls_qpointf.add_method('setY', None, [('int','y')])
+  cls_qpointf.add_copy_constructor()
+  cls_qpointf.add_constructor([('double','x'),('double','y')])
+  cls_qpointf.add_method('x', 'double', [])
+  cls_qpointf.add_method('setX', None, [('double','x')])
+  cls_qpointf.add_method('y', 'double', [])
+  cls_qpointf.add_method('setY', None, [('double','y')])
+
+  cls_size = mod.add_class('QSize')
+  cls_size.add_copy_constructor()
+  cls_size.add_constructor([('int','w'),('int','h')])
+  cls_size.add_method('width', 'int', [])
+  cls_size.add_method('setWidth', None, [('int','w')])
+  cls_size.add_method('height', 'int', [])
+  cls_size.add_method('setHeight', None, [('int','h')])
 
   cls_sizef = mod.add_class('QSizeF')
-  cls_sizef.add_constructor([('float','w'),('float','h')])
-  cls_sizef.add_method('width', 'int', [])
-  cls_sizef.add_method('setWidth', None, [('int','w')])
-  cls_sizef.add_method('height', 'int', [])
-  cls_sizef.add_method('setHeight', None, [('int','h')])
+  cls_sizef.add_copy_constructor()
+  cls_sizef.add_constructor([('double','w'),('double','h')])
+  cls_sizef.add_method('width', 'double', [])
+  cls_sizef.add_method('setWidth', None, [('double','w')])
+  cls_sizef.add_method('height', 'double', [])
+  cls_sizef.add_method('setHeight', None, [('double','h')])
 
   cls_qrgb = mod.add_class('QRgb')
   cls_qrgb.add_copy_constructor()
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/python/tiledbinding.py tiled-qt-1.2.4+dfsg.1/src/plugins/python/tiledbinding.py
--- tiled-qt-1.2.1+dfsg.1/src/plugins/python/tiledbinding.py	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/python/tiledbinding.py	2019-05-15 15:33:52.000000000 +0000
@@ -53,13 +53,14 @@
 mod.functions = SimpleSortedDict()
 
 mod.add_include('"pythonplugin.h"')
-mod.add_include('"map.h"')
+mod.add_include('"grouplayer.h"')
+mod.add_include('"imagelayer.h"')
 mod.add_include('"layer.h"')
-mod.add_include('"tile.h"')
+mod.add_include('"map.h"')
 mod.add_include('"mapobject.h"')
-mod.add_include('"imagelayer.h"')
-mod.add_include('"tilelayer.h"')
 mod.add_include('"objectgroup.h"')
+mod.add_include('"tile.h"')
+mod.add_include('"tilelayer.h"')
 mod.add_include('"tileset.h"')
 
 mod.header.writeln('#ifndef _MSC_VER')
@@ -74,10 +75,10 @@
 
 tiled = mod.add_cpp_namespace('Tiled')
 
-cls_props = tiled.add_class('Properties')
-cls_props.add_copy_constructor()
-cls_props.add_method('keys', 'QList<QString>', [])
-#cls_propsc = tiled.add_container('QMap<QString,QString>', ('QString','QString'), 'map', cls_props)
+cls_properties = tiled.add_class('Properties')
+cls_properties.add_copy_constructor()
+cls_properties.add_method('keys', 'QList<QString>', [])
+#cls_propsc = tiled.add_container('QMap<QString,QString>', ('QString','QString'), 'map', cls_properties)
 
 cls_object = tiled.add_class('Object')
 cls_object.add_method('properties', retval('Tiled::Properties','p'), [])
@@ -91,13 +92,14 @@
 cls_tile.add_method('setImage', None, [('const QPixmap&','image')])
 cls_tile.add_method('width', 'int', [])
 cls_tile.add_method('height', 'int', [])
-#cls_tile.add_method('size', 'QSize', [])
+cls_tile.add_method('size', 'QSize', [])
 
 cls_tileset = tiled.add_class('Tileset', cls_object)
 cls_sharedtileset = tiled.add_class('SharedTileset')
 cls_sharedtileset.add_copy_constructor()
 cls_sharedtileset.add_method('data', retval('Tiled::Tileset*',reference_existing_object=True), [])
 
+#cls_tileset.add_enum('Orientation', ('Orthogonal','Isometric'))
 cls_tileset.add_method('create', 'Tiled::SharedTileset',
                        [('QString','name'), ('int','tileWidth'), ('int','tileHeight'), ('int','tileSpacing'), ('int','margin')],
                        is_static=True)
@@ -110,17 +112,29 @@
 cls_tileset.add_method('tileHeight', 'int', [])
 cls_tileset.add_method('tileSpacing', 'int', [])
 cls_tileset.add_method('margin', 'int', [])
-#cls_tileset.add_method('tileOffset', 'QPoint', [])
+cls_tileset.add_method('tileOffset', 'QPoint', [])
+cls_tileset.add_method('setTileOffset', None, [('QPoint','offset')])
+#cls_tileset.add_method('orientation', 'Orientation', [])
+#cls_tileset.add_method('setOrientation', None, [('Orientation', 'orientation')])
+cls_tileset.add_method('gridSize', 'QSize', [])
+cls_tileset.add_method('setGridSize', None, [('QSize', 'gridSize')])
 cls_tileset.add_method('loadFromImage', 'bool',
     [('const QImage&','img'),('QString','file')])
+cls_tileset.add_method('loadImage', 'bool', [])
+cls_tileset.add_method('findTile',
+    retval('Tiled::Tile*',reference_existing_object=True), [('int','id')])
 cls_tileset.add_method('tileAt',
     retval('Tiled::Tile*',reference_existing_object=True), [('int','id')])
 cls_tileset.add_method('tileCount', 'int', [])
 cls_tileset.add_method('columnCount', 'int', [])
+cls_tileset.add_method('rowCount', 'int', [])
 cls_tileset.add_method('imageWidth', 'int', [])
 cls_tileset.add_method('imageHeight', 'int', [])
 cls_tileset.add_method('setTransparentColor', None, [('QColor','col')])
 cls_tileset.add_method('transparentColor', 'QColor', [])
+cls_tileset.add_method('imageSourceString', 'QString', [])
+cls_tileset.add_method('setImageSource', None, [('QString','source')])
+cls_tileset.add_method('isCollection', 'bool', [])
 
 cls_tile.add_constructor([param('const QPixmap&','image'), param('int','id'),
     param('Tileset*','tileset',transfer_ownership=False)])
@@ -133,21 +147,40 @@
 #                retval('Tiled::Tileset*',caller_owns_return=False), 'list')
 
 cls_map = tiled.add_class('Map', cls_object)
-cls_map.add_enum('Orientation', ('Unknown','Orthogonal','Isometric'))
+cls_map.add_enum('Orientation', ('Unknown','Orthogonal','Isometric','Staggered','Hexagonal'))
+cls_map.add_enum('LayerDataFormat', ('XML','Base64','Base64Gzip','Base64Zlib','CSV'))
+cls_map.add_enum('RenderOrder', ('RightDown','RightUp','LeftDown','LeftUp'))
+cls_map.add_enum('StaggerAxis', ('StaggerX','StaggerY'))
+cls_map.add_enum('StaggerIndex', ('StaggerOdd','StaggerEven'))
 cls_map.add_copy_constructor()
 cls_map.add_constructor([('Orientation','orient'), ('int','w'), ('int','h'),
     ('int','tileW'), ('int','tileH')])
 cls_map.add_method('orientation', 'Orientation', [])
-cls_map.add_method('setOrientation', None, [('Orientation','o')])
+cls_map.add_method('setOrientation', None, [('Orientation','orientation')])
+cls_map.add_method('renderOrder', 'RenderOrder', [])
+cls_map.add_method('setRenderOrder', None, [('RenderOrder','renderOrder')])
 cls_map.add_method('width', 'int', [])
 cls_map.add_method('setWidth', None, [('int','w')])
 cls_map.add_method('height', 'int', [])
 cls_map.add_method('setHeight', None, [('int','h')])
 cls_map.add_method('tileWidth', 'int', [])
 cls_map.add_method('tileHeight', 'int', [])
+cls_map.add_method('tileSize', 'QSize', [])
+cls_map.add_method('infinite', 'bool', [])
+cls_map.add_method('setInfinite', None, [('bool','infinite')])
+cls_map.add_method('hexSideLength', 'int', [])
+cls_map.add_method('setHexSideLength', None, [('int', 'hexSideLength')])
+cls_map.add_method('staggerAxis', 'StaggerAxis', [])
+cls_map.add_method('setStaggerAxis', None, [('StaggerAxis','staggerAxis')])
+cls_map.add_method('staggerIndex', 'StaggerIndex', [])
+cls_map.add_method('setStaggerIndex', None, [('StaggerIndex','staggerIndex')])
 cls_map.add_method('layerCount', 'int', [])
 cls_map.add_method('tileLayerCount', 'int', [])
 cls_map.add_method('objectGroupCount', 'int', [])
+cls_map.add_method('imageLayerCount', 'int', [])
+cls_map.add_method('groupLayerCount', 'int', [])
+cls_map.add_method('backgroundColor', 'QColor', [])
+cls_map.add_method('setBackgroundColor', None, [('QColor','col')])
 cls_map.add_method('addTileset', None,
     [param('SharedTileset','tileset')])
 cls_map.add_method('insertTileset', None,
@@ -160,10 +193,14 @@
      param('SharedTileset','newTileset')])
 cls_map.add_method('tilesetAt',
     retval('Tiled::SharedTileset'),
-    [('int','idx')])
+    [('int','index')])
 cls_map.add_method('tilesetCount', 'int', [])
 cls_map.add_method('isTilesetUsed', 'bool',
     [param('const Tileset*','tileset')])
+cls_map.add_method('nextLayerId', 'int', [])
+cls_map.add_method('setNextLayerId', None, [('int', 'nextLayerId')])
+cls_map.add_method('nextObjectId', 'int', [])
+cls_map.add_method('setNextObjectId', None, [('int', 'nextObjectId')])
 
 cls_cell = tiled.add_class('Cell')
 cls_cell.add_constructor([param('Tiled::Tile*','tile',transfer_ownership=False)])
@@ -200,6 +237,13 @@
 cls_imagelayer.add_method('image', retval('const QPixmap&'), [])
 cls_imagelayer.add_method('setImage', None, [('const QPixmap&','image')])
 
+cls_grouplayer = tiled.add_class('GroupLayer', cls_layer)
+cls_grouplayer.add_constructor([('QString','name'), ('int','x'), ('int','y')])
+cls_grouplayer.add_method('layerCount', 'int', [])
+cls_grouplayer.add_method('layerAt', retval('Tiled::Layer*',reference_existing_object=True), [('int','index')])
+
+cls_objectgroup = tiled.add_class('ObjectGroup', cls_layer)
+
 cls_mapobject = tiled.add_class('MapObject', cls_object)
 cls_mapobject.add_constructor([])
 cls_mapobject.add_constructor([('QString','name'), ('QString','type'),
@@ -223,7 +267,7 @@
 cls_mapobject.add_method('setCell', None, [param('const Tiled::Cell','c',)])
 cls_mapobject.add_method('cell', retval('const Tiled::Cell'), [])
 #cls_mapobject.add_method('setObjectGroup', 'ObjectGroup*', [])
-#cls_mapobject.add_method('objectGroup', 'ObjectGroup*', [])
+cls_mapobject.add_method('objectGroup', retval('Tiled::ObjectGroup*',reference_existing_object=True), [])
 cls_mapobject.add_method('rotation', 'double', [])
 cls_mapobject.add_method('setRotation', None, [('double','r')])
 cls_mapobject.add_method('isVisible', 'bool', [])
@@ -233,84 +277,85 @@
 cls_mapobject.add_method('type', 'QString', [])
 cls_mapobject.add_method('setType', None, [('QString','n')])
 
-cls_objectgroup = tiled.add_class('ObjectGroup', cls_layer)
 cls_objectgroup.add_constructor([('QString','name'), ('int','x'), ('int','y')])
 cls_objectgroup.add_method('addObject', None,
     [param('MapObject*','object',transfer_ownership=True)])
 cls_objectgroup.add_method('insertObject', None,
-    [('int','idx'),param('MapObject*','object',transfer_ownership=False)])
+    [('int','index'),param('MapObject*','object',transfer_ownership=False)])
 cls_objectgroup.add_method('removeObject', 'int',
     [param('MapObject*','object',transfer_ownership=False)])
-#cls_tilelayer.add_method('cellAt', retval('Tiled::Cell'),
-#    [('int','x'),('int','y')])
 cls_objectgroup.add_method('objectAt', retval('Tiled::MapObject*',reference_existing_object=True),[('int','index')])
 cls_objectgroup.add_method('objectCount', 'int',[])
 #cls_objectgroup.add_method('objectsBoundingRect', 'QRectF', [])
 #cls_objectgroup.add_method('usedTilesets', 'QSet<Tileset*>', [])
 cls_objectgroup.add_method('referencesTileset', 'bool',
     [param('Tileset*','ts',transfer_ownership=False)])
-#MapObject *objectAt(int index)
 
-cls_map.add_method('addLayer', None,
-    [param('ImageLayer*','l',transfer_ownership=True)])
-cls_map.add_method('addLayer', None,
-    [param('TileLayer*','l',transfer_ownership=True)])
-cls_map.add_method('addLayer', None,
-    [param('ObjectGroup*','l',transfer_ownership=True)])
+cls_map.add_method('addLayer', None, [param('TileLayer*','l',transfer_ownership=True)])
+cls_map.add_method('addLayer', None, [param('ObjectGroup*','l',transfer_ownership=True)])
+cls_map.add_method('addLayer', None, [param('ImageLayer*','l',transfer_ownership=True)])
+cls_map.add_method('addLayer', None, [param('GroupLayer*','l',transfer_ownership=True)])
 
-cls_map.add_method('layerAt',
-    retval('Tiled::Layer*',reference_existing_object=True), [('int','idx')])
+cls_map.add_method('layerAt', retval('Tiled::Layer*',reference_existing_object=True), [('int','index')])
 
 cls_layer.add_method('name', 'QString', [])
 cls_layer.add_method('setName', None, [('QString','name')])
 cls_layer.add_method('opacity', 'double', [])
 cls_layer.add_method('setOpacity', None, [('double','opacity')])
 cls_layer.add_method('isVisible', 'bool', [])
+cls_layer.add_method('isLocked', 'bool', [])
+cls_layer.add_method('isUnlocked', 'bool', [])
+cls_layer.add_method('isHidden', 'bool', [])
 cls_layer.add_method('setVisible', None, [('bool','visible')])
+cls_layer.add_method('setLocked', None, [('bool','locked')])
 cls_layer.add_method('map', retval('Tiled::Map*',reference_existing_object=True), [])
 cls_layer.add_method('x', 'int', [])
 cls_layer.add_method('setX', None, [('int','x')])
 cls_layer.add_method('y', 'int', [])
 cls_layer.add_method('setY', None, [('int','y')])
 cls_layer.add_method('setPosition', None, [('int','x'),('int','y')])
-cls_layer.add_method('asTileLayer',
-    retval('Tiled::TileLayer*',reference_existing_object=True), [], is_virtual=True)
-cls_layer.add_method('asObjectGroup',
-    retval('Tiled::ObjectGroup*',reference_existing_object=True), [], is_virtual=True)
+cls_layer.add_method('isTileLayer', 'bool', [])
+cls_layer.add_method('isObjectGroup', 'bool', [])
+cls_layer.add_method('isImageLayer', 'bool', [])
+cls_layer.add_method('isGroupLayer', 'bool', [])
+cls_layer.add_method('asTileLayer', retval('Tiled::TileLayer*',reference_existing_object=True), [])
+cls_layer.add_method('asObjectGroup', retval('Tiled::ObjectGroup*',reference_existing_object=True), [])
+cls_layer.add_method('asImageLayer', retval('Tiled::ImageLayer*',reference_existing_object=True), [])
+cls_layer.add_method('asGroupLayer', retval('Tiled::GroupLayer*',reference_existing_object=True), [])
 
 
 mod.body.writeln("""
-bool isImageLayerAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::ImageLayer*>(map->layerAt(idx)) != 0);
+bool isImageLayerAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::ImageLayer*>(map->layerAt(index)) != 0);
 }
-bool isTileLayerAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::TileLayer*>(map->layerAt(idx)) != 0);
+bool isTileLayerAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::TileLayer*>(map->layerAt(index)) != 0);
 }
-bool isObjectGroupAt(Tiled::Map *map, int idx) {
-    return (dynamic_cast<const Tiled::ObjectGroup*>(map->layerAt(idx)) != 0);
+bool isObjectGroupAt(Tiled::Map *map, int index) {
+    return (dynamic_cast<const Tiled::ObjectGroup*>(map->layerAt(index)) != 0);
 }
-Tiled::ImageLayer* imageLayerAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::ImageLayer*>(map->layerAt(idx));
+Tiled::ImageLayer* imageLayerAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::ImageLayer*>(map->layerAt(index));
 }
-Tiled::TileLayer* tileLayerAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::TileLayer*>(map->layerAt(idx));
+Tiled::TileLayer* tileLayerAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::TileLayer*>(map->layerAt(index));
 }
-Tiled::ObjectGroup* objectGroupAt(Tiled::Map *map, int idx) {
-    return static_cast<Tiled::ObjectGroup*>(map->layerAt(idx));
+Tiled::ObjectGroup* objectGroupAt(Tiled::Map *map, int index) {
+    return static_cast<Tiled::ObjectGroup*>(map->layerAt(index));
 }
 """)
 
 mod.add_function('isTileLayerAt', 'bool',
-    [param('Tiled::Map*','map',transfer_ownership=False),('int','idx')])
+    [param('Tiled::Map*','map',transfer_ownership=False),('int','index')])
 mod.add_function('isObjectGroupAt', 'bool',
-    [param('Tiled::Map*','map',transfer_ownership=False),('int','idx')])
+    [param('Tiled::Map*','map',transfer_ownership=False),('int','index')])
 
 mod.add_function('tileLayerAt',
     retval('Tiled::TileLayer*',reference_existing_object=True),
-    [param('Tiled::Map*','map',transfer_ownership=False),('int','idx')])
+    [param('Tiled::Map*','map',transfer_ownership=False),('int','index')])
 mod.add_function('objectGroupAt',
     retval('Tiled::ObjectGroup*',reference_existing_object=True),
-    [param('Tiled::Map*','map',transfer_ownership=False),('int','idx')])
+    [param('Tiled::Map*','map',transfer_ownership=False),('int','index')])
 
 
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/plugins/tbin/tbinplugin.cpp tiled-qt-1.2.4+dfsg.1/src/plugins/tbin/tbinplugin.cpp
--- tiled-qt-1.2.1+dfsg.1/src/plugins/tbin/tbinplugin.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/plugins/tbin/tbinplugin.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -42,32 +42,32 @@
 {
     void tbinToTiledProperties(const tbin::Properties &props, Tiled::Object *obj)
     {
-        for (const std::pair<std::string, tbin::PropertyValue> &prop : props) {
+        for (const auto &prop : props) {
             if (prop.first[0] == '@')
                 continue;
             switch (prop.second.type) {
                 case tbin::PropertyValue::String:
-                    obj->setProperty(prop.first.c_str(), QVariant(prop.second.dataStr.c_str()));
+                    obj->setProperty(QString::fromStdString(prop.first), QString::fromStdString(prop.second.dataStr));
                     break;
 
                 case tbin::PropertyValue::Bool:
-                    obj->setProperty(prop.first.c_str(), QVariant(prop.second.data.b));
+                    obj->setProperty(QString::fromStdString(prop.first), prop.second.data.b);
                     break;
 
                 case tbin::PropertyValue::Float:
-                    obj->setProperty(prop.first.c_str(), QVariant(prop.second.data.f));
+                    obj->setProperty(QString::fromStdString(prop.first), prop.second.data.f);
                     break;
 
                 case tbin::PropertyValue::Integer:
-                    obj->setProperty(prop.first.c_str(), QVariant(prop.second.data.i));
+                    obj->setProperty(QString::fromStdString(prop.first), prop.second.data.i);
                     break;
             }
         }
     }
 
-    void tiledToTbinProperties(const Tiled::Object *obj, tbin::Properties &props)
+    void tiledToTbinProperties(const Tiled::Properties &properties, tbin::Properties &tprops)
     {
-        for (auto it = obj->properties().cbegin(); it != obj->properties().cend(); ++it) {
+        for (auto it = properties.cbegin(), it_end = properties.cend(); it != it_end; ++it) {
             tbin::PropertyValue prop;
 
             switch (it.value().userType()) {
@@ -92,7 +92,7 @@
                 throw std::invalid_argument(QT_TRANSLATE_NOOP("TbinMapFormat", "Unsupported property type"));
             }
 
-            props.insert(std::make_pair(it.key().toStdString(), prop));
+            tprops.insert(std::make_pair(it.key().toStdString(), prop));
         }
     }
 }
@@ -146,27 +146,23 @@
             if (ttilesheet.margin.x != ttilesheet.margin.y)
                 throw std::invalid_argument(QT_TR_NOOP("Tilesheet must have equal margins."));
 
-            auto tilesheet = Tiled::Tileset::create(ttilesheet.id.c_str(), ttilesheet.tileSize.x, ttilesheet.tileSize.y, ttilesheet.spacing.x, ttilesheet.margin.x);
-            tilesheet->setImageSource(Tiled::toUrl(QString::fromStdString(ttilesheet.image), fileDir));
-            if (!tilesheet->loadImage()) {
-                QList<Tiled::Tile*> tiles;
-                for (int i = 0; i < ttilesheet.sheetSize.x * ttilesheet.sheetSize.y; ++i) {
-                    tiles.append(new Tiled::Tile(i, tilesheet.data()));
-                }
-                tilesheet->addTiles(tiles);
-            }
-            tbinToTiledProperties(ttilesheet.props, tilesheet.data());
+            auto tileset = Tiled::Tileset::create(ttilesheet.id.c_str(), ttilesheet.tileSize.x, ttilesheet.tileSize.y, ttilesheet.spacing.x, ttilesheet.margin.x);
+            tileset->setImageSource(Tiled::toUrl(QString::fromStdString(ttilesheet.image).replace("\\", "/"), fileDir));
+            tileset->loadImage();
+
+            tbinToTiledProperties(ttilesheet.props, tileset.data());
 
-            for (auto prop : ttilesheet.props) {
+            for (const auto &prop : ttilesheet.props) {
                 if (prop.first[0] != '@')
                     continue;
 
-                QStringList strs = QString(prop.first.c_str()).split('@');
-                if (strs[1] == "TileIndex") {
+                const QString name = QString::fromStdString(prop.first);
+                const QVector<QStringRef> strs = name.splitRef('@');
+                if (strs[1] == QLatin1String("TileIndex")) {
                     int index = strs[2].toInt();
                     tbin::Properties dummyProps;
-                    dummyProps.insert(std::make_pair(strs[3].toStdString(), prop.second));
-                    Tiled::Tile* tile = tilesheet->tileAt(index);
+                    dummyProps.insert(std::make_pair(strs[3].toUtf8().constData(), prop.second));
+                    Tiled::Tile *tile = tileset->findOrCreateTile(index);
                     tbinToTiledProperties(dummyProps, tile);
                 }
                 // TODO: 'AutoTile' ?
@@ -174,15 +170,15 @@
                 // (In tIDE, right click a tilesheet and choose "Auto Tiles..."
             }
 
-            map->addTileset(tilesheet);
+            map->addTileset(tileset);
         }
         for (const tbin::Layer& tlayer : tmap.layers) {
             if (tlayer.tileSize.x != firstLayer.tileSize.x || tlayer.tileSize.y != firstLayer.tileSize.y)
                 throw std::invalid_argument(QT_TR_NOOP("Different tile sizes per layer are not supported."));
 
-            std::unique_ptr<Tiled::TileLayer> layer(new Tiled::TileLayer(tlayer.id.c_str(), 0, 0, tlayer.layerSize.x, tlayer.layerSize.y));
+            std::unique_ptr<Tiled::TileLayer> layer(new Tiled::TileLayer(QString::fromStdString(tlayer.id), 0, 0, tlayer.layerSize.x, tlayer.layerSize.y));
             tbinToTiledProperties(tlayer.props, layer.get());
-            std::unique_ptr<Tiled::ObjectGroup> objects(new Tiled::ObjectGroup(tlayer.id.c_str(), 0, 0));
+            std::unique_ptr<Tiled::ObjectGroup> objects(new Tiled::ObjectGroup(QString::fromStdString(tlayer.id), 0, 0));
             for (std::size_t i = 0; i < tlayer.tiles.size(); ++i) {
                 const tbin::Tile& ttile = tlayer.tiles[i];
                 int ix = static_cast<int>(i % static_cast<std::size_t>(tlayer.layerSize.x));
@@ -194,7 +190,7 @@
                 Tiled::Cell cell;
                 if (ttile.animatedData.frames.size() > 0) {
                     tbin::Tile tfirstTile = ttile.animatedData.frames[0];
-                    Tiled::Tile* firstTile = map->tilesetAt(tmapTilesheetMapping[tfirstTile.tilesheet])->tileAt(tfirstTile.staticData.tileIndex);
+                    Tiled::Tile* firstTile = map->tilesetAt(tmapTilesheetMapping[tfirstTile.tilesheet])->findOrCreateTile(tfirstTile.staticData.tileIndex);
                     QVector<Tiled::Frame> frames;
                     for (const tbin::Tile& tframe : ttile.animatedData.frames) {
                         if (tframe.isNullTile() || tframe.animatedData.frames.size() > 0 ||
@@ -210,7 +206,7 @@
                     cell = Tiled::Cell(firstTile);
                 }
                 else {
-                    cell = Tiled::Cell(map->tilesetAt(tmapTilesheetMapping[ttile.tilesheet])->tileAt(ttile.staticData.tileIndex));
+                    cell = Tiled::Cell(map->tilesetAt(tmapTilesheetMapping[ttile.tilesheet]).data(), ttile.staticData.tileIndex);
                 }
                 layer->setCell(ix, iy, cell);
 
@@ -236,7 +232,7 @@
     try {
         tbin::Map tmap;
         //tmap.id = map->name();
-        tiledToTbinProperties(map, tmap.props);
+        tiledToTbinProperties(map->properties(), tmap.props);
 
         const QDir fileDir(QFileInfo(fileName).dir());
 
@@ -250,16 +246,16 @@
             ttilesheet.sheetSize.y = tilesheet->rowCount();
             ttilesheet.tileSize.x = tilesheet->tileSize().width();
             ttilesheet.tileSize.y = tilesheet->tileSize().height();
-            tiledToTbinProperties(map, tmap.props);
+            tiledToTbinProperties(tilesheet->properties(), ttilesheet.props);
 
+            Tiled::Properties tilesetTileProperties;
             for (auto tile : tilesheet->tiles()) {
-                Tiled::Object obj(Tiled::Object::TileType);
-                auto props = tile->properties();
-                for (auto it = props.begin(); it != props.end(); ++it) {
-                    obj.setProperty("@TileIndex@" + QString::number(tile->id()) + "@" + it.key(), it.value());
+                const auto &props = tile->properties();
+                for (auto it = props.begin(), it_end = props.end(); it != it_end; ++it) {
+                    tilesetTileProperties.insert("@TileIndex@" + QString::number(tile->id()) + "@" + it.key(), it.value());
                 }
-                tiledToTbinProperties(&obj, ttilesheet.props);
             }
+            tiledToTbinProperties(tilesetTileProperties, ttilesheet.props);
 
             tmap.tilesheets.push_back(std::move(ttilesheet));
         }
@@ -306,7 +302,7 @@
                         tlayer.tiles.push_back(ttile);
                     }
                 }
-                tiledToTbinProperties(layer, tlayer.props);
+                tiledToTbinProperties(layer->properties(), tlayer.props);
                 tmap.layers.push_back(std::move(tlayer));
                 tileLayerIdMap[tmap.layers.back().id] = &tmap.layers.back();
             }
@@ -327,7 +323,7 @@
             }
 
             for (Tiled::MapObject* obj : objs->objects()) {
-                if (obj->name() != "TileData") {
+                if (obj->name() != QLatin1String("TileData")) {
                     qWarning() << "Ignoring object with name different from 'TileData'.";
                     continue;
                 }
@@ -353,7 +349,7 @@
                 tileY = qBound(0, tileY, tiles->layerSize.y - 1);
 
                 std::size_t idx = static_cast<std::size_t>(tileX + tileY * tiles->layerSize.x);
-                tiledToTbinProperties(obj, tiles->tiles[idx].props);
+                tiledToTbinProperties(obj->properties(), tiles->tiles[idx].props);
             }
         }
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/abstracttilefilltool.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/abstracttilefilltool.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/abstracttilefilltool.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/abstracttilefilltool.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -39,6 +39,7 @@
     , mFillMethod(TileFill)
     , mStampActions(new StampActions(this))
     , mWangSet(nullptr)
+    , mRandomAndMissingCacheValid(true)
 {
     connect(mStampActions->random(), &QAction::toggled, this, &AbstractTileFillTool::randomChanged);
     connect(mStampActions->wangFill(), &QAction::toggled, this, &AbstractTileFillTool::wangFillChanged);
@@ -95,7 +96,7 @@
 
     mStamp = stamp;
 
-    updateRandomListAndMissingTilesets();
+    invalidateRandomAndMissingCache();
 
     if (brushItem()->isVisible())
         tilePositionChanged(tilePosition());
@@ -119,7 +120,7 @@
     mStampActions->wangFill()->setChecked(mFillMethod == WangFill);
 
     if (mFillMethod == RandomFill || mFillMethod == WangFill)
-        updateRandomListAndMissingTilesets();
+        invalidateRandomAndMissingCache();
 
     // Don't need to recalculate fill region if there was no preview
     if (!mPreviewMap)
@@ -132,7 +133,7 @@
 {
     mWangSet = wangSet;
 
-    updateRandomListAndMissingTilesets();
+    invalidateRandomAndMissingCache();
 }
 
 void AbstractTileFillTool::mapDocumentChanged(MapDocument *oldDocument,
@@ -142,8 +143,16 @@
 
     clearConnections(oldDocument);
 
-    if (newDocument)
-        updateRandomListAndMissingTilesets();
+    if (oldDocument) {
+        disconnect(oldDocument, &MapDocument::tileProbabilityChanged,
+                   this, &AbstractTileFillTool::invalidateRandomAndMissingCache);
+    }
+
+    if (newDocument) {
+        invalidateRandomAndMissingCache();
+        connect(newDocument, &MapDocument::tileProbabilityChanged,
+                this, &AbstractTileFillTool::invalidateRandomAndMissingCache);
+    }
 
     clearOverlay();
 }
@@ -169,6 +178,11 @@
 
 void AbstractTileFillTool::updatePreview(const QRegion &fillRegion)
 {
+    if (!mRandomAndMissingCacheValid) {
+        updateRandomListAndMissingTilesets();
+        mRandomAndMissingCacheValid = true;
+    }
+
     const QRect fillBounds = fillRegion.boundingRect();
     auto preview = SharedMap::create(mapDocument()->map()->orientation(),
                                      mapDocument()->map()->size(),
@@ -315,3 +329,8 @@
         tileLayer->erase((QRegion(tileLayer->bounds()) - mask).translated(-tileLayer->position()));
     }
 }
+
+void AbstractTileFillTool::invalidateRandomAndMissingCache()
+{
+    mRandomAndMissingCacheValid = false;
+}
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/abstracttilefilltool.h tiled-qt-1.2.4+dfsg.1/src/tiled/abstracttilefilltool.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/abstracttilefilltool.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/abstracttilefilltool.h	2019-05-15 15:33:52.000000000 +0000
@@ -125,6 +125,9 @@
 
     CaptureStampHelper mCaptureStampHelper;
 
+    bool mRandomAndMissingCacheValid;
+    void invalidateRandomAndMissingCache();
+
     /**
      * Updates the list of random cells.
      * This is done by taking all non-null tiles from the original stamp mStamp.
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/automappingmanager.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/automappingmanager.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/automappingmanager.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/automappingmanager.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -29,6 +29,7 @@
 
 #include <QFileInfo>
 #include <QTextStream>
+#include <QFileSystemWatcher>
 
 #include "qtcompat_p.h"
 
@@ -42,6 +43,8 @@
     , mMapDocument(nullptr)
     , mLoaded(false)
 {
+    connect(&mWatcher, &QFileSystemWatcher::fileChanged,
+            this, &AutomappingManager::onFileChanged);
 }
 
 AutomappingManager::~AutomappingManager()
@@ -94,9 +97,8 @@
     const bool automatic = touchedLayer != nullptr;
 
     if (!mLoaded) {
-        const QString mapPath = QFileInfo(mMapDocument->fileName()).path();
-        const QString rulesFileName = mapPath + QLatin1String("/rules.txt");
-        if (loadFile(rulesFileName)) {
+        const QString rulesFile = rulesFileName();
+        if (loadFile(rulesFile)) {
             mLoaded = true;
         } else {
             emit errorsOccurred(automatic);
@@ -153,6 +155,8 @@
         return false;
     }
 
+    mWatcher.addPath(filePath);
+
     QTextStream in(&rulesFile);
     QString line = in.readLine();
 
@@ -189,6 +193,7 @@
             const QString error = autoMapper->errorString();
             if (error.isEmpty()) {
                 mAutoMappers.append(autoMapper);
+                mWatcher.addPath(rulePath);
             } else {
                 mError += error;
                 delete autoMapper;
@@ -204,22 +209,42 @@
 
 void AutomappingManager::setMapDocument(MapDocument *mapDocument)
 {
-    cleanUp();
-    if (mMapDocument)
+    QString oldRules;
+    if (mMapDocument) {
+        oldRules = rulesFileName();
         mMapDocument->disconnect(this);
+    }
 
     mMapDocument = mapDocument;
 
+    QString newRules;
     if (mMapDocument) {
         connect(mMapDocument, &MapDocument::regionEdited,
                 this, &AutomappingManager::onRegionEdited);
+        newRules = rulesFileName();
     }
 
-    mLoaded = false;
+    if (newRules != oldRules)
+        cleanUp();
 }
 
 void AutomappingManager::cleanUp()
 {
     qDeleteAll(mAutoMappers);
     mAutoMappers.clear();
+    mLoaded = false;
+    if (!mWatcher.files().isEmpty())
+        mWatcher.removePaths(mWatcher.files());
+}
+
+void AutomappingManager::onFileChanged()
+{
+    cleanUp();
+}
+
+QString AutomappingManager::rulesFileName() const
+{
+    const QString mapPath = QFileInfo(mMapDocument->fileName()).path();
+    const QString rulesFileName = mapPath + QLatin1String("/rules.txt");
+    return rulesFileName;
 }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/automappingmanager.h tiled-qt-1.2.4+dfsg.1/src/tiled/automappingmanager.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/automappingmanager.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/automappingmanager.h	2019-05-15 15:33:52.000000000 +0000
@@ -24,6 +24,7 @@
 #include <QRegion>
 #include <QString>
 #include <QVector>
+#include <QFileSystemWatcher>
 
 namespace Tiled {
 
@@ -76,6 +77,7 @@
 
 private slots:
     void onRegionEdited(const QRegion &where, Layer *touchedLayer);
+    void onFileChanged();
 
 private:
     Q_DISABLE_COPY(AutomappingManager)
@@ -134,6 +136,10 @@
      * behavior.
      */
     QString mWarning;
+
+    QFileSystemWatcher mWatcher;
+
+    QString rulesFileName() const;
 };
 
 } // namespace Internal
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/changetileprobability.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/changetileprobability.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/changetileprobability.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/changetileprobability.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -61,9 +61,8 @@
     for (int i = 0; i < mTiles.size(); ++ i) {
         Tile *tile = mTiles[i];
         qreal probability = tile->probability();
-        tile->setProbability(mProbabilities[i]);
+        mTilesetDocument->setTileProbability(tile, mProbabilities[i]);
         mProbabilities[i] = probability;
-        emit mTilesetDocument->tileProbabilityChanged(tile);
     }
 }
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/documentmanager.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/documentmanager.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/documentmanager.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/documentmanager.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -437,9 +437,11 @@
         return mDocuments.at(documentIndex);
 
     // Try to find it in otherwise referenced documents
-    {
-        QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
+    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
+    if (!canonicalFilePath.isEmpty()) {
         for (Document *doc : Document::documentInstances()) {
+            if (doc->fileName().isEmpty())
+                continue;
             if (QFileInfo(doc->fileName()).canonicalFilePath() == canonicalFilePath)
                 return doc->sharedFromThis();
         }
@@ -840,7 +842,14 @@
 
     QMenu menu(mTabBar->window());
 
-    Utils::addFileManagerActions(menu, mDocuments.at(index)->fileName());
+    const Document *fileDocument = mDocuments.at(index).data();
+    if (fileDocument->type() == Document::TilesetDocumentType) {
+        auto tilesetDocument = static_cast<const TilesetDocument*>(fileDocument);
+        if (tilesetDocument->isEmbedded())
+            fileDocument = tilesetDocument->mapDocuments().first();
+    }
+
+    Utils::addFileManagerActions(menu, fileDocument->fileName());
 
     menu.addSeparator();
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/mainwindow.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/mainwindow.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/mainwindow.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/mainwindow.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -121,15 +121,14 @@
 template <typename Format>
 ExportDetails<Format> chooseExportDetails(const QString &fileName,
                                           const QString &lastExportName,
-                                          const QString &lastExportFilter,
-                                          QWidget* window,
+                                          QString &selectedFilter,
+                                          QWidget *window,
                                           QFileDialog::Options options = QFileDialog::Options())
 {
     FormatHelper<Format> helper(FileFormat::Write, MainWindow::tr("All Files (*)"));
 
     Preferences *pref = Preferences::instance();
 
-    QString selectedFilter = lastExportFilter;
     QString suggestedFilename = lastExportName;
 
     if (suggestedFilename.isEmpty()) {
@@ -170,7 +169,7 @@
                     QMessageBox::warning(window, MainWindow::tr("Non-unique file extension"),
                                          MainWindow::tr("Non-unique file extension.\n"
                                                         "Please select specific format."));
-                    return chooseExportDetails<Format>(exportToFileName, lastExportName, lastExportFilter, window, options);
+                    return chooseExportDetails<Format>(exportToFileName, lastExportName, selectedFilter, window, options);
                 } else {
                     chosenFormat = format;
                 }
@@ -1611,8 +1610,14 @@
 void MainWindow::exportTilesetAs(TilesetDocument *tilesetDocument)
 {
     QString fileName = tilesetDocument->fileName();
+    if (fileName.isEmpty()) {
+        fileName = Preferences::instance()->lastPath(Preferences::ExportedFile);
+        fileName += QLatin1Char('/');
+        fileName = tilesetDocument->tileset()->name();
+    }
+
     QString selectedFilter =
-            mSettings.value(QLatin1String("lastUsedExportFilter")).toString();
+            mSettings.value(QLatin1String("lastUsedTilesetExportFilter")).toString();
     auto exportDetails = chooseExportDetails<TilesetFormat>(fileName,
                                                             tilesetDocument->lastExportFileName(),
                                                             selectedFilter,
@@ -1623,7 +1628,7 @@
     Preferences *pref = Preferences::instance();
 
     pref->setLastPath(Preferences::ExportedFile, QFileInfo(exportDetails.mFileName).path());
-    mSettings.setValue(QLatin1String("lastUsedExportFilter"), selectedFilter);
+    mSettings.setValue(QLatin1String("lastUsedTilesetExportFilter"), selectedFilter);
 
     SharedTileset exportTileset = ExportHelper().prepareExportTileset(tilesetDocument->tileset());
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/mapdocument.h tiled-qt-1.2.4+dfsg.1/src/tiled/mapdocument.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/mapdocument.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/mapdocument.h	2019-05-15 15:33:52.000000000 +0000
@@ -332,6 +332,7 @@
     void tilesetTileOffsetChanged(Tileset *tileset);
     void tileTypeChanged(Tile *tile);
     void tileImageSourceChanged(Tile *tile);
+    void tileProbabilityChanged(Tile *tile);
 
 private slots:
     void onObjectsRemoved(const QList<MapObject*> &objects);
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/mapitem.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/mapitem.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/mapitem.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/mapitem.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -328,27 +328,14 @@
     int z = 0;
     for (auto sibling : layer->siblings())
         mLayerItems.value(sibling)->setZValue(z++);
+
+    updateBoundingRect();
 }
 
 void MapItem::layerRemoved(Layer *layer)
 {
-    switch (layer->layerType()) {
-    case Layer::TileLayerType:
-    case Layer::ImageLayerType:
-        break;
-    case Layer::ObjectGroupType:
-        // Delete any object items
-        for (auto object : static_cast<ObjectGroup*>(layer)->objects())
-            delete mObjectItems.take(object);
-        break;
-    case Layer::GroupLayerType:
-        // Recurse into group layers
-        for (auto childLayer : static_cast<GroupLayer*>(layer)->layers())
-            layerRemoved(childLayer);
-        break;
-    }
-
-    delete mLayerItems.take(layer);
+    deleteLayerItems(layer);
+    updateBoundingRect();
 }
 
 /**
@@ -611,17 +598,44 @@
     return layerItem;
 }
 
+void MapItem::deleteLayerItems(Layer *layer)
+{
+    switch (layer->layerType()) {
+    case Layer::TileLayerType:
+    case Layer::ImageLayerType:
+        break;
+    case Layer::ObjectGroupType:
+        // Delete any object items
+        for (auto object : static_cast<ObjectGroup*>(layer)->objects())
+            delete mObjectItems.take(object);
+        break;
+    case Layer::GroupLayerType:
+        // Recurse into group layers
+        for (auto childLayer : static_cast<GroupLayer*>(layer)->layers())
+            deleteLayerItems(childLayer);
+        break;
+    }
+
+    delete mLayerItems.take(layer);
+}
+
 void MapItem::updateBoundingRect()
 {
-    QRectF boundingRect = mapDocument()->renderer()->mapBoundingRect();
+    QRectF boundingRect;
+
+    for (auto layerItem : qAsConst(mLayerItems))
+        if (layerItem->layer()->isTileLayer())
+            boundingRect |= layerItem->boundingRect().translated(layerItem->layer()->totalOffset());
 
     if (mBoundingRect != boundingRect) {
         prepareGeometryChange();
         mBoundingRect = boundingRect;
         emit boundingRectChanged();
-
-        mBorderRectangle->setRect(mBoundingRect);
     }
+
+    // This rectangle represents the map boundary and as such is unaffected
+    // by layer offsets.
+    mBorderRectangle->setRect(mapDocument()->renderer()->mapBoundingRect());
 }
 
 void MapItem::updateSelectedLayersHighlight()
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/mapitem.h tiled-qt-1.2.4+dfsg.1/src/tiled/mapitem.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/mapitem.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/mapitem.h	2019-05-15 15:33:52.000000000 +0000
@@ -118,6 +118,7 @@
 
     void createLayerItems(const QList<Layer *> &layers);
     LayerItem *createLayerItem(Layer *layer);
+    void deleteLayerItems(Layer *layer);
 
     void updateBoundingRect();
     void updateSelectedLayersHighlight();
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/mapobjectmodel.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/mapobjectmodel.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/mapobjectmodel.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/mapobjectmodel.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -271,13 +271,20 @@
 
 QModelIndex MapObjectModel::index(Layer *layer) const
 {
+    Q_ASSERT(layer);
     Q_ASSERT(layer->isObjectGroup() || layer->isGroupLayer());
+    Q_ASSERT(layer->map() == mMap);
+
     const int row = filteredChildLayers(layer->parentLayer()).indexOf(layer);
     return createIndex(row, 0, layer);
 }
 
 QModelIndex MapObjectModel::index(MapObject *mapObject, int column) const
 {
+    Q_ASSERT(mapObject);
+    Q_ASSERT(mapObject->objectGroup());
+    Q_ASSERT(mapObject->objectGroup()->map() == mMap);
+
     const int row = mapObject->objectGroup()->objects().indexOf(mapObject);
     return createIndex(row, column, mapObject);
 }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectionitem.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectionitem.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectionitem.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectionitem.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -61,6 +61,7 @@
         setZValue(1); // makes sure outlines are above labels
     }
 
+    MapObject *mapObject() const { return mObject; }
     void syncWithMapObject(const MapRenderer &renderer);
 
     QRectF boundingRect() const override;
@@ -272,6 +273,9 @@
     connect(mapDocument, &MapDocument::objectsChanged,
             this, &ObjectSelectionItem::syncOverlayItems);
 
+    connect(mapDocument, &MapDocument::objectGroupChanged,
+            this, &ObjectSelectionItem::updateObjectLabelColors);
+
     connect(mapDocument, &MapDocument::hoveredMapObjectChanged,
             this, &ObjectSelectionItem::hoveredMapObjectChanged);
 
@@ -281,6 +285,9 @@
     connect(mapDocument, &MapDocument::objectsRemoved,
             this, &ObjectSelectionItem::objectsRemoved);
 
+    connect(mapDocument, &MapDocument::tilesetTileOffsetChanged,
+            this, &ObjectSelectionItem::tilesetTileOffsetChanged);
+
     connect(mapDocument, &MapDocument::tileTypeChanged,
             this, &ObjectSelectionItem::tileTypeChanged);
 
@@ -462,6 +469,23 @@
             delete mObjectLabels.take(object);
 }
 
+void ObjectSelectionItem::tilesetTileOffsetChanged(Tileset *tileset)
+{
+    // Tile offset affects the position of selection outlines and labels
+    const MapRenderer &renderer = *mMapDocument->renderer();
+
+    for (MapObjectLabel *label : mObjectLabels)
+        if (label->mapObject()->cell().tileset() == tileset)
+            label->syncWithMapObject(renderer);
+
+    for (MapObjectOutline *outline : mObjectOutlines)
+        if (outline->mapObject()->cell().tileset() == tileset)
+            outline->syncWithMapObject(renderer);
+
+    if (mHoveredMapObjectItem && mHoveredMapObjectItem->mapObject()->cell().tileset() == tileset)
+        mHoveredMapObjectItem->syncWithMapObject();
+}
+
 void ObjectSelectionItem::tileTypeChanged(Tile *tile)
 {
     for (MapObjectLabel *label : mObjectLabels) {
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectionitem.h tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectionitem.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectionitem.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectionitem.h	2019-05-15 15:33:52.000000000 +0000
@@ -31,6 +31,7 @@
 class Layer;
 class MapObject;
 class Tile;
+class Tileset;
 
 namespace Internal {
 
@@ -69,6 +70,7 @@
     void updateObjectLabelColors();
     void objectsAdded(const QList<MapObject*> &objects);
     void objectsRemoved(const QList<MapObject*> &objects);
+    void tilesetTileOffsetChanged(Tileset *tileset);
     void tileTypeChanged(Tile *tile);
 
     void objectLabelVisibilityChanged();
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectiontool.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectiontool.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectiontool.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectiontool.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -358,6 +358,8 @@
             this, &ObjectSelectionTool::updateHandlesAndOrigin);
     connect(mapDocument(), &MapDocument::selectedObjectsChanged,
             this, &ObjectSelectionTool::updateHandlesAndOrigin);
+    connect(mapDocument(), &MapDocument::tilesetTileOffsetChanged,
+            this, &ObjectSelectionTool::updateHandlesAndOrigin);
     connect(mapDocument(), &MapDocument::objectsRemoved,
             this, &ObjectSelectionTool::objectsRemoved);
 
@@ -382,10 +384,12 @@
                this, &ObjectSelectionTool::updateHandlesAndOrigin);
     disconnect(mapDocument(), &MapDocument::selectedObjectsChanged,
                this, &ObjectSelectionTool::updateHandlesAndOrigin);
+    disconnect(mapDocument(), &MapDocument::tilesetTileOffsetChanged,
+               this, &ObjectSelectionTool::updateHandlesAndOrigin);
     disconnect(mapDocument(), &MapDocument::objectsRemoved,
                this, &ObjectSelectionTool::objectsRemoved);
 
-    abortCurrentAction();
+    abortCurrentAction(Deactivated);
 
     mHoveredObject = nullptr;
     mapDocument()->setHoveredMapObject(nullptr);
@@ -399,7 +403,7 @@
         // If we're currently performing some action, the only relevant key to
         // handle is Escape, to abort it.
         if (event->key() == Qt::Key_Escape)
-            abortCurrentAction();
+            abortCurrentAction(UserInteraction);
         else
             event->ignore();
 
@@ -1033,7 +1037,7 @@
     // Abort move/rotate/resize to avoid crashing...
     // TODO: This should really not be allowed to happen in the first place
     if (mAction == Moving || mAction == Rotating || mAction == Resizing)
-        abortCurrentAction(objects);
+        abortCurrentAction(UserInteraction, objects);
 }
 
 void ObjectSelectionTool::updateHover(const QPointF &pos)
@@ -1566,7 +1570,7 @@
  * The \a removedObjects is used to avoid sending the "objectsChanged" signal
  * for objects that have been removed.
  */
-void ObjectSelectionTool::abortCurrentAction(const QList<MapObject *> &removedObjects)
+void ObjectSelectionTool::abortCurrentAction(AbortReason reason, const QList<MapObject *> &removedObjects)
 {
     switch (mAction) {
     case NoAction:
@@ -1608,9 +1612,11 @@
     mMovingObjects.clear();
     mAction = NoAction;
 
-    updateHandles();
-    updateHover(mLastMousePos);
-    refreshCursor();
+    if (reason != Deactivated) {
+        updateHandles();
+        updateHover(mLastMousePos);
+        refreshCursor();
+    }
 }
 
 void ObjectSelectionTool::refreshCursor()
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectiontool.h tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectiontool.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/objectselectiontool.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/objectselectiontool.h	2019-05-15 15:33:52.000000000 +0000
@@ -117,7 +117,13 @@
     void setMode(Mode mode);
     void saveSelectionState();
 
-    void abortCurrentAction(const QList<MapObject *> &removedObjects = QList<MapObject*>());
+    enum AbortReason {
+        UserInteraction,
+        Deactivated
+    };
+
+    void abortCurrentAction(AbortReason reason = UserInteraction,
+                            const QList<MapObject *> &removedObjects = QList<MapObject*>());
 
     void refreshCursor();
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/propertybrowser.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/propertybrowser.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/propertybrowser.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/propertybrowser.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -933,7 +933,7 @@
             LayerIterator iterator(mMapDocument->map());
             while (Layer *layer = iterator.next()) {
                 if (TileLayer *tileLayer = dynamic_cast<TileLayer*>(layer))
-                    mapBounds = mapBounds.united(tileLayer->bounds());
+                    mapBounds = mapBounds.united(tileLayer->region().boundingRect());
             }
 
             if (mapBounds.size() == QSize(0, 0))
@@ -1877,42 +1877,41 @@
 void PropertyBrowser::retranslateUi()
 {
     mStaggerAxisNames.clear();
-    mStaggerIndexNames.clear();
-    mOrientationNames.clear();
-    mTilesetOrientationNames.clear();
-    mLayerFormatNames.clear();
-    mRenderOrderNames.clear();
-    mFlippingFlagNames.clear();
-    mDrawOrderNames.clear();
-
     mStaggerAxisNames.append(tr("X"));
     mStaggerAxisNames.append(tr("Y"));
 
+    mStaggerIndexNames.clear();
     mStaggerIndexNames.append(tr("Odd"));
     mStaggerIndexNames.append(tr("Even"));
 
+    mOrientationNames.clear();
     mOrientationNames.append(QCoreApplication::translate("Tiled::Internal::NewMapDialog", "Orthogonal"));
     mOrientationNames.append(QCoreApplication::translate("Tiled::Internal::NewMapDialog", "Isometric"));
     mOrientationNames.append(QCoreApplication::translate("Tiled::Internal::NewMapDialog", "Isometric (Staggered)"));
     mOrientationNames.append(QCoreApplication::translate("Tiled::Internal::NewMapDialog", "Hexagonal (Staggered)"));
 
+    mTilesetOrientationNames.clear();
     mTilesetOrientationNames.append(mOrientationNames.at(0));
     mTilesetOrientationNames.append(mOrientationNames.at(1));
 
+    mLayerFormatNames.clear();
     mLayerFormatNames.append(QCoreApplication::translate("PreferencesDialog", "XML"));
     mLayerFormatNames.append(QCoreApplication::translate("PreferencesDialog", "Base64 (uncompressed)"));
     mLayerFormatNames.append(QCoreApplication::translate("PreferencesDialog", "Base64 (gzip compressed)"));
     mLayerFormatNames.append(QCoreApplication::translate("PreferencesDialog", "Base64 (zlib compressed)"));
     mLayerFormatNames.append(QCoreApplication::translate("PreferencesDialog", "CSV"));
 
+    mRenderOrderNames.clear();
     mRenderOrderNames.append(QCoreApplication::translate("PreferencesDialog", "Right Down"));
     mRenderOrderNames.append(QCoreApplication::translate("PreferencesDialog", "Right Up"));
     mRenderOrderNames.append(QCoreApplication::translate("PreferencesDialog", "Left Down"));
     mRenderOrderNames.append(QCoreApplication::translate("PreferencesDialog", "Left Up"));
 
+    mFlippingFlagNames.clear();
     mFlippingFlagNames.append(tr("Horizontal"));
     mFlippingFlagNames.append(tr("Vertical"));
 
+    mDrawOrderNames.clear();
     mDrawOrderNames.append(tr("Top Down"));
     mDrawOrderNames.append(tr("Manual"));
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/stampbrush.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/stampbrush.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/stampbrush.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/stampbrush.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -56,6 +56,7 @@
     , mIsRandom(false)
     , mIsWangFill(false)
     , mWangSet(nullptr)
+    , mRandomCacheValid(true)
     , mStampActions(new StampActions(this))
 {
     connect(mStampActions->random(), &QAction::toggled, this, &StampBrush::randomChanged);
@@ -215,9 +216,16 @@
 {
     AbstractTileTool::mapDocumentChanged(oldDocument, newDocument);
 
+    if (oldDocument) {
+        disconnect(oldDocument, &MapDocument::tileProbabilityChanged,
+                   this, &StampBrush::invalidateRandomCache);
+    }
+
     if (newDocument) {
-        updateRandomList();
+        invalidateRandomCache();
         updatePreview();
+        connect(newDocument, &MapDocument::tileProbabilityChanged,
+                this, &StampBrush::invalidateRandomCache);
     }
 }
 
@@ -264,7 +272,7 @@
 
     mStamp = stamp;
 
-    updateRandomList();
+    invalidateRandomCache();
     updatePreview();
 }
 
@@ -379,6 +387,11 @@
         return;
 
     if (mIsRandom) {
+        if (!mRandomCacheValid) {
+            updateRandomList();
+            mRandomCacheValid = true;
+        }
+
         if (mRandomCellPicker.isEmpty())
             return;
 
@@ -605,7 +618,7 @@
         mStampActions->wangFill()->setChecked(false);
     }
 
-    updateRandomList();
+    invalidateRandomCache();
     updatePreview();
 }
 
@@ -623,3 +636,8 @@
 
     updatePreview();
 }
+
+void StampBrush::invalidateRandomCache()
+{
+    mRandomCacheValid = false;
+}
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/stampbrush.h tiled-qt-1.2.4+dfsg.1/src/tiled/stampbrush.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/stampbrush.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/stampbrush.h	2019-05-15 15:33:52.000000000 +0000
@@ -155,7 +155,9 @@
     bool mIsWangFill;
     WangSet *mWangSet;
 
+    bool mRandomCacheValid;
     void updateRandomList();
+    void invalidateRandomCache();
 
     StampActions *mStampActions;
 };
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/tilecollisiondock.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/tilecollisiondock.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/tilecollisiondock.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/tilecollisiondock.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -21,13 +21,14 @@
 #include "tilecollisiondock.h"
 
 #include "addremovemapobject.h"
-#include "editpolygontool.h"
 #include "changetileobjectgroup.h"
-#include "createobjecttool.h"
-#include "createrectangleobjecttool.h"
 #include "createellipseobjecttool.h"
+#include "createobjecttool.h"
+#include "createpointobjecttool.h"
 #include "createpolygonobjecttool.h"
+#include "createrectangleobjecttool.h"
 #include "createtemplatetool.h"
+#include "editpolygontool.h"
 #include "layermodel.h"
 #include "map.h"
 #include "mapdocument.h"
@@ -76,6 +77,7 @@
     mMapView->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 
     CreateObjectTool *rectangleObjectsTool = new CreateRectangleObjectTool(this);
+    CreateObjectTool *pointObjectsTool = new CreatePointObjectTool(this);
     CreateObjectTool *ellipseObjectsTool = new CreateEllipseObjectTool(this);
     CreateObjectTool *polygonObjectsTool = new CreatePolygonObjectTool(this);
     CreateObjectTool *templatesTool = new CreateTemplateTool(this);
@@ -90,6 +92,7 @@
     toolBar->addAction(mToolManager->registerTool(new ObjectSelectionTool(this)));
     toolBar->addAction(mToolManager->registerTool(new EditPolygonTool(this)));
     toolBar->addAction(mToolManager->registerTool(rectangleObjectsTool));
+    toolBar->addAction(mToolManager->registerTool(pointObjectsTool));
     toolBar->addAction(mToolManager->registerTool(ellipseObjectsTool));
     toolBar->addAction(mToolManager->registerTool(polygonObjectsTool));
     toolBar->addAction(mToolManager->registerTool(templatesTool));
@@ -185,6 +188,7 @@
         mDummyMapDocument->setAllowHidingObjects(false);
         mDummyMapDocument->setAllowTileObjects(false);
         mDummyMapDocument->setCurrentLayer(objectGroup);
+        mDummyMapDocument->setSelectedLayers({objectGroup});
 
         mMapScene->setMapDocument(mDummyMapDocument.data());
         mToolManager->setMapDocument(mDummyMapDocument.data());
@@ -263,6 +267,7 @@
 
     layerModel->insertLayer(nullptr, 1, objectGroup);
     mDummyMapDocument->setCurrentLayer(objectGroup);
+    mDummyMapDocument->setSelectedLayers({objectGroup});
 
     mToolManager->selectTool(selectedTool);
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/tilesetdocument.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/tilesetdocument.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/tilesetdocument.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/tilesetdocument.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -331,13 +331,23 @@
     Q_ASSERT(tile->tileset() == mTileset.data());
 
     mTileset->setTileImage(tile, image, source);
-
     emit tileImageSourceChanged(tile);
 
     for (MapDocument *mapDocument : mapDocuments())
         emit mapDocument->tileImageSourceChanged(tile);
 }
 
+void TilesetDocument::setTileProbability(Tile *tile, qreal probability)
+{
+    Q_ASSERT(tile->tileset() == mTileset.data());
+
+    tile->setProbability(probability);
+    emit tileProbabilityChanged(tile);
+
+    for (MapDocument *mapDocument : mapDocuments())
+        emit mapDocument->tileProbabilityChanged(tile);
+}
+
 TilesetDocument *TilesetDocument::findDocumentForTileset(const SharedTileset &tileset)
 {
     return sTilesetToDocument.value(tileset);
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/tilesetdocument.h tiled-qt-1.2.4+dfsg.1/src/tiled/tilesetdocument.h
--- tiled-qt-1.2.1+dfsg.1/src/tiled/tilesetdocument.h	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/tilesetdocument.h	2019-05-15 15:33:52.000000000 +0000
@@ -104,6 +104,7 @@
 
     void setTileType(Tile *tile, const QString &type);
     void setTileImage(Tile *tile, const QPixmap &image, const QUrl &source);
+    void setTileProbability(Tile *tile, qreal probability);
 
     static TilesetDocument* findDocumentForTileset(const SharedTileset &tileset);
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/tileseteditor.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/tileseteditor.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/tileseteditor.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/tileseteditor.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -425,6 +425,7 @@
         mUndoDock,
         mTerrainDock,
         mTileCollisionDock,
+        mTemplatesDock,
         mWangDock
     };
 }
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/tilestampmanager.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/tilestampmanager.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/tilestampmanager.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/tilestampmanager.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -107,16 +107,15 @@
 {
     TileStamp stamp;
 
-    if (StampBrush *stampBrush = dynamic_cast<StampBrush*>(selectedTool)) {
+    if (auto stampBrush = dynamic_cast<StampBrush*>(selectedTool)) {
         // take the stamp from the stamp brush
         stamp = stampBrush->stamp();
-    } else if (BucketFillTool *fillTool = dynamic_cast<BucketFillTool*>(selectedTool)) {
+    } else if (auto fillTool = dynamic_cast<AbstractTileFillTool*>(selectedTool)) {
         // take the stamp from the fill tool
         stamp = fillTool->stamp();
-    } else if (MapDocument *mapDocument = qobject_cast<MapDocument*>(DocumentManager::instance()->currentDocument())) {
+    } else if (auto mapDocument = qobject_cast<MapDocument*>(DocumentManager::instance()->currentDocument())) {
         // try making a stamp from the current tile selection
-        const TileLayer *tileLayer =
-                dynamic_cast<TileLayer*>(mapDocument->currentLayer());
+        const auto tileLayer = dynamic_cast<TileLayer*>(mapDocument->currentLayer());
         if (!tileLayer)
             return stamp;
 
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/utils.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/utils.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/utils.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/utils.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -263,6 +263,9 @@
 
 void addFileManagerActions(QMenu &menu, const QString &fileName)
 {
+    if (fileName.isEmpty())
+        return;
+
     QAction *copyPath = menu.addAction(QCoreApplication::translate("Utils", "Copy File Path"));
     QObject::connect(copyPath, &QAction::triggered, [fileName] {
         QClipboard *clipboard = QApplication::clipboard();
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/wangbrush.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/wangbrush.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/wangbrush.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/wangbrush.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -323,7 +323,7 @@
         QString extraInfo;
         if (!static_cast<WangBrushItem*>(brushItem())->isValid())
             extraInfo = QString(QLatin1String(" (%1)"))
-                        .arg(tr("Missing wang tile transition"));
+                        .arg(tr("Missing Wang tile transition"));
 
         setStatusInfo(QString(QLatin1String("%1, %2%3%4"))
                       .arg(mPaintPoint.x())
diff -Nru tiled-qt-1.2.1+dfsg.1/src/tiled/wangdock.cpp tiled-qt-1.2.4+dfsg.1/src/tiled/wangdock.cpp
--- tiled-qt-1.2.1+dfsg.1/src/tiled/wangdock.cpp	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/src/tiled/wangdock.cpp	2019-05-15 15:33:52.000000000 +0000
@@ -137,10 +137,14 @@
 
     mAddWangSet->setIcon(QIcon(QStringLiteral(":/images/22x22/add.png")));
     mRemoveWangSet->setIcon(QIcon(QStringLiteral(":/images/22x22/remove.png")));
+    mRemoveWangSet->setEnabled(false);
 
     mAddEdgeColor->setIcon(QIcon(QStringLiteral(":/images/22x22/add-edge.png")));
+    mAddEdgeColor->setEnabled(false);
     mAddCornerColor->setIcon(QIcon(QStringLiteral(":/images/22x22/add-corner.png")));
+    mAddCornerColor->setEnabled(false);
     mRemoveColor->setIcon(QIcon(QStringLiteral(":/images/22x22/remove.png")));
+    mRemoveColor->setEnabled(false);
 
     Utils::setThemeIcon(mAddWangSet, "add");
     Utils::setThemeIcon(mRemoveWangSet, "remove");
@@ -174,7 +178,6 @@
 
     mWangTemplateView = new WangTemplateView(w);
     mWangTemplateView->setModel(mWangTemplateModel);
-    mWangTemplateView->setVisible(true);
 
     connect(mWangTemplateView->selectionModel(), &QItemSelectionModel::currentChanged,
             this, &WangDock::refreshCurrentWangId);
@@ -183,7 +186,6 @@
 
     mWangColorView = new WangColorView(w);
     mWangColorView->setModel(mWangColorFilterModel);
-    mWangColorView->setVisible(true);
 
     connect(mWangColorView->selectionModel(), &QItemSelectionModel::currentRowChanged,
             this, &WangDock::refreshCurrentWangColor);
@@ -248,6 +250,7 @@
     vertical->setMargin(0);
     vertical->addWidget(wangViews);
 
+    hideTemplateColorView();
     setWidget(w);
     retranslateUi();
 }
@@ -303,7 +306,6 @@
 
         mTemplateAndColorView->setTabEnabled(0, true);
         mTemplateAndColorView->tabBar()->show();
-        setTemplateView();
 
         /*
          * Removing a wangset usually changes the selected wangset without the
@@ -609,7 +611,6 @@
 void WangDock::setTemplateView()
 {
     mTemplateAndColorWidget->setVisible(true);
-
     mTemplateAndColorView->setCurrentIndex(0);
     retranslateUi();
 }
@@ -617,9 +618,7 @@
 void WangDock::setColorView()
 {
     mTemplateAndColorWidget->setVisible(true);
-
     mTemplateAndColorView->setCurrentIndex(1);
-
     retranslateUi();
 }
 
diff -Nru tiled-qt-1.2.1+dfsg.1/tiled.pri tiled-qt-1.2.4+dfsg.1/tiled.pri
--- tiled-qt-1.2.1+dfsg.1/tiled.pri	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/tiled.pri	2019-05-15 15:33:52.000000000 +0000
@@ -1,5 +1,5 @@
 # Initialize the version
-isEmpty(TILED_VERSION):TILED_VERSION = "1.2.1"
+isEmpty(TILED_VERSION):TILED_VERSION = "1.2.4"
 
 # See the README file for instructions about setting the install prefix.
 isEmpty(PREFIX):PREFIX = /usr/local
diff -Nru tiled-qt-1.2.1+dfsg.1/tiled.qbs tiled-qt-1.2.4+dfsg.1/tiled.qbs
--- tiled-qt-1.2.1+dfsg.1/tiled.qbs	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/tiled.qbs	2019-05-15 15:33:52.000000000 +0000
@@ -7,7 +7,7 @@
     qbsSearchPaths: "qbs"
     minimumQbsVersion: "1.8"
 
-    property string version: Environment.getEnv("TILED_VERSION") || "1.2.1";
+    property string version: Environment.getEnv("TILED_VERSION") || "1.2.4";
     property bool sparkleEnabled: Environment.getEnv("TILED_SPARKLE")
     property bool snapshot: Environment.getEnv("TILED_SNAPSHOT")
     property bool release: Environment.getEnv("TILED_RELEASE")
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_ar_DZ.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_ar_DZ.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_ar_DZ.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_ar_DZ.ts	2019-05-15 15:33:52.000000000 +0000
@@ -459,7 +459,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -494,7 +494,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -524,7 +524,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5637,7 +5637,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_bg.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_bg.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_bg.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_bg.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,7 +460,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation>Файлове с карти във формата json (*.json)</translation>
     </message>
     <message>
@@ -495,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation>Файлове с шаблони във формата json (*.json)</translation>
     </message>
 </context>
@@ -525,7 +525,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation>Файлове с плочни набори във формата json (*.json)</translation>
     </message>
 </context>
@@ -5458,7 +5458,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Липсва плочен преход на Ванг</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_cs.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_cs.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_cs.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_cs.ts	2019-05-15 15:33:52.000000000 +0000
@@ -28,7 +28,8 @@
         <translation>&lt;p align=&quot;center&quot;&gt;&lt;font size=&quot;+2&quot;&gt;&lt;b&gt;Editor map Tiled&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;i&gt;Verze %1&lt;/i&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot;&gt;Copyright 2008-2018 Thorbj&amp;oslash;rn Lindeijer&lt;br&gt;(plný seznam přispěvatelů je v souboru AUTHORS)&lt;/p&gt;
 &lt;p align=&quot;center&quot;&gt;Tento program můžete šířit a upravovat podle licence GPLicence (verze 2 nebo pozdější). Kopii GPLlicence najdete v souboru COPYING ve zdrojovém kódu programu Tiled.&lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;</translation>
+&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;
+</translation>
     </message>
 </context>
 <context>
@@ -41,7 +42,7 @@
     <message>
         <location line="+12"/>
         <source>Property name</source>
-        <translation type="unfinished"></translation>
+        <translation>Název proměnné</translation>
     </message>
 </context>
 <context>
@@ -459,7 +460,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation>Mapové soubory JSON (*.json)</translation>
     </message>
     <message>
@@ -494,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -524,7 +525,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation>Sady dlaždic JSON (*.json)</translation>
     </message>
 </context>
@@ -5558,7 +5559,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_de.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_de.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_de.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_de.ts	2019-05-15 15:33:52.000000000 +0000
@@ -85,12 +85,12 @@
     <message>
         <location line="+22"/>
         <source>Failed to load source tileset.</source>
-        <translation type="unfinished"></translation>
+        <translation>Quell-Tileset konnte nicht geladen werden.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to export tileset to target file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tileset konnte nicht exportiert werden.</translation>
     </message>
 </context>
 <context>
@@ -167,12 +167,12 @@
     <message>
         <location line="+5"/>
         <source>Export the specified map file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Karte zum Ziel exportieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the specified tileset file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Tileset-Datei zum Ziel exportieren</translation>
     </message>
     <message>
         <location line="+84"/>
@@ -182,7 +182,7 @@
     <message>
         <location line="+11"/>
         <source>Tileset export formats:</source>
-        <translation type="unfinished"></translation>
+        <translation>Tileset Export Formate:</translation>
     </message>
     <message>
         <location line="-90"/>
@@ -197,12 +197,12 @@
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with template instances detached</source>
-        <translation type="unfinished"></translation>
+        <translation>Karte oder Tileset mit separaten Vorlagen exportieren</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with types and properties resolved</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportiere Karte oder Tileset mit gelösten Typen und Eigenschaften</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json-Kartendateien (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON-Kartendateien (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Json Vorlagendateien (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON Vorlagendateien (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json-Kartendateien (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON-Tileset-dateien (*.json)</translation>
     </message>
 </context>
 <context>
@@ -595,7 +595,7 @@
     <message>
         <location line="+4"/>
         <source>Unload World</source>
-        <translation type="unfinished"></translation>
+        <translation>Welt entladen</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -680,17 +680,17 @@
     <message>
         <location line="+324"/>
         <source>For Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Für hervorgehobenes Objekt</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Load World...</source>
-        <translation type="unfinished"></translation>
+        <translation>Welt laden...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Highlight Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation>Schwebendes Objekt hervorheben</translation>
     </message>
     <message>
         <location line="-132"/>
@@ -1395,7 +1395,7 @@
     <message>
         <location line="+5"/>
         <source>Selected Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausgewählte Ebenen</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1559,22 +1559,22 @@
     <message>
         <location line="+10"/>
         <source>Export Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportieroptionen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Resolve object types and properties</source>
-        <translation type="unfinished"></translation>
+        <translation>Objekt-Typen und Eigenschaften auflösen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Detach templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlagen ablösen</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Embed tilesets</source>
-        <translation type="unfinished"></translation>
+        <translation>Tileset einbetten</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -1599,7 +1599,7 @@
     <message>
         <location line="+49"/>
         <source>Mouse wheel &amp;zooms by default</source>
-        <translation type="unfinished"></translation>
+        <translation>Mausrad &amp;zoomt standardmäßig</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -2279,12 +2279,12 @@
     <message>
         <location line="+20"/>
         <source>Tilesheet must have equal spacings.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Tilesheet muss gleiche Abstände aufweisen.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Tilesheet must have equal margins.</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Tilesheet muss gleiche Ränder aufweisen.</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -2329,7 +2329,7 @@
         <location line="+69"/>
         <location line="+68"/>
         <source>Bad layer tile data</source>
-        <translation type="unfinished"></translation>
+        <translation>Falsche Kachelebenen-Daten</translation>
     </message>
     <message>
         <location line="+72"/>
@@ -2349,7 +2349,7 @@
     <message>
         <location filename="../src/plugins/tbin/tbinplugin.cpp" line="-255"/>
         <source>Unsupported property type</source>
-        <translation type="unfinished"></translation>
+        <translation>Nicht unterstützter Eigenschaftstyp</translation>
     </message>
 </context>
 <context>
@@ -2383,17 +2383,17 @@
     <message>
         <location line="+11"/>
         <source>Frame Duration: </source>
-        <translation type="unfinished"></translation>
+        <translation>Frame-Dauer: </translation>
     </message>
     <message>
         <location line="+7"/>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation> ms</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Anwenden</translation>
     </message>
     <message>
         <location line="+98"/>
@@ -2434,27 +2434,27 @@
     <message>
         <location line="+6"/>
         <source>Replace With Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Vorlage ersetzen</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Replace With Template &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Mit Vorlage &quot;%1&quot; ersetzen</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Save As Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Als Vorlage speichern</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Detach</source>
-        <translation type="unfinished"></translation>
+        <translation>Lösen</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reset Template Instance(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage(n) zurücksetzen</translation>
     </message>
     <message>
         <location line="-334"/>
@@ -2678,7 +2678,7 @@
     <message>
         <location line="+2"/>
         <source>Template tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>Tileset Vorlage</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2688,7 +2688,7 @@
     <message>
         <location line="+2"/>
         <source>Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -2728,7 +2728,7 @@
     <message>
         <location line="-5"/>
         <source>Open Template...</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage öffnen...</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2744,7 +2744,7 @@
     <message>
         <location line="+50"/>
         <source>Locate Object Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Objekt-Vorlage finden</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -2754,7 +2754,7 @@
     <message>
         <location line="+48"/>
         <source>Error Reading Object Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Lesen der Objekt-Vorlage</translation>
     </message>
     <message>
         <location line="-89"/>
@@ -2944,7 +2944,7 @@
     <message>
         <location line="+26"/>
         <source>Executing: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ausführen: %1</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -2998,7 +2998,7 @@
     <message>
         <location filename="../src/tiled/createpointobjecttool.cpp" line="+51"/>
         <source>Insert Point</source>
-        <translation type="unfinished"></translation>
+        <translation>Punkt einfügen</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3021,7 +3021,7 @@
     <message>
         <location line="+122"/>
         <source>Connect Polylines</source>
-        <translation type="unfinished"></translation>
+        <translation>Polylinien verbinden</translation>
     </message>
     <message>
         <location line="+202"/>
@@ -3186,7 +3186,7 @@
     <message>
         <location line="-334"/>
         <source>Extend Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Polylinie erweitern</translation>
     </message>
 </context>
 <context>
@@ -3419,7 +3419,7 @@
     <message>
         <location line="+13"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location line="+66"/>
@@ -3450,22 +3450,22 @@
     <message>
         <location line="-1113"/>
         <source>Load World</source>
-        <translation type="unfinished"></translation>
+        <translation>Welt laden</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Error Loading World</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Laden der Welt</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Reset to Default Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>Layout zurücksetzen</translation>
     </message>
     <message>
         <location line="+269"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
         <location line="+759"/>
@@ -3659,12 +3659,12 @@
     <message>
         <location line="+5"/>
         <source>Save Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage speichern</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Error Saving Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Fehler beim Speichern der Vorlage</translation>
     </message>
 </context>
 <context>
@@ -3716,27 +3716,21 @@
     <message numerus="yes">
         <location line="+2"/>
         <source>Group %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Ebene gruppieren</numerusform>
+        <numerusform>%n Ebenen gruppieren</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+16"/>
         <source>Ungroup %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Ebene von Gruppe lösen</numerusform>
+        <numerusform>%n Ebenen von Gruppe lösen</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+46"/>
         <source>Duplicate %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Ebene duplizieren</numerusform>
+        <numerusform>%n Ebenen duplizieren</numerusform>
+        </translation></message>
     <message>
         <location line="+27"/>
         <source>Copy of %1</source>
@@ -3886,7 +3880,7 @@
     <message>
         <location line="+1"/>
         <source>Autocrop</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatisch zuschneiden</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3928,7 +3922,7 @@
     <message>
         <location line="+1"/>
         <source>&amp;Ungroup Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Ebene a&amp;ufheben</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3938,7 +3932,7 @@
     <message>
         <location line="+2"/>
         <source>&amp;Remove Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Ebene entfe&amp;rnen</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3948,7 +3942,7 @@
     <message>
         <location line="+1"/>
         <source>&amp;Lower Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Ebenen absenken</translation>
     </message>
     <message>
         <location line="-5"/>
@@ -3973,7 +3967,7 @@
     <message>
         <location line="+1"/>
         <source>Lock/&amp;Unlock all Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle anderen Ebenen sperren/&amp;entsperren</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4032,7 +4026,7 @@
     <message>
         <location filename="../src/tiled/mapeditor.cpp" line="+665"/>
         <source>Paste in Place</source>
-        <translation type="unfinished"></translation>
+        <translation>In Stelle einfügen</translation>
     </message>
     <message>
         <location line="+187"/>
@@ -4056,7 +4050,7 @@
     <message>
         <location line="+57"/>
         <source>Tool Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Werkzeugoptionen</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -4595,7 +4589,7 @@
     <message>
         <location line="+27"/>
         <source>Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set</translation>
     </message>
     <message>
         <location line="+347"/>
@@ -4670,22 +4664,22 @@
     <message>
         <location line="-986"/>
         <source>Edge Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Randanzahl</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Corner Count</source>
-        <translation type="unfinished"></translation>
+        <translation>Eckenanzahl</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Wang Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Farbe</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Change Infinite Property</source>
-        <translation type="unfinished"></translation>
+        <translation>Endlos-Eigenschaften verändern</translation>
     </message>
     <message>
         <location line="+931"/>
@@ -4752,7 +4746,7 @@
     <message>
         <location line="+56"/>
         <source>Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -4787,7 +4781,7 @@
     <message>
         <location line="+12"/>
         <source>Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>Gesperrt</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4929,7 +4923,7 @@
         <location filename="../src/tiled/shapefilltool.cpp" line="+40"/>
         <location line="+77"/>
         <source>Shape Fill Tool</source>
-        <translation type="unfinished"></translation>
+        <translation>Formfüllwerkzeug</translation>
     </message>
     <message>
         <location line="-74"/>
@@ -4940,12 +4934,12 @@
     <message>
         <location line="+2"/>
         <source>Rectangle Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechteckiges Füllen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Circle Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>Kreisförmiges Füllen</translation>
     </message>
 </context>
 <context>
@@ -4966,7 +4960,7 @@
         <location line="-26"/>
         <location line="+20"/>
         <source>Wang Fill Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Füllmodus</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4982,13 +4976,13 @@
         <location filename="../src/tiled/abstractobjecttool.cpp" line="-125"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Links rotieren</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Rechts rotieren</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5041,27 +5035,27 @@
         <location line="+4"/>
         <location line="+9"/>
         <source>%1: Couldn&apos;t find &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: Konnte &quot;%2&quot; nicht finden</translation>
     </message>
     <message>
         <location line="-4"/>
         <source>Locate Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>Tileset finden</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Choose the Templates Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle den Vorlagen-Ordner</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlagen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Choose Templates Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle das Vorlagen-Verzeichnis</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -5084,7 +5078,7 @@
     <message>
         <location line="+90"/>
         <source>Select All Instances</source>
-        <translation type="unfinished"></translation>
+        <translation>Alle Instanzen auswählen</translation>
     </message>
 </context>
 <context>
@@ -5127,12 +5121,12 @@
     <message>
         <location line="+1"/>
         <source>Move Terrain Type Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Terrain-Typ hoch bewegen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move Terrain Type Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Terrain-Typ nach unten bewegen</translation>
     </message>
 </context>
 <context>
@@ -5390,7 +5384,7 @@
     <message>
         <location line="+89"/>
         <source>New Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Neues Wang-Set</translation>
     </message>
 </context>
 <context>
@@ -5421,12 +5415,12 @@
     <message>
         <location line="+9"/>
         <source>Set Wang Set Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set Bild festlegen</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Set Wang Color Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Farben Bild festlegen</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -5452,7 +5446,7 @@
     <message>
         <location line="+28"/>
         <source>Tiled tileset files (*.tsx *.xml)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled Tileset Dateien (*.tsx *.xml)</translation>
     </message>
 </context>
 <context>
@@ -5525,7 +5519,7 @@
         <location filename="../src/tiled/wangbrush.cpp" line="+108"/>
         <location line="+65"/>
         <source>Wang Brush</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Pinsel</translation>
     </message>
     <message>
         <location line="-62"/>
@@ -5535,8 +5529,8 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
-        <translation type="unfinished"></translation>
+        <source>Missing Wang tile transition</source>
+        <translation>Fehlender Wang-Tile Übergang</translation>
     </message>
 </context>
 <context>
@@ -5544,12 +5538,12 @@
     <message>
         <location filename="../src/tiled/wangcolormodel.cpp" line="+144"/>
         <source>Edge Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Rand-Farben</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Corner Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Eck-Farben</translation>
     </message>
 </context>
 <context>
@@ -5557,7 +5551,7 @@
     <message>
         <location filename="../src/tiled/wangcolorview.cpp" line="+184"/>
         <source>Pick Custom Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Wähle eine Farbe</translation>
     </message>
 </context>
 <context>
@@ -5566,7 +5560,7 @@
         <location filename="../src/tiled/wangdock.cpp" line="+227"/>
         <location line="+327"/>
         <source>Patterns</source>
-        <translation type="unfinished"></translation>
+        <translation>Muster</translation>
     </message>
     <message>
         <location line="-326"/>
@@ -5577,37 +5571,37 @@
     <message>
         <location line="-10"/>
         <source>Wang Sets</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Erase WangIds</source>
-        <translation type="unfinished"></translation>
+        <translation>WangIDs löschen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set löschen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Edge Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Rand-Farbe hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Corner Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Eck-Farbe hinzufügen</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Farbe entfernen</translation>
     </message>
 </context>
 <context>
@@ -5615,7 +5609,7 @@
     <message>
         <location filename="../src/tiled/wangsetview.cpp" line="+105"/>
         <source>Wang Set &amp;Properties...</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set &amp; Eigenschaften</translation>
     </message>
 </context>
 <context>
@@ -5623,7 +5617,7 @@
     <message>
         <location filename="../src/tiled/tmxmapformat.h" line="+27"/>
         <source>Tiled template files (*.tx)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled Vorlagen (*.tx)</translation>
     </message>
 </context>
 <context>
@@ -5631,13 +5625,14 @@
     <message>
         <location filename="../src/libtiled/worldmanager.cpp" line="+109"/>
         <source>Could not open file for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation>Datei konnte nicht zum Lesen geöffnet werden.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>JSON parse error at offset %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>JSON Analysefehler bei Offset %1:
+%2.</translation>
     </message>
 </context>
 <context>
@@ -5668,7 +5663,7 @@
     <message>
         <location line="+11"/>
         <source>Add Objects</source>
-        <translation type="unfinished"></translation>
+        <translation>Objekte hinzufügen</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -5678,7 +5673,7 @@
     <message>
         <location line="+11"/>
         <source>Remove Objects</source>
-        <translation type="unfinished">Objekte entfernen</translation>
+        <translation>Objekte entfernen</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremovetileset.cpp" line="+62"/>
@@ -5836,12 +5831,12 @@
     <message>
         <location line="+19"/>
         <source>Toggle Polygon/Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Polygon/Polylinie umschalten</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Split Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Polylinie teilen</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremoveterrain.cpp" line="+67"/>
@@ -5876,12 +5871,12 @@
     <message>
         <location line="+19"/>
         <source>Lock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ebene sperren</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unlock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>Ebene entsperren</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -5914,27 +5909,21 @@
     <message numerus="yes">
         <location line="+65"/>
         <source>Detach %n Template Instance(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Vorlagen-Instanz lösen</numerusform>
+        <numerusform>%n Vorlagen-Instanzen lösen</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+39"/>
         <source>Reset %n Instances</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Instanz zurücksetzen</numerusform>
+        <numerusform>%n Instanzen zurücksetzen</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+46"/>
         <source>Replace %n Object(s) With Template</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Objekt mit Vorlage ersetzen</numerusform>
+        <numerusform>&amp;n Objekte mit Vorlage ersetzen</numerusform>
+        </translation></message>
     <message>
         <location filename="../src/tiled/renameterrain.cpp" line="+36"/>
         <source>Change Terrain Name</source>
@@ -6007,7 +5996,7 @@
     <message>
         <location line="+4"/>
         <source>Change Infinite Property</source>
-        <translation type="unfinished"></translation>
+        <translation>Endlos-Eigenschaften ändern</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6095,81 +6084,77 @@
     <message>
         <location filename="../src/tiled/addremovewangset.cpp" line="+65"/>
         <source>Add Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set hinzufügen</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Remove Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set entfernen</translation>
     </message>
     <message>
         <location filename="../src/tiled/changetilewangid.cpp" line="+36"/>
         <location line="+12"/>
         <location line="+14"/>
         <source>Change Tile WangId</source>
-        <translation type="unfinished"></translation>
+        <translation>Tile-WangID ändern</translation>
     </message>
     <message>
         <location filename="../src/tiled/changewangsetdata.cpp" line="+38"/>
         <source>Change Wang Set edge count</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set Randanzahl ändern</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Change Wang Set corner count</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set Eckenanzahl ändern</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Remove Wang Color</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Farbe entfernen</translation>
     </message>
     <message>
         <location line="+90"/>
         <source>Set Wang Set Image</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set Bild festlegen</translation>
     </message>
     <message>
         <location filename="../src/tiled/moveterrain.cpp" line="+61"/>
         <source>Move Terrain Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Terrain nach oben bewegen</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Move Terrain Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Terrain nach unten bewegen</translation>
     </message>
     <message>
         <location filename="../src/tiled/renamewangset.cpp" line="+35"/>
         <source>Change Wang Set Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Wang-Set Name ändern</translation>
     </message>
     <message>
         <location filename="../src/tiled/replacetemplate.cpp" line="+35"/>
         <source>Replace Template</source>
-        <translation type="unfinished"></translation>
+        <translation>Vorlage ersetzen</translation>
     </message>
     <message>
         <location filename="../src/tiled/shapefilltool.cpp" line="-20"/>
         <source>Shape Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>Form füllen</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/tiled/mapdocument.cpp" line="-683"/>
         <source>Raise %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Ebene anheben</numerusform>
+        <numerusform>%n Ebenen anheben</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+27"/>
         <source>Lower %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Ebene senken</numerusform>
+        <numerusform>%n Ebenen senken</numerusform>
+        </translation></message>
 </context>
 <context>
     <name>Utils</name>
@@ -6194,93 +6179,93 @@
     <message>
         <location filename="../src/tmxrasterizer/main.cpp" line="+52"/>
         <source>Renders a Tiled map (TMX format) to an image.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled-Karte (TMX Format) zu einem Bild rendern.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The scale of the output image (default: 1).</source>
-        <translation type="unfinished"></translation>
+        <translation>Die Skalierung des Bildes (Standard: 1).</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>scale</source>
-        <translation type="unfinished"></translation>
+        <translation>Skalierung</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>The requested size in pixels at which a tile is rendered (overrides the --scale option).</source>
-        <translation type="unfinished"></translation>
+        <translation>Die angeforderte Pixelgröße in der eine Kachel gerendert wird (überschreibt --scale).</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+3"/>
         <source>size</source>
-        <translation type="unfinished"></translation>
+        <translation>Größe</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>The output image fits within a SIZE x SIZE square (overrides the --scale and --tilesize options).</source>
-        <translation type="unfinished"></translation>
+        <translation>Das Ausgabe-Bild passt in ein SIZE x SIZE Quadrat (überschreibt --scale und --tilesize).</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Antialias edges of primitives.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antialiasing von primitiven Kanten.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Use nearest neighbour instead of smooth blending of pixels.</source>
-        <translation type="unfinished"></translation>
+        <translation>Benutze den Nachbarn statt einer weichen Pixelblendung.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ignore all layer visibility flags in the map file, and render all layers in the output (default is to omit invisible layers).</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignoriere alle Sichtbarkeits-Flaggen einer Karte und render alle Ebenen (Unsichtbare Ebenen werden standardmäßig ausgelassen).</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Specifies a layer to omit from the output image. Can be repeated to hide multiple layers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Legt eine vom Output-Bild auszulassende Ebene fest. Wiederholen um mehrere Ebenen zu verstecken.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>name</source>
-        <translation type="unfinished"></translation>
+        <translation>Name</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Map file to render.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zu rendernde Karte.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Image file to output.</source>
-        <translation type="unfinished"></translation>
+        <translation>Die auszugebende Bild-Datei.</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Invalid size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Unzulässige Größe angegeben: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid tile size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Unzulässige Kachel-Größe angegeben: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid scale specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Unzulässige Skalierung: &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../src/tmxviewer/main.cpp" line="+57"/>
         <source>Displays a Tiled map (TMX format).</source>
-        <translation type="unfinished"></translation>
+        <translation>Zeigt eine Tiled-Karte (TMX Format).</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Map file to display.</source>
-        <translation type="unfinished"></translation>
+        <translation>Darzustellende Karten-Datei.</translation>
     </message>
 </context>
 </TS>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_en.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_en.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_en.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_en.ts	2019-05-15 15:33:52.000000000 +0000
@@ -454,7 +454,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation></translation>
     </message>
     <message>
@@ -489,8 +489,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Json template files (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON template files (*.json)</translation>
     </message>
 </context>
 <context>
@@ -518,7 +518,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation></translation>
     </message>
 </context>
@@ -5508,7 +5508,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Missing Wang tile transition</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_es.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_es.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_es.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_es.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Archivos de mapa Json (*json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Archivos de mapa JSON (*json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Archivos de plantilla de Json (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>Archivos de plantilla de JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Archivos de conjuto de patrones Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Archivos de conjuto de patrones JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5535,7 +5535,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Transición de patrón Wang perdida</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_fi.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_fi.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_fi.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_fi.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json kenttätiedostot (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON kenttätiedostot (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json tileset-tiedostot (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON tileset-tiedostot (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5535,7 +5535,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_fr.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_fr.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_fr.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_fr.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Fichiers de cartes Json (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Fichiers de cartes JSON (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Fichier de Modèle Json (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>Fichier de Modèle JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Fichiers de tileset Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Fichiers de tileset JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5524,7 +5524,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Transition de la tuile Wang manquante</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_he.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_he.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_he.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_he.ts	2019-05-15 15:33:52.000000000 +0000
@@ -459,8 +459,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json קבצי מפה (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON קבצי מפה (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -493,7 +493,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -522,8 +522,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json tileset קבצי (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON tileset קבצי (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5526,7 +5526,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_hu.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_hu.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_hu.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_hu.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json térképfájlok (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON térképfájlok (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Json sablonfájlok (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON sablonfájlok (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json csempekészletfájlok (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON csempekészletfájlok (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5509,7 +5509,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_it.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_it.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_it.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_it.ts	2019-05-15 15:33:52.000000000 +0000
@@ -459,8 +459,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>File mappa Json (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>File mappa JSON (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -494,7 +494,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -524,8 +524,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>FIle tileset Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>File tileset JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5532,7 +5532,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_ja.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_ja.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_ja.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_ja.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json マップファイル (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON マップファイル (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json タイルセットファイル (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON タイルセットファイル (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5510,7 +5510,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_ko.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_ko.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_ko.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_ko.ts	2019-05-15 15:33:52.000000000 +0000
@@ -28,7 +28,8 @@
         <translation>&lt;p align=&quot;center&quot;&gt;&lt;font size=&quot;+2&quot;&gt;&lt;b&gt;Tiled Map Editor&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;i&gt;Version %1&lt;/i&gt;&lt;/p&gt;
 &lt;p align=&quot;center&quot;&gt;Copyright 2008-2018 Thorbj&amp;oslash;rn Lindeijer&lt;br&gt;(모든 기여자 이름은 &apos;AUTHORS&apos; 파일을 참조하십시오.)&lt;/p&gt;
 &lt;p align=&quot;center&quot;&gt;이 프로그램은 GPL (version 2 이상)에 의거해 수정 및 재배포 될 수 있습니다. GPL 사본은 Tiled와 함께 배포된 &apos;COPYING&apos; 파일에 수록되어 있습니다.&lt;/p&gt;
-&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;</translation>
+&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;
+</translation>
     </message>
 </context>
 <context>
@@ -49,7 +50,7 @@
     <message>
         <location filename="../src/tiled/main.cpp" line="+239"/>
         <source>Export syntax is --export-map [format] &lt;tmx file&gt; &lt;target file&gt;</source>
-        <translation>내보내기 형식은 --export-map [format] &lt;tmx file&gt; &lt;target file&gt; </translation>
+        <translation>내보내기 형식은 --export-map [format] &lt;tmx file&gt; &lt;target file&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -403,8 +404,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json 맵 파일 (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON 맵 파일 (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -438,8 +439,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json 타일셋 파일 (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON 타일셋 파일 (*.json)</translation>
     </message>
 </context>
 <context>
@@ -1609,97 +1610,97 @@
     <message>
         <location filename="../src/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="-220"/>
         <source>Arrow</source>
-        <translation>Arrow</translation>
+        <translation>화살표</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Up Arrow</source>
-        <translation>Up Arrow</translation>
+        <translation>위 화살표</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Cross</source>
-        <translation>Cross</translation>
+        <translation>십자가</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Wait</source>
-        <translation>Wait</translation>
+        <translation>대기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>IBeam</source>
-        <translation>IBeam</translation>
+        <translation>I광선</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Size Vertical</source>
-        <translation>Size Vertical</translation>
+        <translation>세로 크기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Size Horizontal</source>
-        <translation>Size Horizontal</translation>
+        <translation>가로 크기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Size Backslash</source>
-        <translation>Size Backslash</translation>
+        <translation>백슬래시(\) 크기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Size Slash</source>
-        <translation>Size Slash</translation>
+        <translation>슬래시(/) 크기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Size All</source>
-        <translation>Size All</translation>
+        <translation>모든 크기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Blank</source>
-        <translation>Blank</translation>
+        <translation>공백</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Split Vertical</source>
-        <translation>Split Vertical</translation>
+        <translation>세로 나누기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Split Horizontal</source>
-        <translation>Split Horizontal</translation>
+        <translation>가로 나누기</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Pointing Hand</source>
-        <translation>Pointing Hand</translation>
+        <translation>포인팅 핸드</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Forbidden</source>
-        <translation>Forbidden</translation>
+        <translation>금지됨</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Open Hand</source>
-        <translation>Open Hand</translation>
+        <translation>오픈 핸드</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Closed Hand</source>
-        <translation>Closed Hand</translation>
+        <translation>클로즈드 핸드</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>What&apos;s This</source>
-        <translation>What&apos;s This</translation>
+        <translation>이것이 무엇인가요</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Busy</source>
-        <translation>Busy</translation>
+        <translation>바쁜</translation>
     </message>
 </context>
 <context>
@@ -1913,7 +1914,7 @@
         <location line="+1704"/>
         <location line="+1"/>
         <source>&lt;Invalid&gt;</source>
-        <translation>&lt;Invalid&gt;</translation>
+        <translation>&lt;무효&gt;</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -1923,22 +1924,22 @@
     <message>
         <location line="+45"/>
         <source>Horizontal Policy</source>
-        <translation>Horizontal Policy</translation>
+        <translation>수평 정책</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Vertical Policy</source>
-        <translation>Vertical Policy</translation>
+        <translation>수직 정책</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Horizontal Stretch</source>
-        <translation>Horizontal Stretch</translation>
+        <translation>수평 늘이기</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Vertical Stretch</source>
-        <translation>Vertical Stretch</translation>
+        <translation>수직 늘이기</translation>
     </message>
 </context>
 <context>
@@ -2073,7 +2074,7 @@
     <message>
         <location line="+26"/>
         <source>Offset</source>
-        <translation>Offset</translation>
+        <translation>오프셋</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -2459,7 +2460,7 @@
         <location line="+88"/>
         <location line="+66"/>
         <source>&lt;new command&gt;</source>
-        <translation>&lt;new command&gt;</translation>
+        <translation>&lt;새로운 명령어&gt;</translation>
     </message>
     <message>
         <location line="-58"/>
@@ -2524,7 +2525,7 @@
     <message>
         <location line="+84"/>
         <source>%1 (copy)</source>
-        <translation>%1 (copy)</translation>
+        <translation>%1 (복사)</translation>
     </message>
     <message>
         <location line="+16"/>
@@ -2604,7 +2605,7 @@
     <message>
         <location filename="../src/tiled/createellipseobjecttool.cpp" line="+39"/>
         <source>Insert Ellipse</source>
-        <translation>타원형 삽입 </translation>
+        <translation>타원형 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2625,7 +2626,7 @@
     <message>
         <location filename="../src/tiled/createpolygonobjecttool.cpp" line="+39"/>
         <source>Insert Polygon</source>
-        <translation>다각형 삽입 </translation>
+        <translation>다각형 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2638,7 +2639,7 @@
     <message>
         <location filename="../src/tiled/createpolylineobjecttool.cpp" line="+39"/>
         <source>Insert Polyline</source>
-        <translation>다각선 삽입 </translation>
+        <translation>다각선 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2651,7 +2652,7 @@
     <message>
         <location filename="../src/tiled/createrectangleobjecttool.cpp" line="+39"/>
         <source>Insert Rectangle</source>
-        <translation>직사각형 삽입 </translation>
+        <translation>직사각형 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2664,7 +2665,7 @@
     <message>
         <location filename="../src/tiled/createtextobjecttool.cpp" line="+70"/>
         <source>Insert Text</source>
-        <translation>텍스트 삽입 </translation>
+        <translation>텍스트 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2682,7 +2683,7 @@
     <message>
         <location filename="../src/tiled/createtileobjecttool.cpp" line="+81"/>
         <source>Insert Tile</source>
-        <translation>타일 삽입 </translation>
+        <translation>타일 삽입</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2705,7 +2706,7 @@
     <message>
         <location line="+110"/>
         <source>Copy File Path</source>
-        <translation>파일 경로 복사 </translation>
+        <translation>파일 경로 복사</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -2729,7 +2730,7 @@
         <location filename="../src/tiled/editpolygontool.cpp" line="+129"/>
         <location line="+209"/>
         <source>Edit Polygons</source>
-        <translation>다각형 편집 </translation>
+        <translation>다각형 편집</translation>
     </message>
     <message>
         <location line="-207"/>
@@ -2785,12 +2786,12 @@
     <message>
         <location filename="../src/tiled/exportasimagedialog.cpp" line="+64"/>
         <source>Export</source>
-        <translation>내보내기 </translation>
+        <translation>내보내기</translation>
     </message>
     <message>
         <location line="+73"/>
         <source>Export as Image</source>
-        <translation>이미지로 내보내기 </translation>
+        <translation>이미지로 내보내기</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2822,7 +2823,7 @@
     <message>
         <location line="+107"/>
         <source>Image</source>
-        <translation>이미지 </translation>
+        <translation>이미지</translation>
     </message>
 </context>
 <context>
@@ -3037,7 +3038,7 @@
     <message>
         <location line="-547"/>
         <source>Open Map</source>
-        <translation>맵 열기 </translation>
+        <translation>맵 열기</translation>
     </message>
     <message>
         <location line="+126"/>
@@ -3223,10 +3224,8 @@
     <message numerus="yes">
         <location line="+28"/>
         <source>Rotate %n Object(s)</source>
-        <translation>
-            <numerusform>%n개 오브젝트 회전 </numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>%n개 오브젝트 회전</numerusform>
+        </translation></message>
     <message>
         <location line="+36"/>
         <source>Tile Layer %1</source>
@@ -3324,7 +3323,7 @@
     <message>
         <location filename="../src/tiled/mapdocumentactionhandler.cpp" line="+66"/>
         <source>Ctrl+Shift+A</source>
-        <translation>Ctral+Shift+A</translation>
+        <translation>Ctrl+Shift+A</translation>
     </message>
     <message>
         <location line="+30"/>
@@ -3645,25 +3644,25 @@
         <location line="+20"/>
         <location filename="../src/tiled/propertybrowser.cpp" line="-17"/>
         <source>Orthogonal</source>
-        <translation>Orthogonal</translation>
+        <translation>직교</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
         <source>Isometric</source>
-        <translation>Isometric</translation>
+        <translation>아이소메트릭</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
         <source>Isometric (Staggered)</source>
-        <translation>Isometric (Staggered)</translation>
+        <translation>아이소메트릭 (비틀거림)</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
         <source>Hexagonal (Staggered)</source>
-        <translation>Hexagonal (Staggered)</translation>
+        <translation>육각형 (비틀거림)</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -3745,7 +3744,7 @@
         <location filename="../src/tiled/objectselectiontool.cpp" line="+314"/>
         <location line="+376"/>
         <source>Select Objects</source>
-        <translation>오브젝트 선택 </translation>
+        <translation>오브젝트 선택</translation>
     </message>
     <message>
         <location line="-374"/>
@@ -4742,7 +4741,7 @@
     <message>
         <location line="+1"/>
         <source>&lt;empty&gt;</source>
-        <translation>&lt;empty&gt;</translation>
+        <translation>&lt;비어있음&gt;</translation>
     </message>
 </context>
 <context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_lv.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_lv.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_lv.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_lv.ts	2019-05-15 15:33:52.000000000 +0000
@@ -403,7 +403,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -437,7 +437,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_nb.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_nb.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_nb.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_nb.ts	2019-05-15 15:33:52.000000000 +0000
@@ -80,7 +80,7 @@
     <message>
         <location line="+9"/>
         <source>Export syntax is --export-tileset [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksportsyntaksen er --export-tileset [format] &lt;kilde&gt; &lt;mål&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -202,7 +202,7 @@
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with types and properties resolved</source>
-        <translation type="unfinished"></translation>
+        <translation>Eksporter kart eller flissett med typer og egenskaper løst</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -461,8 +461,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json-kartfiler (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON-kartfiler (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -496,7 +496,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation>JSON-malfiler (*.json)</translation>
     </message>
 </context>
@@ -526,8 +526,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json-rutebrettfiler (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON-rutebrettfiler (*.json)</translation>
     </message>
 </context>
 <context>
@@ -586,7 +586,7 @@
     <message>
         <location line="+4"/>
         <source>Unload World</source>
-        <translation type="unfinished"></translation>
+        <translation>Last ut verden</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -711,17 +711,17 @@
     <message>
         <location line="+127"/>
         <source>For Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">For flytende objekt</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Load World...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Last verden…</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Highlight Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Framhev flytende objekt</translation>
     </message>
     <message>
         <location line="-124"/>
@@ -911,7 +911,7 @@
     <message>
         <location line="+24"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1570,7 +1570,7 @@
     <message>
         <location line="+7"/>
         <source>Detach templates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Hekt av maler</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2384,7 +2384,7 @@
     <message>
         <location line="+11"/>
         <source>Frame Duration: </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Rammevariget: </translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2625,7 +2625,7 @@
     <message>
         <location line="+3"/>
         <source>No output_&lt;name&gt; layer found!</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ingen utdata_&lt;navn&gt;-lag funnet!</translation>
     </message>
 </context>
 <context>
@@ -3022,12 +3022,12 @@
     <message>
         <location line="+122"/>
         <source>Connect Polylines</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Knytt sammen polylinjer</translation>
     </message>
     <message>
         <location line="+202"/>
         <source>Create Polygon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Opprett polygon</translation>
     </message>
 </context>
 <context>
@@ -3187,7 +3187,7 @@
     <message>
         <location line="-334"/>
         <source>Extend Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forleng polylinje</translation>
     </message>
 </context>
 <context>
@@ -4024,7 +4024,7 @@
     <message>
         <location filename="../src/tiled/mapeditor.cpp" line="+665"/>
         <source>Paste in Place</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Lim inn på stedet</translation>
     </message>
     <message>
         <location line="+187"/>
@@ -5527,7 +5527,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Manglende Wang-flisovergang</translation>
     </message>
 </context>
@@ -5629,7 +5629,8 @@
         <location line="+8"/>
         <source>JSON parse error at offset %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">JSON-fortolkningsfeil i forskyvning %1:
+%2.</translation>
     </message>
 </context>
 <context>
@@ -6182,12 +6183,12 @@
     <message>
         <location filename="../src/tmxrasterizer/main.cpp" line="+52"/>
         <source>Renders a Tiled map (TMX format) to an image.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Tegner et Tiled-kart (TMX-format) til et bilde.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The scale of the output image (default: 1).</source>
-        <translation type="unfinished"></translation>
+        <translation>Skala for utdatabilde (forvalg: 1).</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -6213,7 +6214,7 @@
     <message>
         <location line="+3"/>
         <source>Antialias edges of primitives.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Kanutjevning av kanter tilhørende primitiver.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6263,7 +6264,7 @@
     <message>
         <location filename="../src/tmxviewer/main.cpp" line="+57"/>
         <source>Displays a Tiled map (TMX format).</source>
-        <translation type="unfinished"></translation>
+        <translation>Viser et Tiled-kart (TMX-format).</translation>
     </message>
     <message>
         <location line="+3"/>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_nl.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_nl.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_nl.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_nl.ts	2019-05-15 15:33:52.000000000 +0000
@@ -461,8 +461,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json map bestanden (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON map bestanden (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -496,8 +496,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Json sjabloon bestand (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON sjabloon bestand (*.json)</translation>
     </message>
 </context>
 <context>
@@ -526,8 +526,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json tileset bestanden (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON tileset bestanden (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5537,7 +5537,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Missende Wang tile transitie</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_pl.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_pl.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_pl.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_pl.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Pliki map Json (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Pliki map JSON (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Pliki szablonów Jsona (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>Pliki szablonów JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Pliki zestawu kafelków Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Pliki zestawu kafelków JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5563,7 +5563,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_pt_PT.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_pt_PT.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_pt_PT.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_pt_PT.ts	2019-05-15 15:33:52.000000000 +0000
@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/tiled/main.cpp" line="+359"/>
         <source>Export syntax is --export-map [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation>Sintaxe de Exportação é --export-map [format] &lt;source&gt; &lt;target&gt;</translation>
+        <translation>Sintaxe de Exportação é --export-map [formato] &lt;fonte&gt; &lt;destino&gt;</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -80,7 +80,7 @@
     <message>
         <location line="+9"/>
         <source>Export syntax is --export-tileset [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation>Sintaxe de exportação é --export-tileset [format] &lt;source&gt; &lt;target&gt;</translation>
+        <translation>Sintaxe de exportação é --export-tileset [formato] &lt;fonte&gt; &lt;destino&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -90,7 +90,7 @@
     <message>
         <location line="+11"/>
         <source>Failed to export tileset to target file.</source>
-        <translation>Falha ao exportar tileset para ficheiro alvo.</translation>
+        <translation>Falha ao exportar tileset para ficheiro de destino.</translation>
     </message>
 </context>
 <context>
@@ -167,12 +167,12 @@
     <message>
         <location line="+5"/>
         <source>Export the specified map file to target</source>
-        <translation>Exportar o mapa específico para alvo</translation>
+        <translation>Exportar o mapa específico para destino</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the specified tileset file to target</source>
-        <translation>Exportar o tileset específico para alvo</translation>
+        <translation>Exportar o tileset específico para destino</translation>
     </message>
     <message>
         <location line="+84"/>
@@ -197,12 +197,12 @@
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with template instances detached</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar o mapa ou tileset com instâncias de template independentes</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with types and properties resolved</source>
-        <translation type="unfinished"></translation>
+        <translation>Exportar o mapa ou tileset com tipos e propriedades resolvidos</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Ficheiros Json map(*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Ficheiros JSON map (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Ficheiros Json template(*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>Ficheiros JSON template (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Ficheiros Json tileset(*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Ficheiros JSON tileset (*.json)</translation>
     </message>
 </context>
 <context>
@@ -1077,7 +1077,7 @@
         <location line="+14"/>
         <location filename="../src/libtiled/varianttomapconverter.cpp" line="-29"/>
         <source>Unable to parse tile at (%1,%2) on layer &apos;%3&apos;</source>
-        <translation>Incapaz de intrepertar tile em (%1,%2) na camada &apos;%3&apos;</translation>
+        <translation>Incapaz de interpretar tile em (%1,%2) na camada &apos;%3&apos;</translation>
     </message>
     <message>
         <location line="-34"/>
@@ -1223,7 +1223,7 @@
     <message>
         <location line="+129"/>
         <source>Tile width:</source>
-        <translation>Largura:</translation>
+        <translation>Largura do Tile:</translation>
     </message>
     <message>
         <location line="+38"/>
@@ -1262,7 +1262,7 @@
     <message>
         <location line="-45"/>
         <source>Tile height:</source>
-        <translation>Altura:</translation>
+        <translation>Altura do Tile:</translation>
     </message>
     <message>
         <location line="+91"/>
@@ -2160,12 +2160,12 @@
     <message>
         <location line="+11"/>
         <source>Can&apos;t parse file header!</source>
-        <translation>Impossivel analizar cabeçalho do ficheiro!</translation>
+        <translation>Impossível interpretar cabeçalho do ficheiro!</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Can&apos;t parse layer header!</source>
-        <translation>Impossivel analizar cabeçalho da camada!</translation>
+        <translation>Impossível interpretar cabeçalho da camada!</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -2481,7 +2481,7 @@
     <message>
         <location line="+5"/>
         <source>Raise Object</source>
-        <translation>Levantar Objeto</translation>
+        <translation>Elevar Objeto</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -2501,7 +2501,7 @@
     <message>
         <location line="+1"/>
         <source>Raise Object to Top</source>
-        <translation>Levantar Objeto ao Topo</translation>
+        <translation>Elevar Objeto ao Topo</translation>
     </message>
     <message>
         <location line="+0"/>
@@ -2599,7 +2599,7 @@
     <message>
         <location line="-6"/>
         <source>&apos;regions_output&apos; layer must not occur more than once.</source>
-        <translation>camada &apos;regions_output&apos; não deve ocurrer mais que uma vez.</translation>
+        <translation>camada &apos;regions_output&apos; não deve ocorrer mais que uma vez.</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -3144,7 +3144,7 @@
     <message>
         <location line="-23"/>
         <source>Split Segment</source>
-        <translation type="unfinished"></translation>
+        <translation>Dividir Segmento</translation>
     </message>
     <message numerus="yes">
         <location line="+265"/>
@@ -3184,7 +3184,7 @@
     <message>
         <location line="-334"/>
         <source>Extend Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Estender Polilinha</translation>
     </message>
 </context>
 <context>
@@ -3329,12 +3329,12 @@
     <message>
         <location line="+31"/>
         <source>Lock Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloquear as outras Camadas</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unlock Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Desbloquear as outras Camadas</translation>
     </message>
 </context>
 <context>
@@ -3553,17 +3553,17 @@
     <message>
         <location line="+71"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location line="+167"/>
         <source>Load World</source>
-        <translation type="unfinished"></translation>
+        <translation>Carregar Mundo</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Error Loading World</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao Carregar Mundo</translation>
     </message>
     <message>
         <location line="+79"/>
@@ -3693,7 +3693,7 @@
     <message>
         <location line="+36"/>
         <source>Tile Layer %1</source>
-        <translation>Camade de Tiles %1</translation>
+        <translation>Camada de Tiles %1</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3714,27 +3714,21 @@
     <message numerus="yes">
         <location line="+2"/>
         <source>Group %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Agrupar %n Camada</numerusform>
+        <numerusform>Agrupar %n Camadas</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+16"/>
         <source>Ungroup %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Desagrupar %n Camada</numerusform>
+        <numerusform>Desagrupar %n Camadas</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+46"/>
         <source>Duplicate %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Duplicar %n Camada</numerusform>
+        <numerusform>Duplicar %n Camadas</numerusform>
+        </translation></message>
     <message>
         <location line="+27"/>
         <source>Copy of %1</source>
@@ -3748,11 +3742,9 @@
     <message numerus="yes">
         <location line="+73"/>
         <source>Remove %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Remover %n Camada</numerusform>
+        <numerusform>Remover %n Camadas</numerusform>
+        </translation></message>
     <message>
         <location line="+305"/>
         <source>Tile</source>
@@ -3884,17 +3876,17 @@
     <message>
         <location line="+8"/>
         <source>&amp;Remove Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Remover Camadas</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>R&amp;aise Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Elev&amp;ar Camadas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Lower Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Baixar Camadas</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -3914,7 +3906,7 @@
     <message>
         <location line="+1"/>
         <source>Lock/&amp;Unlock all Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Bloq&amp;uear/Desbloquear todas as outras Camadas</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -4002,17 +3994,17 @@
     <message>
         <location line="-318"/>
         <source>&amp;Group Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>A&amp;grupar Camadas</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Ungroup Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Desagr&amp;upar Camadas</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Duplicate Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Duplicar Camadas</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4030,7 +4022,7 @@
     <message>
         <location filename="../src/tiled/mapeditor.cpp" line="+665"/>
         <source>Paste in Place</source>
-        <translation type="unfinished"></translation>
+        <translation>Colar na Posição</translation>
     </message>
     <message>
         <location line="+187"/>
@@ -4165,7 +4157,7 @@
     <message>
         <location line="+1"/>
         <source>Tile layers for this map will consume %L1 GB of memory each. Not creating one by default.</source>
-        <translation>Camadas de Tile para este mapa irão consumir% L1 GB de memória cada. Não criando um por padrão.</translation>
+        <translation>Cada camada de Tile para este mapa irá consumir %L1 GB de memória. Nenhuma criada por padrão.</translation>
     </message>
     <message>
         <location line="+45"/>
@@ -4213,12 +4205,12 @@
     <message>
         <location filename="../src/tiled/newsbutton.cpp" line="+45"/>
         <source>News</source>
-        <translation type="unfinished"></translation>
+        <translation>Notícias</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>News Archive</source>
-        <translation type="unfinished"></translation>
+        <translation>Arquivo de Notícias</translation>
     </message>
 </context>
 <context>
@@ -4593,7 +4585,7 @@
     <message>
         <location line="+27"/>
         <source>Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>Conjunto Wang</translation>
     </message>
     <message>
         <location line="+347"/>
@@ -4618,7 +4610,7 @@
     <message>
         <location line="+8"/>
         <source>Tile Render Order</source>
-        <translation>Ordem de renderizar dos Tiles</translation>
+        <translation>Ordem de renderização dos Tiles</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -4860,7 +4852,7 @@
     <message>
         <location line="+11"/>
         <source>Drawing Offset</source>
-        <translation>Deslocamento</translation>
+        <translation>Deslocamento do Desenho</translation>
     </message>
     <message>
         <location line="+14"/>
@@ -5388,7 +5380,7 @@
     <message>
         <location line="+89"/>
         <source>New Wang Set</source>
-        <translation>Novo Wang Set</translation>
+        <translation>Novo Conjunto Wang</translation>
     </message>
 </context>
 <context>
@@ -5414,12 +5406,12 @@
     <message>
         <location line="+4"/>
         <source>Set Terrain Image</source>
-        <translation>Defenir Imagem de Terreno</translation>
+        <translation>Definir Imagem de Terreno</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Set Wang Set Image</source>
-        <translation>Definir Imagem do Wang Set</translation>
+        <translation>Definir Imagem do Conjunto Wang</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5533,8 +5525,8 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
-        <translation>Transição de tile wang em falta</translation>
+        <source>Missing Wang tile transition</source>
+        <translation>Transição de tile Wang em falta</translation>
     </message>
 </context>
 <context>
@@ -5542,12 +5534,12 @@
     <message>
         <location filename="../src/tiled/wangcolormodel.cpp" line="+144"/>
         <source>Edge Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Cores das Arestas</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Corner Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Cores dos Cantos</translation>
     </message>
 </context>
 <context>
@@ -5585,12 +5577,12 @@
     <message>
         <location line="+1"/>
         <source>Add Wang Set</source>
-        <translation>Adicionar Wang Set</translation>
+        <translation>Adicionar Conjunto Wang</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Wang Set</source>
-        <translation>Remover Wang Set</translation>
+        <translation>Remover Conjunto Wang</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5613,7 +5605,7 @@
     <message>
         <location filename="../src/tiled/wangsetview.cpp" line="+105"/>
         <source>Wang Set &amp;Properties...</source>
-        <translation>&amp;Propriedades Wang Set...</translation>
+        <translation>&amp;Propriedades do Conjunto Wang...</translation>
     </message>
 </context>
 <context>
@@ -5635,7 +5627,8 @@
         <location line="+8"/>
         <source>JSON parse error at offset %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Erro ao interpretar JSON no deslocamento %1:
+%2.</translation>
     </message>
 </context>
 <context>
@@ -5666,7 +5659,7 @@
     <message>
         <location line="+11"/>
         <source>Add Objects</source>
-        <translation type="unfinished"></translation>
+        <translation>Adicionar Objetos</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -5788,7 +5781,7 @@
     <message>
         <location line="+20"/>
         <source>Change Drawing Offset</source>
-        <translation>Modificar Deslocamento</translation>
+        <translation>Modificar Deslocamento do Desenho</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -5813,7 +5806,7 @@
     <message>
         <location line="+1"/>
         <source>Raise Layer</source>
-        <translation>Levantar Camada</translation>
+        <translation>Elevar Camada</translation>
     </message>
     <message>
         <location filename="../src/tiled/movemapobjecttogroup.cpp" line="+42"/>
@@ -5904,11 +5897,9 @@
     <message numerus="yes">
         <location line="+59"/>
         <source>Change %n Object/s Tile</source>
-        <translation>
-            <numerusform>Mudar %n Tile do Objeto</numerusform>
-            <numerusform>Mudar %n Tiles do Objeto</numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Mudar Tile de %n Objeto</numerusform>
+        <numerusform>Mudar Tile de %n Objetos</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+65"/>
         <source>Detach %n Template Instance(s)</source>
@@ -5958,7 +5949,7 @@
         <location filename="../src/tiled/changemapobjectsorder.cpp" line="+46"/>
         <location filename="../src/tiled/raiselowerhelper.cpp" line="+69"/>
         <source>Raise Object</source>
-        <translation>Levantar Objeto</translation>
+        <translation>Elevar Objeto</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5979,7 +5970,7 @@
     <message>
         <location filename="../src/tiled/raiselowerhelper.cpp" line="+43"/>
         <source>Raise Object To Top</source>
-        <translation>Levantar Objeto ao Topo</translation>
+        <translation>Elevar Objeto ao Topo</translation>
     </message>
     <message>
         <location line="+37"/>
@@ -6048,7 +6039,7 @@
         <location filename="../src/tiled/changetileprobability.cpp" line="+41"/>
         <location line="+14"/>
         <source>Change Tile Probability</source>
-        <translation>Mudar a Probabilidade do Tile</translation>
+        <translation>Mudar Probabilidade do Tile</translation>
     </message>
     <message>
         <location filename="../src/tiled/adjusttileindexes.cpp" line="-139"/>
@@ -6093,12 +6084,12 @@
     <message>
         <location filename="../src/tiled/addremovewangset.cpp" line="+65"/>
         <source>Add Wang Set</source>
-        <translation>Adicionar Wang Set</translation>
+        <translation>Adicionar Conjunto Wang</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Remove Wang Set</source>
-        <translation>Remover Wang Set</translation>
+        <translation>Remover Conjunto Wang</translation>
     </message>
     <message>
         <location filename="../src/tiled/changetilewangid.cpp" line="+36"/>
@@ -6110,12 +6101,12 @@
     <message>
         <location filename="../src/tiled/changewangsetdata.cpp" line="+38"/>
         <source>Change Wang Set edge count</source>
-        <translation>Alterar contagem de arestas do Wang Set</translation>
+        <translation>Alterar contagem de arestas do Conjunto Wang</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Change Wang Set corner count</source>
-        <translation>Alterar contagem de cantos do Wang Set</translation>
+        <translation>Alterar contagem de cantos do Conjunto Wang</translation>
     </message>
     <message>
         <location line="+63"/>
@@ -6125,7 +6116,7 @@
     <message>
         <location line="+90"/>
         <source>Set Wang Set Image</source>
-        <translation>Definir Imagem do Wang Set</translation>
+        <translation>Definir Imagem do Conjunto Wang</translation>
     </message>
     <message>
         <location filename="../src/tiled/moveterrain.cpp" line="+61"/>
@@ -6140,7 +6131,7 @@
     <message>
         <location filename="../src/tiled/renamewangset.cpp" line="+35"/>
         <source>Change Wang Set Name</source>
-        <translation>Alterar Nome do Wang Set</translation>
+        <translation>Alterar Nome do Conjunto Wang</translation>
     </message>
     <message>
         <location filename="../src/tiled/replacetemplate.cpp" line="+35"/>
@@ -6155,19 +6146,15 @@
     <message numerus="yes">
         <location filename="../src/tiled/mapdocument.cpp" line="-683"/>
         <source>Raise %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Elevar %n Camada</numerusform>
+        <numerusform>Elevar %n Camadas</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+27"/>
         <source>Lower %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Baixar %n Camada</numerusform>
+        <numerusform>Baixar %n Camadas</numerusform>
+        </translation></message>
 </context>
 <context>
     <name>Utils</name>
@@ -6192,88 +6179,88 @@
     <message>
         <location filename="../src/tmxrasterizer/main.cpp" line="+52"/>
         <source>Renders a Tiled map (TMX format) to an image.</source>
-        <translation type="unfinished"></translation>
+        <translation>Renderiza um mapa Tiled (formato TMX) para imagem.</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The scale of the output image (default: 1).</source>
-        <translation type="unfinished"></translation>
+        <translation>Escala da imagem produzida (padrão: 1).</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>scale</source>
-        <translation type="unfinished"></translation>
+        <translation>escala</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>The requested size in pixels at which a tile is rendered (overrides the --scale option).</source>
-        <translation type="unfinished"></translation>
+        <translation>O tamanho em pixeis com que um tile é renderizado (substitui a opção --scale).</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+3"/>
         <source>size</source>
-        <translation type="unfinished"></translation>
+        <translation>tamanho</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>The output image fits within a SIZE x SIZE square (overrides the --scale and --tilesize options).</source>
-        <translation type="unfinished"></translation>
+        <translation>A imagem produzida cabe num quadrado SIZE x SIZE (substitui as opções --scale e --tilesize).</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Antialias edges of primitives.</source>
-        <translation type="unfinished"></translation>
+        <translation>Antialias arestas das primitivas.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Use nearest neighbour instead of smooth blending of pixels.</source>
-        <translation type="unfinished"></translation>
+        <translation>Usar vizinho mais próximo em vez de mistura suave de pixeis.</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ignore all layer visibility flags in the map file, and render all layers in the output (default is to omit invisible layers).</source>
-        <translation type="unfinished"></translation>
+        <translation>Ignora todas marcas de visibilidade no ficheiro mapa, e renderiza todas as camadas (por padrão omitem-se as camadas invisíveis).</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Specifies a layer to omit from the output image. Can be repeated to hide multiple layers.</source>
-        <translation type="unfinished"></translation>
+        <translation>Especifica a camada a omitir na imagem a produzir. Pode ser repetido para esconder várias camadas.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>name</source>
-        <translation type="unfinished"></translation>
+        <translation>nome</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Map file to render.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro mapa a renderizar.</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Image file to output.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ficheiro imagem a produzir.</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Invalid size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho inválido: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid tile size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Tamanho de tile inválido: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid scale specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>Escala inválida: &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../src/tmxviewer/main.cpp" line="+57"/>
         <source>Displays a Tiled map (TMX format).</source>
-        <translation type="unfinished"></translation>
+        <translation>Exibe um mapa Tiled (formato TMX).</translation>
     </message>
     <message>
         <location line="+3"/>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_pt.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_pt.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_pt.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_pt.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Arquivo de mapas Json (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Arquivo de mapas JSON (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Arquivos de tileset Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Arquivos de tileset JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -1137,7 +1137,7 @@
     <message>
         <location line="-42"/>
         <source>Infinite</source>
-        <translation type="unfinished"></translation>
+        <translation>Infinito</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -5535,7 +5535,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_ru.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_ru.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_ru.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_ru.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json map-файлы (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON map-файлы (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Json файлы шаблонов (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON файлы шаблонов (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json файлы с наборами тайлов (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON файлы с наборами тайлов (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5560,7 +5560,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Отстутствует переход для плиток Вана</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_sv.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_sv.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_sv.ts	1970-01-01 00:00:00.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_sv.ts	2019-05-15 15:33:52.000000000 +0000
@@ -0,0 +1,6284 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../src/tiled/aboutdialog.ui" line="+14"/>
+        <source>About Tiled</source>
+        <translation>Om Tiled</translation>
+    </message>
+    <message>
+        <location line="+86"/>
+        <source>Donate</source>
+        <translation>Donera</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/aboutdialog.cpp" line="+48"/>
+        <source>&lt;p align=&quot;center&quot;&gt;&lt;font size=&quot;+2&quot;&gt;&lt;b&gt;Tiled Map Editor&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;i&gt;Version %1&lt;/i&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;Copyright 2008-2018 Thorbj&amp;oslash;rn Lindeijer&lt;br&gt;(see the AUTHORS file for a full list of contributors)&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;You may modify and redistribute this program under the terms of the GPL (version 2 or later). A copy of the GPL is contained in the &apos;COPYING&apos; file distributed with Tiled.&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;
+</source>
+        <translation>&lt;p align=&quot;center&quot;&gt;&lt;font size=&quot;+2&quot;&gt;&lt;b&gt;Tiled Map Editor&lt;/b&gt;&lt;/font&gt;&lt;br&gt;&lt;i&gt;Version %1&lt;/i&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;Upphovsrätt 2008-2018 Thorbj&amp;oslash;rn Lindeijer&lt;br&gt;(se filen AUTHORS för en fullständig lista över bidragsgivare)&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;Du kan redigera och omdistribuera detta program under villkoren i GPL (version 2 eller senare). En kopia av GPL finns i filen &apos;COPYING&apos; som distribueras med Tiled.&lt;/p&gt;
+&lt;p align=&quot;center&quot;&gt;&lt;a href=&quot;http://www.mapeditor.org/&quot;&gt;http://www.mapeditor.org/&lt;/a&gt;&lt;/p&gt;
+</translation>
+    </message>
+</context>
+<context>
+    <name>AddPropertyDialog</name>
+    <message>
+        <location filename="../src/tiled/addpropertydialog.ui" line="+14"/>
+        <source>Add Property</source>
+        <translation>Lägg till egenskap</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Property name</source>
+        <translation>Namn på egenskap</translation>
+    </message>
+</context>
+<context>
+    <name>Command line</name>
+    <message>
+        <location filename="../src/tiled/main.cpp" line="+359"/>
+        <source>Export syntax is --export-map [format] &lt;source&gt; &lt;target&gt;</source>
+        <translation>Exportsyntax är --export-map [format] &lt;källa&gt; &lt;mål&gt;</translation>
+    </message>
+    <message>
+        <location line="-232"/>
+        <source>Format not recognized (see --export-formats)</source>
+        <translation>Format känns inte igen (se --export-formats)</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Non-unique file extension. Can&apos;t determine correct export format.</source>
+        <translation>Icke-unik filändelse. Kan inte bestämma rätt exportformat.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>No exporter found for target file.</source>
+        <translation>Inge exportör hittades för målfilen.</translation>
+    </message>
+    <message>
+        <location line="+236"/>
+        <source>Failed to load source map.</source>
+        <translation>Misslyckades att läsa in källkarta.</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Failed to export map to target file.</source>
+        <translation>Misslyckades att exportera karta till målfil.</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Export syntax is --export-tileset [format] &lt;source&gt; &lt;target&gt;</source>
+        <translation>Exportsyntax är --export-tileset [format] &lt;källa&gt; &lt;mål&gt;</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Failed to load source tileset.</source>
+        <translation>Misslyckades att läsa in källrutuppsättning.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Failed to export tileset to target file.</source>
+        <translation>Misslyckades att exportera rutuppsättning till målfilen.</translation>
+    </message>
+</context>
+<context>
+    <name>CommandDialog</name>
+    <message>
+        <location filename="../src/tiled/commanddialog.ui" line="+20"/>
+        <source>Properties</source>
+        <translation>Egenskaper</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Executable:</source>
+        <translation>Körbar fil:</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location line="+74"/>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+    <message>
+        <location line="-61"/>
+        <source>Shortcut:</source>
+        <translation>Genväg:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Clear</source>
+        <translation>Rensa</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Save map before executing</source>
+        <translation>&amp;Spara karta innan körning</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Arguments:</source>
+        <translation>Argument:</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Working Directory:</source>
+        <translation>Arbetskatalog:</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Show output in Debug Console</source>
+        <translation>Visa utdata i felsökningskonsolen</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+</context>
+<context>
+    <name>CommandLineHandler</name>
+    <message>
+        <location filename="../src/tiled/main.cpp" line="-267"/>
+        <source>Display the version</source>
+        <translation>Visa versionen</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Only check validity of arguments</source>
+        <translation>Kontrollera endast argumentens giltighet</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Disable hardware accelerated rendering</source>
+        <translation>Inaktivera hårdvaruaccelererad rendering</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export the specified map file to target</source>
+        <translation>Exportera vald kartfil till mål</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export the specified tileset file to target</source>
+        <translation>Exportera valda rutuppsättningsfilen till målet</translation>
+    </message>
+    <message>
+        <location line="+84"/>
+        <source>Map export formats:</source>
+        <translation>Exportformat för karta:</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Tileset export formats:</source>
+        <translation>Exportformat för rutuppsättning:</translation>
+    </message>
+    <message>
+        <location line="-90"/>
+        <source>Print a list of supported export formats</source>
+        <translation>Skriv ut en lista över exportformat som stöds</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export the map with tilesets embedded</source>
+        <translation>Exportera kartan med inbäddade rutuppsättningar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export the map or tileset with template instances detached</source>
+        <translation>Exportera kartan eller rutuppsättningen med friliggande mallinstanser</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Export the map or tileset with types and properties resolved</source>
+        <translation>Exportera kartan eller rutuppsättningen med lösta typer och egenskaper</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Start a new instance, even if an instance is already running</source>
+        <translation>Starta en ny instans även om en instans redan körs</translation>
+    </message>
+</context>
+<context>
+    <name>CommandLineParser</name>
+    <message>
+        <location filename="../src/tiled/commandlineparser.cpp" line="+77"/>
+        <source>Bad argument %1: lonely hyphen</source>
+        <translation>Dåligt argument %1: Ensamt bindestreck</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Unknown long argument %1: %2</source>
+        <translation>Okänt långt argument %1: %2</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Unknown short argument %1.%2: %3</source>
+        <translation>Okänt kort argument %1.%2: %3</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Usage:
+  %1 [options] [files...]</source>
+        <translation>Användning:
+  %1 [alternativ] [filer...]</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Options:</source>
+        <translation>Alternativ:</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Display this help</source>
+        <translation>Visa denna hjälp</translation>
+    </message>
+</context>
+<context>
+    <name>ConverterDataModel</name>
+    <message>
+        <location filename="../src/automappingconverter/converterdatamodel.cpp" line="+75"/>
+        <source>File</source>
+        <translation>Fil</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Version</source>
+        <translation>Version</translation>
+    </message>
+</context>
+<context>
+    <name>ConverterWindow</name>
+    <message>
+        <location filename="../src/automappingconverter/converterwindow.cpp" line="+36"/>
+        <source>Save all as %1</source>
+        <translation>Spara alla som %1</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tiled map files (*.tmx)</source>
+        <translation>Tiled-kartfiler (*.tmx)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Open Map</source>
+        <translation>Öppna karta</translation>
+    </message>
+</context>
+<context>
+    <name>Csv::CsvPlugin</name>
+    <message>
+        <location filename="../src/plugins/csv/csvplugin.cpp" line="+54"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>CSV files (*.csv)</source>
+        <translation>CSV-filer (*.csv)</translation>
+    </message>
+</context>
+<context>
+    <name>Defold::DefoldPlugin</name>
+    <message>
+        <location filename="../src/plugins/defold/defoldplugin.cpp" line="+83"/>
+        <source>Defold files (*.tilemap)</source>
+        <translation>Defold-filer (*.tilemap)</translation>
+    </message>
+    <message>
+        <location line="+51"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+</context>
+<context>
+    <name>Droidcraft::DroidcraftPlugin</name>
+    <message>
+        <location filename="../src/plugins/droidcraft/droidcraftplugin.cpp" line="+56"/>
+        <source>This is not a valid Droidcraft map file!</source>
+        <translation>Detta är inte en giltig Droidcraft-kartfil!</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>The map needs to have exactly one tile layer!</source>
+        <translation>Kartan behöver ha exakt ett rutlager!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>The layer must have a size of 48 x 48 tiles!</source>
+        <translation>Lagret måste ha en storlek på 48 x 48 rutor!</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Droidcraft map files (*.dat)</source>
+        <translation>Droidcraft-kartfiler (*.dat)</translation>
+    </message>
+</context>
+<context>
+    <name>ExportAsImageDialog</name>
+    <message>
+        <location filename="../src/tiled/exportasimagedialog.ui" line="+14"/>
+        <source>Export As Image</source>
+        <translation>Exportera som bild</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Name:</source>
+        <translation>Namn:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Browse...</source>
+        <translation>&amp;Bläddra...</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Only include &amp;visible layers</source>
+        <translation>Inkludera endast &amp;synliga lager</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Use current &amp;zoom level</source>
+        <translation>Använd nuvarande &amp;zoomnivå</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Draw tile grid</source>
+        <translation>&amp;Rita rutnät</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>&amp;Include background color</source>
+        <translation>&amp;Inkludera bakgrundsfärg</translation>
+    </message>
+</context>
+<context>
+    <name>Flare::FlarePlugin</name>
+    <message>
+        <location filename="../src/plugins/flare/flareplugin.cpp" line="+56"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>Error loading tileset %1, which expands to %2. Path not found!</source>
+        <translation>Fel uppstod när rutuppsättningen %1 lästes in, vilket expanderar till %2. Sökvägen hittades inte!</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>No tilesets section found before layer section.</source>
+        <translation>Ingen rutuppsättningssektion hittades innan lagersektionen.</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Error mapping tile id %1.</source>
+        <translation>Fel uppstod när rut-ID %1 kartlagdes.</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>This seems to be no valid flare map. A Flare map consists of at least a header section, a tileset section and one tile layer.</source>
+        <translation>Detta verkar inte vara en giltig flare-karta. En Flare-karta innehåller minst ett sidhuvud, en rutuppsättning och ett rutlager.</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Flare map files (*.txt)</source>
+        <translation>Flare-kartfiler (*.txt)</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+</context>
+<context>
+    <name>Gmx::GmxPlugin</name>
+    <message>
+        <location filename="../src/plugins/gmx/gmxplugin.cpp" line="+107"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+364"/>
+        <source>GameMaker room files (*.room.gmx)</source>
+        <translation>GameMaker-rumfiler (*.room.gmx)</translation>
+    </message>
+</context>
+<context>
+    <name>Json::JsonMapFormat</name>
+    <message>
+        <location filename="../src/plugins/json/jsonplugin.cpp" line="+56"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Error parsing file.</source>
+        <translation>Fel uppstod när filen tolkades.</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Error while writing file:
+%1</source>
+        <translation>Fel uppstod när filen skrevs: %1</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON-kartfiler (*.json)</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>JavaScript map files (*.js)</source>
+        <translation>JavaScript-kartfiler (*.js)</translation>
+    </message>
+</context>
+<context>
+    <name>Json::JsonObjectTemplateFormat</name>
+    <message>
+        <location line="+178"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Error parsing file.</source>
+        <translation>Fel uppstod när filen tolkades.</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Error while writing file:
+%1</source>
+        <translation>Fel uppstod när filen skrevs: %1</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON-mallfiler (*.json)</translation>
+    </message>
+</context>
+<context>
+    <name>Json::JsonTilesetFormat</name>
+    <message>
+        <location line="-193"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Error parsing file.</source>
+        <translation>Fel uppstod när filen tolkades.</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Error while writing file:
+%1</source>
+        <translation>Fel uppstod när filen skrevs:
+%1</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON-rutuppsättningsfiler (*.json)</translation>
+    </message>
+</context>
+<context>
+    <name>Lua::LuaMapFormat</name>
+    <message>
+        <location filename="../src/plugins/lua/luaplugin.cpp" line="+103"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Lua files (*.lua)</source>
+        <translation>Lua-filer (*.lua)</translation>
+    </message>
+</context>
+<context>
+    <name>Lua::LuaTilesetFormat</name>
+    <message>
+        <location line="+18"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Lua files (*.lua)</source>
+        <translation>Lua-filer (*.lua)</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../src/tiled/mainwindow.ui" line="+49"/>
+        <source>&amp;File</source>
+        <translation>&amp;Arkiv</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;Recent Files</source>
+        <translation>&amp;Senast använda filer</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>&amp;Edit</source>
+        <translation>&amp;Redigera</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Help</source>
+        <translation>&amp;Hjälp</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Map</source>
+        <translation>&amp;Karta</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Unload World</source>
+        <translation>Ta bort värld</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;View</source>
+        <translation>&amp;Visa</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show Object &amp;Names</source>
+        <translation>Visa objekt&amp;namn</translation>
+    </message>
+    <message>
+        <location line="+52"/>
+        <source>&amp;Open...</source>
+        <translation>&amp;Öppna...</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Save</source>
+        <translation>S&amp;para</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Quit</source>
+        <translation>&amp;Avsluta</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Paste</source>
+        <translation>K&amp;listra in</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;About Tiled</source>
+        <translation>&amp;Om Tiled</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>About Qt</source>
+        <translation>Om Qt</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Resize Map...</source>
+        <translation>&amp;Storleksändra karta...</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>AutoMap</source>
+        <translation>Autokartläggning</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>A</source>
+        <translation>A</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show &amp;Grid</source>
+        <translation>Visa &amp;rutnät</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+G</source>
+        <translation>Ctrl+G</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Save &amp;As...</source>
+        <translation>Spara s&amp;om...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Alt+S</source>
+        <translation>Ctrl+Alt+S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>New &amp;Tileset...</source>
+        <translation>Ny &amp;rutuppsättning...</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>&amp;Close</source>
+        <translation>S&amp;täng</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Zoom In</source>
+        <translation>Zooma in</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Zoom Out</source>
+        <translation>Zooma ut</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Normal Size</source>
+        <translation>Normal storlek</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+0</source>
+        <translation>Ctrl+0</translation>
+    </message>
+    <message>
+        <location line="+142"/>
+        <source>Become a Patron</source>
+        <translation>Bli en Patron</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save All</source>
+        <translation>Spara alla</translation>
+    </message>
+    <message>
+        <location line="+127"/>
+        <source>For Hovered Object</source>
+        <translation>För hovrade objekt</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Load World...</source>
+        <translation>Läs in värld...</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Highlight Hovered Object</source>
+        <translation>Markera hovrade objekt</translation>
+    </message>
+    <message>
+        <location line="-124"/>
+        <source>&amp;Never</source>
+        <translation>&amp;Aldrig</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>For &amp;Selected Objects</source>
+        <translation>För &amp;valda objekt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>For &amp;All Objects</source>
+        <translation>För &amp;alla objekt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>AutoMap While Drawing</source>
+        <translation>Autokartlägg under ritning</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>New Map...</source>
+        <translation>Ny karta...</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Paste &amp;in Place</source>
+        <translation>Klistra in &amp;på plats</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Shift+V</source>
+        <translation>Ctrl+Shift+V</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Full Screen</source>
+        <translation>Helskärm</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>F11</source>
+        <translation>F11</translation>
+    </message>
+    <message>
+        <location line="-200"/>
+        <source>Cu&amp;t</source>
+        <translation>Klipp &amp;ut</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Offset Map...</source>
+        <translation>&amp;Förskjut karta...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Offsets everything in a layer</source>
+        <translation>Förskjuter allting i ett lager</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Pre&amp;ferences...</source>
+        <translation>&amp;Inställningar...</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Clear Recent Files</source>
+        <translation>Rensa senast använda filer</translation>
+    </message>
+    <message>
+        <location line="+87"/>
+        <source>Ctrl+R</source>
+        <translation>Ctrl+R</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>&amp;Export</source>
+        <translation>&amp;Exportera</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+E</source>
+        <translation>Ctrl+E</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <source>&amp;Add External Tileset...</source>
+        <translation>&amp;Lägg till extern rutuppsättning...</translation>
+    </message>
+    <message>
+        <location line="-346"/>
+        <source>&amp;New</source>
+        <translation>&amp;Ny</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Commands</source>
+        <translation>Kommandon</translation>
+    </message>
+    <message>
+        <location line="+81"/>
+        <source>Snapping</source>
+        <translation>Fäst</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Tileset</source>
+        <translation>Rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <source>Map &amp;Properties...</source>
+        <translation>Kart&amp;egenskaper...</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Export As &amp;Image...</source>
+        <translation>Exportera som &amp;bild...</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>E&amp;xport As...</source>
+        <translation>E&amp;xportera som...</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Shift+E</source>
+        <translation>Ctrl+Shift+E</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>&amp;Snap to Grid</source>
+        <translation>Fäst till &amp;rutnät</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>C&amp;lose All</source>
+        <translation>St&amp;äng alla</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Ctrl+Shift+W</source>
+        <translation>Ctrl+Shift+W</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>&amp;Delete</source>
+        <translation>&amp;Radera</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>&amp;Highlight Current Layer</source>
+        <translation>&amp;Markera nuvarande lager</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>H</source>
+        <translation>H</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Tile Object &amp;Outlines</source>
+        <translation>Visa rutobjektets &amp;konturer</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Snap to &amp;Fine Grid</source>
+        <translation>Fäst till &amp;finare rutnät</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show Tile Animations</source>
+        <translation>Visa animerade rutor</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Reload</source>
+        <translation>Uppdatera</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Ctrl+Shift+S</source>
+        <translation>Ctrl+Shift+S</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>User Manual</source>
+        <translation>Användarmanual</translation>
+    </message>
+    <message>
+        <location line="+70"/>
+        <source>Snap to &amp;Pixels</source>
+        <translation>Fäst till &amp;bildpunkter</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Tileset &amp;Properties...</source>
+        <translation>&amp;Egenskaper för rutuppsättning...</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>No Snapping</source>
+        <translation>Fäst inte</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Edit Commands...</source>
+        <translation>Redigera kommandon...</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Clear View</source>
+        <translation>Rensa vy</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tab</source>
+        <translation>Flik</translation>
+    </message>
+    <message>
+        <location filename="../src/automappingconverter/converterwindow.ui" line="+14"/>
+        <source>Tiled Automapping Rule Files Converter</source>
+        <translation>Tileds regelfilsomvandlare för autokartläggning</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Add new Automapping rules</source>
+        <translation>Lägg till nya regler för autokartläggning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+757"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+</context>
+<context>
+    <name>MapDocument</name>
+    <message>
+        <location filename="../src/tiled/adjusttileindexes.cpp" line="+188"/>
+        <source>Tile</source>
+        <translation>Ruta</translation>
+    </message>
+</context>
+<context>
+    <name>MapReader</name>
+    <message>
+        <location filename="../src/libtiled/mapreader.cpp" line="+164"/>
+        <source>Not a map file.</source>
+        <translation>Inte en kartfil.</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Not a tileset file.</source>
+        <translation>Inte en rutuppsättningsfil.</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Not a template file.</source>
+        <translation>Inte en mallfil.</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>%3
+
+Line %1, column %2</source>
+        <translation>%3
+
+Rad %1, kolumn %2</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>File not found: %1</source>
+        <translation>Fil hittades inte: %1</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unable to read file: %1</source>
+        <translation>Kunde inte läsa fil: %1</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="+62"/>
+        <source>Unsupported map orientation: &quot;%1&quot;</source>
+        <translation>Kartorientering stöds inte: &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+100"/>
+        <location line="+26"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="+161"/>
+        <source>Invalid tileset parameters for tileset &apos;%1&apos;</source>
+        <translation>Ogiltiga rutuppsättningsparametrar för rutuppsättningen &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Invalid tile ID: %1</source>
+        <translation>Ogiltigt rut-ID: %1</translation>
+    </message>
+    <message>
+        <location line="+402"/>
+        <source>Too many &lt;tile&gt; elements</source>
+        <translation>För många &lt;tile&gt;-element</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <location line="+50"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="+638"/>
+        <source>Invalid tile: %1</source>
+        <translation>Ogiltig ruta: %1</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="-276"/>
+        <source>Invalid draw order: %1</source>
+        <translation>Ogiltig ritningsordning: %1</translation>
+    </message>
+    <message>
+        <location line="+183"/>
+        <source>Invalid points data for polygon</source>
+        <translation>Ogiltig punktdata för polygon</translation>
+    </message>
+    <message>
+        <location line="-349"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="-46"/>
+        <source>Unknown encoding: %1</source>
+        <translation>Okänd kodning: %1</translation>
+    </message>
+    <message>
+        <location line="-327"/>
+        <source>Error reading embedded image for tile %1</source>
+        <translation>Fel uppstod när inbäddad bild för ruta %1 lästes</translation>
+    </message>
+    <message>
+        <location line="+322"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="-4"/>
+        <source>Compression method &apos;%1&apos; not supported</source>
+        <translation>Komprimeringsmetoden &quot;%1&quot; stöds inte</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+23"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="+280"/>
+        <location line="+40"/>
+        <source>Corrupt layer data for layer &apos;%1&apos;</source>
+        <translation>Trasig lagerdata för lagret &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="-29"/>
+        <source>Unable to parse tile at (%1,%2) on layer &apos;%3&apos;</source>
+        <translation>Kunde inte tolka ruta vid (%1,%2) på lagret &quot;%3&quot;</translation>
+    </message>
+    <message>
+        <location line="-34"/>
+        <location line="+51"/>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="+32"/>
+        <source>Tile used but no tilesets specified</source>
+        <translation>Rutan användes men ingen rutuppsättning har angivits</translation>
+    </message>
+    <message>
+        <location filename="../src/libtiled/mapwriter.cpp" line="+124"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location filename="../src/libtiled/varianttomapconverter.cpp" line="-517"/>
+        <location line="+27"/>
+        <source>Invalid (negative) tile id: %1</source>
+        <translation>Ogiltigt (negativt) rut-ID: %1</translation>
+    </message>
+</context>
+<context>
+    <name>NewMapDialog</name>
+    <message>
+        <location filename="../src/tiled/newmapdialog.ui" line="+14"/>
+        <source>New Map</source>
+        <translation>Ny karta</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Map size</source>
+        <translation>Kartstorlek</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <location line="+77"/>
+        <source>Width:</source>
+        <translation>Bredd:</translation>
+    </message>
+    <message>
+        <location line="-93"/>
+        <location line="+26"/>
+        <source> tiles</source>
+        <extracomment>Remember starting with a space.</extracomment>
+        <translation> rutor</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>Fixed</source>
+        <translation>Bestämd</translation>
+    </message>
+    <message>
+        <location line="+54"/>
+        <location line="+77"/>
+        <source>Height:</source>
+        <translation>Höjd:</translation>
+    </message>
+    <message>
+        <location line="-42"/>
+        <source>Infinite</source>
+        <translation>Oändlig</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Tile size</source>
+        <translation>Rutstorlek</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <location line="+26"/>
+        <source> px</source>
+        <extracomment>Remember starting with a space.</extracomment>
+        <translation> px</translation>
+    </message>
+    <message>
+        <location line="-202"/>
+        <source>Map</source>
+        <translation>Karta</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Orientation:</source>
+        <translation>Orientering:</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Tile layer format:</source>
+        <translation>Lagerformat för rutor:</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Tile render order:</source>
+        <translation>Renderingsordning för rutor:</translation>
+    </message>
+</context>
+<context>
+    <name>NewTilesetDialog</name>
+    <message>
+        <location filename="../src/tiled/newtilesetdialog.ui" line="+14"/>
+        <location filename="../src/tiled/newtilesetdialog.cpp" line="+269"/>
+        <source>New Tileset</source>
+        <translation>Ny rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Tileset</source>
+        <translation>Rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Based on Tileset Image</source>
+        <translation>Baseras på rutuppsättningsbild</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Collection of Images</source>
+        <translation>Samling av bilder</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <source>Type:</source>
+        <translation>Typ:</translation>
+    </message>
+    <message>
+        <location line="-20"/>
+        <source>&amp;Name:</source>
+        <translation>&amp;Namn:</translation>
+    </message>
+    <message>
+        <location line="+60"/>
+        <source>Embed in map</source>
+        <translation>Bädda in i karta</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>&amp;Browse...</source>
+        <translation>&amp;Bläddra...</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Use transparent color:</source>
+        <translation>Använd genomskinlig färg:</translation>
+    </message>
+    <message>
+        <location line="+129"/>
+        <source>Tile width:</source>
+        <translation>Rutbredd:</translation>
+    </message>
+    <message>
+        <location line="+38"/>
+        <source>Pick color from image</source>
+        <translation>Välj färg från bild</translation>
+    </message>
+    <message>
+        <location line="-138"/>
+        <location line="+42"/>
+        <location line="+26"/>
+        <location line="+16"/>
+        <source> px</source>
+        <extracomment>Remember starting with a space.</extracomment>
+        <translation> px</translation>
+    </message>
+    <message>
+        <location line="-142"/>
+        <source>Image</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Source:</source>
+        <translation>Källa:</translation>
+    </message>
+    <message>
+        <location line="+94"/>
+        <source>The space at the edges of the tileset.</source>
+        <translation>Mellanrummet vid rutuppsättningens kanter.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Margin:</source>
+        <translation>Marginal:</translation>
+    </message>
+    <message>
+        <location line="-45"/>
+        <source>Tile height:</source>
+        <translation>Ruthöjd:</translation>
+    </message>
+    <message>
+        <location line="+91"/>
+        <source>The space between the tiles.</source>
+        <translation>Mellanrummet mellan rutorna.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Spacing:</source>
+        <translation>Mellanrum:</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/newtilesetdialog.cpp" line="-2"/>
+        <source>Edit Tileset</source>
+        <translation>Redigera rutuppsättning</translation>
+    </message>
+</context>
+<context>
+    <name>NoTilesetWidget</name>
+    <message>
+        <location filename="../src/tiled/tilesetdock.cpp" line="+85"/>
+        <source>New Tileset...</source>
+        <translation>Ny rutuppsättning...</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectTypes</name>
+    <message>
+        <location filename="../src/libtiled/objecttypes.cpp" line="+251"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Could not open file.</source>
+        <translation>Kunde inte öppna fil.</translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <source>File doesn&apos;t contain object types.</source>
+        <translation>Filen innehåller inte objekttyper.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>%3
+
+Line %1, column %2</source>
+        <translation>%3
+
+Rad %1, kolumn %2</translation>
+    </message>
+</context>
+<context>
+    <name>ObjectTypesEditor</name>
+    <message>
+        <location filename="../src/tiled/objecttypeseditor.ui" line="+14"/>
+        <source>Object Types Editor</source>
+        <translation>Objekttypsredigerare</translation>
+    </message>
+    <message>
+        <location line="+67"/>
+        <source>File</source>
+        <translation>Arkiv</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Export Object Types...</source>
+        <translation>Exportera objekttyper...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Import Object Types...</source>
+        <translation>Importera objekttyper...</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Choose Object Types File...</source>
+        <translation>Välj objekttypsfil...</translation>
+    </message>
+</context>
+<context>
+    <name>OffsetMapDialog</name>
+    <message>
+        <location filename="../src/tiled/offsetmapdialog.ui" line="+17"/>
+        <source>Offset Map</source>
+        <translation>Förskjut karta</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Offset Contents of Map</source>
+        <translation>Förskjut kartans innehåll</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X:</source>
+        <translation>X:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location line="+46"/>
+        <source> tiles</source>
+        <translation> rutor</translation>
+    </message>
+    <message>
+        <location line="-30"/>
+        <location line="+46"/>
+        <source>Wrap</source>
+        <translation>Omslut</translation>
+    </message>
+    <message>
+        <location line="-39"/>
+        <source>Y:</source>
+        <translation>Y:</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Layers:</source>
+        <translation>Lager:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>All Visible Layers</source>
+        <translation>Alla synliga lager</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>All Layers</source>
+        <translation>Alla lager</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Selected Layers</source>
+        <translation>Valda lager</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bounds:</source>
+        <translation>Gränser:</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Whole Map</source>
+        <translation>Hela kartan</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Current Selection</source>
+        <translation>Nuvarande markering</translation>
+    </message>
+</context>
+<context>
+    <name>PatreonDialog</name>
+    <message>
+        <location filename="../src/tiled/patreondialog.ui" line="+14"/>
+        <source>Become a Patron</source>
+        <translation>Bli en Patreon</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Thanks for using Tiled! Please consider supporting further development with a small monthly donation.</source>
+        <translation>Tack för att du använder Tiled! Var god överväg att stödja ytterligare utveckling med en liten månatlig donation.</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Visit https://www.patreon.com/bjorn</source>
+        <translation>Besök https://www.patreon.com/bjorn</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>I&apos;m already a supporter!</source>
+        <translation>Jag stöder redan detta!</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Maybe later</source>
+        <translation>Kanske senare</translation>
+    </message>
+</context>
+<context>
+    <name>PreferencesDialog</name>
+    <message>
+        <location filename="../src/tiled/preferencesdialog.ui" line="+14"/>
+        <source>Preferences</source>
+        <translation>Inställningar</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>General</source>
+        <translation>Allmänt</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Saving and Loading</source>
+        <translation>Sparning och inläsning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1105"/>
+        <source>XML</source>
+        <translation>XML</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/newmapdialog.cpp" line="+92"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Base64 (uncompressed)</source>
+        <translation>Base64 (okomprimerad)</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Base64 (gzip compressed)</source>
+        <translation>Base64 (gzip-komprimerad)</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/newmapdialog.cpp" line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Base64 (zlib compressed)</source>
+        <translation>Base64 (zlib-komprimerad)</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>CSV</source>
+        <translation>CSV</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+2"/>
+        <source>Right Down</source>
+        <translation>Höger-nedåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Right Up</source>
+        <translation>Höger-uppåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Left Down</source>
+        <translation>Vänster-nedåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Left Up</source>
+        <translation>Vänster-uppåt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/preferencesdialog.ui" line="+23"/>
+        <source>&amp;Reload tileset images when they change</source>
+        <translation>&amp;Uppdatera rutuppsättningsbilder när de ändras</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Not enabled by default since a reference to an external DTD is known to cause problems with some XML parsers.</source>
+        <translation>Inte aktiverad som standard eftersom en referens till en extern DTD är ökänd för att orsaka problem med några XML-tolkare.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Include &amp;DTD reference in saved maps</source>
+        <translation>Inkludera &amp;DTD-referens i sparade kartor</translation>
+    </message>
+    <message>
+        <location line="+78"/>
+        <location line="+6"/>
+        <source>Interface</source>
+        <translation>Gränssnitt</translation>
+    </message>
+    <message>
+        <location line="+39"/>
+        <source>&amp;Language:</source>
+        <translation>&amp;Språk:</translation>
+    </message>
+    <message>
+        <location line="-17"/>
+        <source>Hardware &amp;accelerated drawing (OpenGL)</source>
+        <translation>Hårdvaru&amp;accelererad ritning (OpenGL)</translation>
+    </message>
+    <message>
+        <location line="-99"/>
+        <source>Open last files on startup</source>
+        <translation>Öppna de senaste filerna vid start</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Turn this off if you&apos;re having trouble saving your files.</source>
+        <translation>Inaktivera detta om du har problem med att spara dina filer.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Use safe writing of files</source>
+        <translation>Använd säker filskrivning</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Export Options</source>
+        <translation>Exporteringsalternativ</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Resolve object types and properties</source>
+        <translation>Lös objekttyp och -egenskaper</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Detach templates</source>
+        <translation>Frigör mallar</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Embed tilesets</source>
+        <translation>Bädda in rutuppsättningar</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Grid color:</source>
+        <translation>Rutnätsfärg:</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Fine grid divisions:</source>
+        <translation>Divisioner för finare rutnät:</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source> pixels</source>
+        <translation> bildpunkter</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Object line width:</source>
+        <translation>Linjebredd för objekt:</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Mouse wheel &amp;zooms by default</source>
+        <translation>&amp;Zooma in med mushjulet som standard</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Theme</source>
+        <translation>Tema</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/preferencesdialog.cpp" line="+64"/>
+        <location line="+149"/>
+        <source>Native</source>
+        <translation>Inbyggd</translation>
+    </message>
+    <message>
+        <location line="-148"/>
+        <location line="+149"/>
+        <source>Tiled Fusion</source>
+        <translation>Tiled Fusion</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/preferencesdialog.ui" line="+22"/>
+        <source>Selection color:</source>
+        <translation>Markeringsfärg:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Style:</source>
+        <translation>Stil:</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Base color:</source>
+        <translation>Grundfärg:</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <location line="+6"/>
+        <source>Updates</source>
+        <translation>Uppdateringar</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Check Now</source>
+        <translation>Kontrollera nu</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Automatically check for updates</source>
+        <translation>Leta automatiskt efter uppdateringar</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Plugins</source>
+        <translation>Insticksmoduler</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Enabled Plugins</source>
+        <translation>Aktiverade insticksmoduler</translation>
+    </message>
+</context>
+<context>
+    <name>Python::PythonMapFormat</name>
+    <message>
+        <location filename="../src/plugins/python/pythonplugin.cpp" line="+282"/>
+        <source>-- Using script %1 to read %2</source>
+        <translation>-- Använder skriptet %1 för att läsa %2</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>-- Using script %1 to write %2</source>
+        <translation>-- Använder skriptet %1 för att skriva %2</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Uncaught exception in script. Please check console.</source>
+        <translation>Undantag fångades inte i skript. Var god se konsolen.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Script returned false. Please check console.</source>
+        <translation>Skriptet returnerade falskt. Var god kontrollera konsolen.</translation>
+    </message>
+</context>
+<context>
+    <name>Python::PythonPlugin</name>
+    <message>
+        <location line="-175"/>
+        <source>Reloading Python scripts</source>
+        <translation>Uppdaterar Python-skript</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/automappingconverter/convertercontrol.h" line="+32"/>
+        <source>v0.8 and before</source>
+        <translation>v0.8 och senare</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>v0.9 and later</source>
+        <translation>v0.9 och senare</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>unknown</source>
+        <translation>okänd</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>not a map</source>
+        <translation>inte en karta</translation>
+    </message>
+</context>
+<context>
+    <name>QtBoolEdit</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="+243"/>
+        <location line="+10"/>
+        <location line="+25"/>
+        <source>True</source>
+        <translation>Sant</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <location line="+25"/>
+        <source>False</source>
+        <translation>Falskt</translation>
+    </message>
+</context>
+<context>
+    <name>QtBoolPropertyManager</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="+1703"/>
+        <source>True</source>
+        <translation>Sant</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>False</source>
+        <translation>Falskt</translation>
+    </message>
+</context>
+<context>
+    <name>QtCharEdit</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qteditorfactory.cpp" line="+1712"/>
+        <source>Clear Char</source>
+        <translation>Rensa tecken</translation>
+    </message>
+</context>
+<context>
+    <name>QtColorEditWidget</name>
+    <message>
+        <location line="+614"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>QtColorPropertyManager</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="+4736"/>
+        <source>Red</source>
+        <translation>Röd</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Green</source>
+        <translation>Grön</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Blue</source>
+        <translation>Blå</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Alpha</source>
+        <translation>Alfa</translation>
+    </message>
+</context>
+<context>
+    <name>QtCursorDatabase</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="-220"/>
+        <source>Arrow</source>
+        <translation>Pil</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Up Arrow</source>
+        <translation>Uppåtpil</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Cross</source>
+        <translation>Kors</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Wait</source>
+        <translation>Vänta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>IBeam</source>
+        <translation>Textmarkör</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size Vertical</source>
+        <translation>Ändra storlek vertikalt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size Horizontal</source>
+        <translation>Ändra storlek horisontalt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size Backslash</source>
+        <translation>Storleksändra omvänt snedstreck</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size Slash</source>
+        <translation>Storleksändra snedstreck</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Size All</source>
+        <translation>Storleksändra allting</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Blank</source>
+        <translation>Tom</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Split Vertical</source>
+        <translation>Dela upp vertikalt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Split Horizontal</source>
+        <translation>Dela upp horisontalt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Pointing Hand</source>
+        <translation>Pekande hand</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Forbidden</source>
+        <translation>Förbjudet</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Open Hand</source>
+        <translation>Öppen hand</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Closed Hand</source>
+        <translation>Stängd hand</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>What&apos;s This</source>
+        <translation>Vad är detta</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Busy</source>
+        <translation>Upptagen</translation>
+    </message>
+</context>
+<context>
+    <name>QtFontEditWidget</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qteditorfactory.cpp" line="+209"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>Select Font</source>
+        <translation>Välj typsnitt</translation>
+    </message>
+</context>
+<context>
+    <name>QtFontPropertyManager</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="-362"/>
+        <source>Family</source>
+        <translation>Familj</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Pixel Size</source>
+        <translation>Bildpunktsstorlek</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Bold</source>
+        <translation>Fet</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Italic</source>
+        <translation>Kursiverad</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Underline</source>
+        <translation>Understruken</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Strikeout</source>
+        <translation>Genomskruken</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Kerning</source>
+        <translation>Kerning</translation>
+    </message>
+</context>
+<context>
+    <name>QtKeySequenceEdit</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="+244"/>
+        <source>Clear Shortcut</source>
+        <translation>Rensa genväg</translation>
+    </message>
+</context>
+<context>
+    <name>QtLocalePropertyManager</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="-3533"/>
+        <source>%1, %2</source>
+        <translation>%1, %2</translation>
+    </message>
+    <message>
+        <location line="+53"/>
+        <source>Language</source>
+        <translation>Språk</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Country</source>
+        <translation>Land</translation>
+    </message>
+</context>
+<context>
+    <name>QtPointFPropertyManager</name>
+    <message>
+        <location line="+409"/>
+        <source>(%1, %2)</source>
+        <translation>(%1, %2)</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+</context>
+<context>
+    <name>QtPointPropertyManager</name>
+    <message>
+        <location line="-319"/>
+        <source>(%1, %2)</source>
+        <translation>(%1, %2)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+</context>
+<context>
+    <name>QtPropertyBrowserUtils</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertybrowserutils.cpp" line="-150"/>
+        <source>[%1, %2, %3] (%4)</source>
+        <translation>[%1, %2, %3] (%4)</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Not set</source>
+        <translation>Inte angiven</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>[%1, %2]</source>
+        <translation>[%1, %2]</translation>
+    </message>
+</context>
+<context>
+    <name>QtRectFPropertyManager</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="+1701"/>
+        <source>[(%1, %2), %3 x %4]</source>
+        <translation>[(%1, %2), %3 x %4]</translation>
+    </message>
+    <message>
+        <location line="+156"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Width</source>
+        <translation>Bredd</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Height</source>
+        <translation>Höjd</translation>
+    </message>
+</context>
+<context>
+    <name>QtRectPropertyManager</name>
+    <message>
+        <location line="-611"/>
+        <source>[(%1, %2), %3 x %4]</source>
+        <translation>[(%1, %2), %3 x %4]</translation>
+    </message>
+    <message>
+        <location line="+120"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Width</source>
+        <translation>Bredd</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Height</source>
+        <translation>Höjd</translation>
+    </message>
+</context>
+<context>
+    <name>QtSizeFPropertyManager</name>
+    <message>
+        <location line="-534"/>
+        <source>%1 x %2</source>
+        <translation>%1 x %2</translation>
+    </message>
+    <message>
+        <location line="+130"/>
+        <source>Width</source>
+        <translation>Bredd</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Height</source>
+        <translation>Höjd</translation>
+    </message>
+</context>
+<context>
+    <name>QtSizePolicyPropertyManager</name>
+    <message>
+        <location line="+1704"/>
+        <location line="+1"/>
+        <source>&lt;Invalid&gt;</source>
+        <translation>&lt;Ogiltig&gt;</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>[%1, %2, %3, %4]</source>
+        <translation>[%1, %2, %3, %4]</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Horizontal Policy</source>
+        <translation>Horisontal policy</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Vertical Policy</source>
+        <translation>Vertikal policy</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Horizontal Stretch</source>
+        <translation>Sträck horisontalt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Vertical Stretch</source>
+        <translation>Sträck vertikalt</translation>
+    </message>
+</context>
+<context>
+    <name>QtSizePropertyManager</name>
+    <message>
+        <location line="-2280"/>
+        <source>%1 x %2</source>
+        <translation>%1 x %2</translation>
+    </message>
+    <message>
+        <location line="+96"/>
+        <source>Width</source>
+        <translation>Bredd</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Height</source>
+        <translation>Höjd</translation>
+    </message>
+</context>
+<context>
+    <name>QtTreePropertyBrowser</name>
+    <message>
+        <location filename="../src/qtpropertybrowser/src/qttreepropertybrowser.cpp" line="+512"/>
+        <source>Property</source>
+        <translation>Egenskap</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Value</source>
+        <translation>Värde</translation>
+    </message>
+</context>
+<context>
+    <name>ReplicaIsland::ReplicaIslandPlugin</name>
+    <message>
+        <location filename="../src/plugins/replicaisland/replicaislandplugin.cpp" line="+58"/>
+        <source>Cannot open Replica Island map file!</source>
+        <translation>Kan inte öppna Replica Island-kartfil!</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Can&apos;t parse file header!</source>
+        <translation>Kan inte tolka filens sidhuvud!</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Can&apos;t parse layer header!</source>
+        <translation>Kan inte tolka lagrets sidhuvud!</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Inconsistent layer sizes!</source>
+        <translation>Olika lagerstorlekar!</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>File ended in middle of layer!</source>
+        <translation>Filen slutade i mitten på lagret!</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Unexpected data at end of file!</source>
+        <translation>Oväntat data i slutet på filen!</translation>
+    </message>
+    <message>
+        <location line="+64"/>
+        <source>Replica Island map files (*.bin)</source>
+        <translation>Replica Island-kartfiler (*.bin)</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>You must define a background_index property on the map!</source>
+        <translation>Du måste definiera egenskapen background_index på kartan!</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Can&apos;t save non-tile layer!</source>
+        <translation>Kan inte spara icke-rutlager!</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>You must define a type property on each layer!</source>
+        <translation>Du måste definiera egenskapen type på varje lager!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You must define a tile_index property on each layer!</source>
+        <translation>Du måste definiera egenskapen tile_index på varje lager!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>You must define a scroll_speed property on each layer!</source>
+        <translation>Du måste definiera egenskapen scroll_speed på varje lager!</translation>
+    </message>
+</context>
+<context>
+    <name>ResizeDialog</name>
+    <message>
+        <location filename="../src/tiled/resizedialog.ui" line="+14"/>
+        <source>Resize</source>
+        <translation>Ändra storlek</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Size</source>
+        <translation>Storlek</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <location line="+33"/>
+        <location line="+32"/>
+        <location line="+23"/>
+        <source> tiles</source>
+        <translation> rutor</translation>
+    </message>
+    <message>
+        <location line="-75"/>
+        <source>Width:</source>
+        <translation>Bredd:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Height:</source>
+        <translation>Höjd:</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Offset</source>
+        <translation>Förskjutning</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>X:</source>
+        <translation>X:</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Y:</source>
+        <translation>Y:</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Remove objects outside of the map</source>
+        <translation>Ta bort objekt utanför kartan</translation>
+    </message>
+</context>
+<context>
+    <name>Tbin::TbinMapFormat</name>
+    <message>
+        <location filename="../src/plugins/tbin/tbinplugin.cpp" line="+109"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Tilesheet must have equal spacings.</source>
+        <translation>Rutuppsättningen måste ha likadana mellanrum.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tilesheet must have equal margins.</source>
+        <translation>Rutuppsättningen måste ha likadana marginaler.</translation>
+    </message>
+    <message>
+        <location line="+34"/>
+        <source>Different tile sizes per layer are not supported.</source>
+        <translation>Olika rutstorlekar per lager stöds inte.</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <source>Invalid animation frame.</source>
+        <translation>Ogiltig animeringsbildruta.</translation>
+    </message>
+    <message>
+        <location line="+112"/>
+        <source>Only object and tile layers supported.</source>
+        <translation>Endast stöd för objekt- och rutlager.</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Could not open file for writing</source>
+        <translation>Kunde inte öppna fil för skrivning</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Exception: %1</source>
+        <translation>Undantag: %1</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Tbin map files (*.tbin)</source>
+        <translation>Tbin-kartfiler (*.tbin)</translation>
+    </message>
+</context>
+<context>
+    <name>TbinMapFormat</name>
+    <message>
+        <location filename="../src/plugins/tbin/tbin/Map.cpp" line="+99"/>
+        <location line="+23"/>
+        <source>Bad property type</source>
+        <translation>Dålig egenskapstyp</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <location line="+68"/>
+        <source>Bad layer tile data</source>
+        <translation>Dålig rutdata i lager</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>Failed to open file.</source>
+        <translation>Misslyckades att öppna fil.</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>File is not a tbin file.</source>
+        <translation>Filen är inte en tbin-fil.</translation>
+    </message>
+    <message>
+        <location line="+35"/>
+        <source>Failed to open file</source>
+        <translation>Misslyckades att öppna fil</translation>
+    </message>
+    <message>
+        <location filename="../src/plugins/tbin/tbinplugin.cpp" line="-255"/>
+        <source>Unsupported property type</source>
+        <translation>Egenskapstyp stöds inte</translation>
+    </message>
+</context>
+<context>
+    <name>Tengine::TenginePlugin</name>
+    <message>
+        <location filename="../src/plugins/tengine/tengineplugin.cpp" line="+49"/>
+        <source>Could not open file for writing.</source>
+        <translation>Kunde inte öppna fil för skrivning.</translation>
+    </message>
+    <message>
+        <location line="+244"/>
+        <source>T-Engine4 map files (*.lua)</source>
+        <translation>T-Engine4-kartfiler (*.lua)</translation>
+    </message>
+</context>
+<context>
+    <name>TextEditorDialog</name>
+    <message>
+        <location filename="../src/tiled/texteditordialog.ui" line="+14"/>
+        <source>Edit Text</source>
+        <translation>Redigera text</translation>
+    </message>
+</context>
+<context>
+    <name>TileAnimationEditor</name>
+    <message>
+        <location filename="../src/tiled/tileanimationeditor.ui" line="+14"/>
+        <source>Tile Animation Editor</source>
+        <translation>Rutanimeringsredigerare</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Frame Duration: </source>
+        <translation>Bildrutelängd: </translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source> ms</source>
+        <translation> ms</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Apply</source>
+        <translation>Verkställ</translation>
+    </message>
+    <message>
+        <location line="+98"/>
+        <location filename="../src/tiled/tileanimationeditor.cpp" line="+564"/>
+        <source>Preview</source>
+        <translation>Förhandsvisa</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::AbstractObjectTool</name>
+    <message>
+        <location filename="../src/tiled/abstractobjecttool.cpp" line="+265"/>
+        <location line="+200"/>
+        <source>Reset Tile Size</source>
+        <translation>Återställ rutstorlek</translation>
+    </message>
+    <message numerus="yes">
+        <location line="-13"/>
+        <source>Duplicate %n Object(s)</source>
+        <translation>
+            <numerusform>Duplicera %n objekt</numerusform>
+            <numerusform>Duplicera %n objekt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2"/>
+        <source>Remove %n Object(s)</source>
+        <translation>
+            <numerusform>Ta bort %n objekt</numerusform>
+            <numerusform>Ta bort %n objekt</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Replace Tile</source>
+        <translation>Ersätt ruta</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Replace With Template</source>
+        <translation>Ersätt med mall</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Replace With Template &quot;%1&quot;</source>
+        <translation>Ersätt med mallen &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Save As Template</source>
+        <translation>Spara som mall</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Detach</source>
+        <translation>Frigör</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Reset Template Instance(s)</source>
+        <translation>Återställ mallinstans(er)</translation>
+    </message>
+    <message>
+        <location line="-334"/>
+        <location line="+341"/>
+        <source>Flip Horizontally</source>
+        <translation>Vänd horisontalt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="-340"/>
+        <location line="+341"/>
+        <source>Flip Vertically</source>
+        <translation>Vänd vertikalt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Raise Object</source>
+        <translation>Höj objekt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PgUp</source>
+        <translation>PgUp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower Object</source>
+        <translation>Sänk objekt</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>PgDown</source>
+        <translation>PgDown</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Raise Object to Top</source>
+        <translation>Placera objektet längst upp</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Home</source>
+        <translation>Home</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lower Object to Bottom</source>
+        <translation>Placera objektet längst ned</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>End</source>
+        <translation>End</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+6"/>
+        <source>Move %n Object(s) to Layer</source>
+        <translation>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Object &amp;Properties...</source>
+        <translation>Objekt&amp;egenskaper...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::AbstractTileSelectionTool</name>
+    <message>
+        <location filename="../src/tiled/abstracttileselectiontool.cpp" line="+137"/>
+        <source>Replace Selection</source>
+        <translation>Ersätt markering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Selection</source>
+        <translation>Lägg till markering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Subtract Selection</source>
+        <translation>Subtrahera markering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Intersect Selection</source>
+        <translation>Korsa markering</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::AbstractTileTool</name>
+    <message>
+        <location filename="../src/tiled/abstracttiletool.cpp" line="+128"/>
+        <source>empty</source>
+        <translation>tom</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::AutoMapper</name>
+    <message>
+        <location filename="../src/tiled/automapper.cpp" line="+119"/>
+        <source>&apos;%1&apos;: Property &apos;%2&apos; = &apos;%3&apos; does not make sense. Ignoring this property.</source>
+        <translation>&quot;%1&quot;: Egenskapen &quot;%2&quot; = &quot;%3&quot; är inte logisk. Ignorerar denna egenskap.</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>Did you forget an underscore in layer &apos;%1&apos;?</source>
+        <translation>Glömde du bort ett understreck i lagret &quot;%1&quot;?</translation>
+    </message>
+    <message>
+        <location line="+72"/>
+        <source>Layer &apos;%1&apos; is not recognized as a valid layer for Automapping.</source>
+        <translation>Lagret &quot;%1&quot; känns inte igen som ett giltigt lager för autokartläggning.</translation>
+    </message>
+    <message>
+        <location line="-104"/>
+        <source>&apos;regions_input&apos; layer must not occur more than once.</source>
+        <translation>Lagret som heter &quot;regions_input&quot; får inte förekomma mer än en gång.</translation>
+    </message>
+    <message>
+        <location line="-25"/>
+        <source>&apos;%1&apos;: Property &apos;%2&apos; = &apos;%3&apos; on layer &apos;%4&apos; does not make sense. Ignoring this property.</source>
+        <translation>&quot;%1&quot;: Egenskapen &quot;%2&quot; = &quot;%3&quot; på lagret &quot;%4&quot; är inte logiskt. Ignorerar denna egenskap.</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+13"/>
+        <source>&apos;regions_*&apos; layers must be tile layers.</source>
+        <translation>Lager som heter &quot;regions_*&quot; måste vara rutlager.</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>&apos;regions_output&apos; layer must not occur more than once.</source>
+        <translation>Lagret som heter &quot;regions_output&quot; får inte förekomma mer än en gång.</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>&apos;input_*&apos; and &apos;inputnot_*&apos; layers must be tile layers.</source>
+        <translation>Lager som heter &quot;input_*&quot; och &quot;inputnot_*&quot; måste vara rutlager.</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>No &apos;regions&apos; or &apos;regions_input&apos; layer found.</source>
+        <translation>Inga lager som heter &quot;regions&quot; eller &quot;regions_input&quot; hittades.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No &apos;regions&apos; or &apos;regions_output&apos; layer found.</source>
+        <translation>Inga lager som heter &quot;regions&quot; eller &quot;regions_output&quot; hittades.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No input_&lt;name&gt; layer found!</source>
+        <translation>Inget lager som heter input_&lt;namn&gt; hittades!</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>No output_&lt;name&gt; layer found!</source>
+        <translation>Inget lager som heter output_&lt;namn&gt; hittades!</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::AutomappingManager</name>
+    <message>
+        <location filename="../src/tiled/automappingmanager.cpp" line="+122"/>
+        <source>Apply AutoMap rules</source>
+        <translation>Tillämpa autokartläggningsregler</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>No rules file found at:
+%1</source>
+        <translation>Ingen regelfil hittades i:
+%1</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Error opening rules file:
+%1</source>
+        <translation>Fel uppstod när regelfilen öppnades:
+%1</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>File not found:
+%1</source>
+        <translation>Filen hittades inte:
+%1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Opening rules map failed:
+%1</source>
+        <translation>Misslyckades att öppna regelkarta:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::BrokenLinksModel</name>
+    <message>
+        <location filename="../src/tiled/brokenlinks.cpp" line="+274"/>
+        <source>Tileset image</source>
+        <translation>Rutuppsättningsbild</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Tileset</source>
+        <translation>Rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Template tileset</source>
+        <translation>Mallrutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tile image</source>
+        <translation>Rutbild</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Template</source>
+        <translation>Mall</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>File name</source>
+        <translation>Filnamn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Location</source>
+        <translation>Plats</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::BrokenLinksWidget</name>
+    <message>
+        <location line="+97"/>
+        <source>Some files could not be found</source>
+        <translation>Vissa filer kunde inte hittas</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>One or more referenced files could not be found. You can help locate them below.</source>
+        <translation>En eller flera referensfiler kunde inte hittas. Du kan hjälpa till att hitta dem nedan.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <location line="+86"/>
+        <location line="+8"/>
+        <source>Locate File...</source>
+        <translation>Hitta fil...</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <source>Open Template...</source>
+        <translation>Öppna mall...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Open Tileset...</source>
+        <translation>Öppna rutuppsättning...</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+44"/>
+        <source>Locate File</source>
+        <translation>Hitta fil</translation>
+    </message>
+    <message>
+        <location line="+50"/>
+        <source>Locate Object Template</source>
+        <translation>Hitta objektmall</translation>
+    </message>
+    <message>
+        <location line="+25"/>
+        <source>Error Loading Image</source>
+        <translation>Fel uppstod när bild lästes in</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Error Reading Object Template</source>
+        <translation>Fel uppstod när objektmall lästes</translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <location line="+13"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Locate External Tileset</source>
+        <translation>Hitta extern rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Error Reading Tileset</source>
+        <translation>Fel uppstod när rutuppsättning lästes</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::BucketFillTool</name>
+    <message>
+        <location filename="../src/tiled/bucketfilltool.cpp" line="+44"/>
+        <location line="+135"/>
+        <source>Bucket Fill Tool</source>
+        <translation>Hinkfyllningsverktyget</translation>
+    </message>
+    <message>
+        <location line="-132"/>
+        <location line="+133"/>
+        <source>F</source>
+        <translation>F</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ClipboardManager</name>
+    <message>
+        <location filename="../src/tiled/clipboardmanager.cpp" line="+246"/>
+        <source>Paste Objects</source>
+        <translation>Klistra in objekt</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CommandButton</name>
+    <message>
+        <location filename="../src/tiled/commandbutton.cpp" line="+105"/>
+        <source>Execute Command</source>
+        <translation>Kör kommando</translation>
+    </message>
+    <message>
+        <location line="-39"/>
+        <source>Error Executing Command</source>
+        <translation>Fel uppstod när kommando kördes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>You do not have any commands setup.</source>
+        <translation>Du har inte ställt in några kommandon.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit commands...</source>
+        <translation>Redigera kommandon...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CommandDataModel</name>
+    <message>
+        <location filename="../src/tiled/commanddatamodel.cpp" line="+60"/>
+        <source>Open in text editor</source>
+        <translation>Öpnna i textredigerare</translation>
+    </message>
+    <message>
+        <location line="+88"/>
+        <location line="+66"/>
+        <source>&lt;new command&gt;</source>
+        <translation>&lt;nytt kommando&gt;</translation>
+    </message>
+    <message>
+        <location line="-58"/>
+        <source>Set a name for this command</source>
+        <translation>Ange ett namn för detta kommando</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Show or hide this command in the command list</source>
+        <translation>Visa eller dölj detta kommando i kommandolistan</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Add a new command</source>
+        <translation>Lägg till ett nytt kommando</translation>
+    </message>
+    <message>
+        <location line="+104"/>
+        <source>Name</source>
+        <translation>Namn</translation>
+    </message>
+    <message>
+        <location line="-109"/>
+        <source>Shortcut for this command</source>
+        <translation>Genväg för detta kommando</translation>
+    </message>
+    <message>
+        <location line="+110"/>
+        <source>Shortcut</source>
+        <translation>Genväg</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Enable</source>
+        <translation>Aktivera</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Move Up</source>
+        <translation>Flytta upp</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Move Down</source>
+        <translation>Flytta ned</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Execute</source>
+        <translation>Kör</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Execute in Terminal</source>
+        <translation>Kör i Terminal</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message>
+        <location line="+80"/>
+        <source>%1 (copy)</source>
+        <translation>%1 (kopiera)</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>New command</source>
+        <translation>Nytt kommando</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CommandDialog</name>
+    <message>
+        <location filename="../src/tiled/commanddialog.cpp" line="+48"/>
+        <source>Edit Commands</source>
+        <translation>Redigera kommandon</translation>
+    </message>
+    <message>
+        <location line="+121"/>
+        <source>Select Executable</source>
+        <translation>Välj körbara</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Select Working Directory</source>
+        <translation>Välj arbetskatalog</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CommandManager</name>
+    <message>
+        <location filename="../src/tiled/commandmanager.cpp" line="+127"/>
+        <source>Edit Commands...</source>
+        <translation>Redigera kommandon...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CommandProcess</name>
+    <message>
+        <location filename="../src/tiled/command.cpp" line="+195"/>
+        <source>Unable to create/open %1</source>
+        <translation>Kunde inte skapa/öppna %1</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Unable to add executable permissions to %1</source>
+        <translation>Kunde inte lägga tillbehörigheter för att köra %1</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <source>Executing: %1</source>
+        <translation>Kör: %1</translation>
+    </message>
+    <message>
+        <location line="+29"/>
+        <source>The command failed to start.</source>
+        <translation>Kommandot misslyckades att starta.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The command crashed.</source>
+        <translation>Kommandot kraschade.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>The command timed out.</source>
+        <translation>Tidsgränsen för kommandot löpte ut.</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>An unknown error occurred.</source>
+        <translation>Ett okänt fel uppstod.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Error Executing %1</source>
+        <translation>Fel uppstod när %1 kördes</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ConsoleDock</name>
+    <message>
+        <location filename="../src/tiled/consoledock.cpp" line="+37"/>
+        <source>Debug Console</source>
+        <translation>Felsökningskonsol</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreateEllipseObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createellipseobjecttool.cpp" line="+47"/>
+        <source>Insert Ellipse</source>
+        <translation>Infoga ellips</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>C</source>
+        <translation>C</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreatePointObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createpointobjecttool.cpp" line="+51"/>
+        <source>Insert Point</source>
+        <translation>Infoga punkt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>I</source>
+        <translation>I</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreatePolygonObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createpolygonobjecttool.cpp" line="+172"/>
+        <source>Insert Polygon</source>
+        <translation>Infoga polygon</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>P</source>
+        <translation>P</translation>
+    </message>
+    <message>
+        <location line="+122"/>
+        <source>Connect Polylines</source>
+        <translation>Anslut polylinjer</translation>
+    </message>
+    <message>
+        <location line="+202"/>
+        <source>Create Polygon</source>
+        <translation>Skapa polygon</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreateRectangleObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createrectangleobjecttool.cpp" line="+47"/>
+        <source>Insert Rectangle</source>
+        <translation>Infoga rektangel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>R</source>
+        <translation>R</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreateTemplateTool</name>
+    <message>
+        <location filename="../src/tiled/createtemplatetool.cpp" line="+53"/>
+        <source>Insert Template</source>
+        <translation>Infoga mall</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>V</source>
+        <translation>V</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreateTextObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createtextobjecttool.cpp" line="+65"/>
+        <source>Insert Text</source>
+        <translation>Infoga text</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Hello World</source>
+        <translation>Hallå världen</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::CreateTileObjectTool</name>
+    <message>
+        <location filename="../src/tiled/createtileobjecttool.cpp" line="+66"/>
+        <source>Insert Tile</source>
+        <translation>Infoga ruta</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>T</source>
+        <translation>T</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::DocumentManager</name>
+    <message>
+        <location filename="../src/tiled/documentmanager.cpp" line="+461"/>
+        <source>Unrecognized file format.</source>
+        <translation>Filformat känns inte igen.</translation>
+    </message>
+    <message>
+        <location line="+257"/>
+        <location line="+18"/>
+        <source>%1:
+
+%2</source>
+        <translation>%1:
+
+%2</translation>
+    </message>
+    <message>
+        <location line="+111"/>
+        <source>Close</source>
+        <translation>Stäng</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Close Other Tabs</source>
+        <translation>Stäng andra flikar</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Close Tabs to the Right</source>
+        <translation>Stäng flikar åt höger</translation>
+    </message>
+    <message>
+        <location line="+241"/>
+        <source>Tileset Columns Changed</source>
+        <translation>Rutuppsättningskolumner ändrades</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The number of tile columns in the tileset &apos;%1&apos; appears to have changed from %2 to %3. Do you want to adjust tile references?</source>
+        <translation>Antalet rutkolumner i rutuppsättningen &quot;%1&quot; verkar ha ändrats från %2 till %3. Vill du justera rutreferenserna?</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::EditPolygonTool</name>
+    <message>
+        <location filename="../src/tiled/editpolygontool.cpp" line="+58"/>
+        <location line="+294"/>
+        <source>Edit Polygons</source>
+        <translation>Redigera polygoner</translation>
+    </message>
+    <message>
+        <location line="-292"/>
+        <location line="+293"/>
+        <source>O</source>
+        <translation>O</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <source>Split Segment</source>
+        <translation>Dela upp segment</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+265"/>
+        <source>Move %n Point(s)</source>
+        <translation>
+            <numerusform>Flytta %n punkt(er)</numerusform>
+            <numerusform>Flytta %n punkt(er)</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+58"/>
+        <location line="+94"/>
+        <source>Delete %n Node(s)</source>
+        <translation>
+            <numerusform>Radera %n nod(er)</numerusform>
+            <numerusform>Radera %n noder</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="-89"/>
+        <location line="+264"/>
+        <source>Join Nodes</source>
+        <translation>Sammanfoga noder</translation>
+    </message>
+    <message>
+        <location line="-263"/>
+        <location line="+299"/>
+        <source>Split Segments</source>
+        <translation>Dela upp segment</translation>
+    </message>
+    <message>
+        <location line="-298"/>
+        <location line="+365"/>
+        <source>Delete Segment</source>
+        <translation>Radera segment</translation>
+    </message>
+    <message>
+        <location line="-334"/>
+        <source>Extend Polyline</source>
+        <translation>Förläng polylinje</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::Eraser</name>
+    <message>
+        <location filename="../src/tiled/eraser.cpp" line="+35"/>
+        <location line="+57"/>
+        <source>Eraser</source>
+        <translation>Suddgummi</translation>
+    </message>
+    <message>
+        <location line="-54"/>
+        <location line="+55"/>
+        <source>E</source>
+        <translation>E</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ExportAsImageDialog</name>
+    <message>
+        <location filename="../src/tiled/exportasimagedialog.cpp" line="+67"/>
+        <source>Export</source>
+        <translation>Exportera</translation>
+    </message>
+    <message>
+        <location line="+68"/>
+        <source>Export as Image</source>
+        <translation>Exportera som bild</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>%1 already exists.
+Do you want to replace it?</source>
+        <translation>%1 finns redan.
+Vill du ersätta den?</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Out of Memory</source>
+        <translation>Slut på minne</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Could not allocate sufficient memory for the image. Try reducing the zoom level or using a 64-bit version of Tiled.</source>
+        <translation>Kunde inte allokera tillräckligt mycket minne för bilden. Försök minska zoomnivån eller använda en 64-bitarsversion av Tiled.</translation>
+    </message>
+    <message>
+        <location line="-16"/>
+        <source>Image too Big</source>
+        <translation>Bilden är för stor</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The resulting image would be %1 x %2 pixels and take %3 GB of memory. Tiled is unable to create such an image. Try reducing the zoom level.</source>
+        <translation>Den resulterande bilden skulle vara %1 x %2 bildpunkter och använda %3 GB minne. Tiled kan inte skapa en sådan bild. Försök minska zoomnivån.</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Image</source>
+        <translation>Bild</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::FileChangedWarning</name>
+    <message>
+        <location filename="../src/tiled/filechangedwarning.cpp" line="+40"/>
+        <source>File change detected. Discard changes and reload the file?</source>
+        <translation>Filändringar upptäcktes. Släng ändringarna och uppdatera filen?</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Reload</source>
+        <translation>Uppdatera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Ignore</source>
+        <translation>Ignorera</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::FileEdit</name>
+    <message>
+        <location filename="../src/tiled/fileedit.cpp" line="+127"/>
+        <source>Choose a File</source>
+        <translation>Välj en fil</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::LayerDock</name>
+    <message>
+        <location filename="../src/tiled/layerdock.cpp" line="+229"/>
+        <source>Layers</source>
+        <translation>Lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Opacity:</source>
+        <translation>Opacitet:</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Layer</source>
+        <translation>Nytt lager</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::LayerModel</name>
+    <message>
+        <location filename="../src/tiled/layermodel.cpp" line="+235"/>
+        <source>Layer</source>
+        <translation>Lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Visible</source>
+        <translation>Synlig</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Locked</source>
+        <translation>Låst</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+74"/>
+        <source>Drag Layer(s)</source>
+        <translation>
+            <numerusform>Dra lager</numerusform>
+            <numerusform>Dra lager</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+238"/>
+        <source>Show Other Layers</source>
+        <translation>Visa andra lager</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide Other Layers</source>
+        <translation>Dölj andra lager</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Lock Other Layers</source>
+        <translation>Lås andra lager</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Unlock Other Layers</source>
+        <translation>Lås upp andra lager</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::LayerOffsetTool</name>
+    <message>
+        <location filename="../src/tiled/layeroffsettool.cpp" line="+40"/>
+        <location line="+84"/>
+        <source>Offset Layers</source>
+        <translation>Förskjut lager</translation>
+    </message>
+    <message>
+        <location line="-82"/>
+        <location line="+83"/>
+        <source>M</source>
+        <translation>M</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MagicWandTool</name>
+    <message>
+        <location filename="../src/tiled/magicwandtool.cpp" line="+33"/>
+        <location line="+22"/>
+        <source>Magic Wand</source>
+        <translation>Trollstav</translation>
+    </message>
+    <message>
+        <location line="-19"/>
+        <location line="+20"/>
+        <source>W</source>
+        <translation>W</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MainToolBar</name>
+    <message>
+        <location filename="../src/tiled/maintoolbar.cpp" line="+42"/>
+        <source>Main Toolbar</source>
+        <translation>Huvudverktygsfält</translation>
+    </message>
+    <message>
+        <location line="+26"/>
+        <location line="+70"/>
+        <source>Undo</source>
+        <translation>Ångra</translation>
+    </message>
+    <message>
+        <location line="-69"/>
+        <location line="+68"/>
+        <source>Redo</source>
+        <translation>Gör om</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>New</source>
+        <translation>Ny</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Open</source>
+        <translation>Öppna</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Save</source>
+        <translation>Spara</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MainWindow</name>
+    <message>
+        <location filename="../src/tiled/mainwindow.cpp" line="+240"/>
+        <source>Undo</source>
+        <translation>Ångra</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Redo</source>
+        <translation>Gör om</translation>
+    </message>
+    <message>
+        <location line="+13"/>
+        <source>Ctrl+Q</source>
+        <translation>Ctrl+Q</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Ctrl+=</source>
+        <translation>Ctrl+=</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <location line="+1184"/>
+        <source>&amp;Layer</source>
+        <translation>&amp;Lager</translation>
+    </message>
+    <message>
+        <location line="-1113"/>
+        <source>Load World</source>
+        <translation>Läs in värld</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Error Loading World</source>
+        <translation>Fel uppstod när värld lästes in</translation>
+    </message>
+    <message>
+        <location line="+79"/>
+        <source>Reset to Default Layout</source>
+        <translation>Återställ till standardutseende</translation>
+    </message>
+    <message>
+        <location line="+269"/>
+        <source>Open File</source>
+        <translation>Öppna fil</translation>
+    </message>
+    <message>
+        <location line="+759"/>
+        <source>&amp;New</source>
+        <translation>&amp;Ny</translation>
+    </message>
+    <message>
+        <location line="-1026"/>
+        <source>Object Types Editor</source>
+        <translation>Objekttypsredigerare</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/tileseteditor.cpp" line="+614"/>
+        <source>Ctrl+Shift+O</source>
+        <translation>Ctrl+Shift+O</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/mainwindow.cpp" line="+43"/>
+        <source>Ctrl+Shift+Tab</source>
+        <translation>Ctrl+Shift+Tab</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Ctrl+Tab</source>
+        <translation>Ctrl+Tab</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Alt+C</source>
+        <translation>Alt+C</translation>
+    </message>
+    <message>
+        <location line="-437"/>
+        <location line="+639"/>
+        <location line="+368"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/documentmanager.cpp" line="-567"/>
+        <source>Extension Mismatch</source>
+        <translation>Ändelser stämmer inte överens</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/mainwindow.cpp" line="-418"/>
+        <source>Error Opening File</source>
+        <translation>Fel uppstod när fil öppnades</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/documentmanager.cpp" line="-40"/>
+        <location filename="../src/tiled/mainwindow.cpp" line="+136"/>
+        <source>Error Saving File</source>
+        <translation>Fel uppstod när fil sparades</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>The file extension does not match the chosen file type.</source>
+        <translation>Filändelsen stämmer inte överens med den valda filtypen.</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Tiled may not automatically recognize your file when loading. Are you sure you want to save with this extension?</source>
+        <translation>Tiled kanske inte känner igen din fil automatiskt under inläsning. Är du säker på att du vill spara med denna ändelse?</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/mainwindow.cpp" line="+16"/>
+        <source>Unsaved Changes</source>
+        <translation>Osparade ändringar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>There are unsaved changes. Do you want to save now?</source>
+        <translation>Det finns osparade ändringar. Vill du spara dem nu?</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>Exported to %1</source>
+        <translation>Exporterades till %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Error Exporting Map</source>
+        <translation>Fel uppstod när karta exporterades</translation>
+    </message>
+    <message>
+        <location line="-768"/>
+        <source>Export As...</source>
+        <translation>Exportera som...</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Non-unique file extension</source>
+        <translation>Icke-unik filändelse</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Non-unique file extension.
+Please select specific format.</source>
+        <translation>Icke-unik filändelse.
+Var god ange det specifika formatet.</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Unknown File Format</source>
+        <translation>Okänt filformat</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The given filename does not have any known file extension.</source>
+        <translation>Det angivna filnamnet har inte någon känd filändelse.</translation>
+    </message>
+    <message>
+        <location line="+1382"/>
+        <source>Some export files already exist:</source>
+        <translation>Vissa exportfiler finns redan:</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Do you want to replace them?</source>
+        <translation>Vill du ersätta dem?</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Overwrite Files</source>
+        <translation>Skriv över filer</translation>
+    </message>
+    <message>
+        <location line="-73"/>
+        <source>[*]%1</source>
+        <translation>[*]%1</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>&amp;Group</source>
+        <translation>&amp;Group</translation>
+    </message>
+    <message>
+        <location line="+62"/>
+        <location line="+30"/>
+        <source>Error Exporting Map!</source>
+        <translation>Fel uppstod när karta exporterades!</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Error Reloading Map</source>
+        <translation>Fel uppstod när karta uppdaterades</translation>
+    </message>
+    <message>
+        <location line="-399"/>
+        <source>Automatic Mapping Warning</source>
+        <translation>Varning uppstod under automatisk kartläggning</translation>
+    </message>
+    <message>
+        <location line="-13"/>
+        <source>Automatic Mapping Error</source>
+        <translation>Fel uppstod under automatisk kartläggning</translation>
+    </message>
+    <message>
+        <location line="-760"/>
+        <location line="+1033"/>
+        <source>Views and Toolbars</source>
+        <translation>Vyer och verktygsfält</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/tilecollisiondock.cpp" line="+375"/>
+        <source>Tile Collision Editor</source>
+        <translation>Rutkollisionsredigerare</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/mainwindow.cpp" line="-988"/>
+        <source>Alt+Left</source>
+        <translation>Alt+Left</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Alt+Right</source>
+        <translation>Alt+Right</translation>
+    </message>
+    <message>
+        <location line="+592"/>
+        <source>Add External Tileset(s)</source>
+        <translation>Lägg till extern(a) rutuppsättning(ar)</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/abstractobjecttool.cpp" line="-261"/>
+        <location filename="../src/tiled/documentmanager.cpp" line="+19"/>
+        <location line="+20"/>
+        <source>untitled</source>
+        <translation>namnlös</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Save Template</source>
+        <translation>Spara mall</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Error Saving Template</source>
+        <translation>Fel uppstod när mall sparades</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MapDocument</name>
+    <message>
+        <location filename="../src/tiled/mapdocument.cpp" line="+210"/>
+        <source>untitled.tmx</source>
+        <translation>namnlös.tmx</translation>
+    </message>
+    <message>
+        <location line="+83"/>
+        <source>Resize Map</source>
+        <translation>Ändra storlek på karta</translation>
+    </message>
+    <message>
+        <location line="+75"/>
+        <source>Offset Map</source>
+        <translation>Förskjutningskarta</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+27"/>
+        <source>Rotate %n Object(s)</source>
+        <translation>
+            <numerusform>Rotera %n objekt</numerusform>
+            <numerusform>Rotera %n objekt</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Tile Layer %1</source>
+        <translation>Rutlager %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Object Layer %1</source>
+        <translation>Objektlager %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Image Layer %1</source>
+        <translation>Bildlager %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+33"/>
+        <source>Group %1</source>
+        <translation>Grupp %1</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+2"/>
+        <source>Group %n Layer(s)</source>
+        <translation>
+            <numerusform>Gruppera %n lager</numerusform>
+            <numerusform>Gruppera %n lager</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+16"/>
+        <source>Ungroup %n Layer(s)</source>
+        <translation>
+            <numerusform>Avgruppera %n lager</numerusform>
+            <numerusform>Avgruppera %n lager</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+46"/>
+        <source>Duplicate %n Layer(s)</source>
+        <translation>
+            <numerusform>Duplicera %n lager</numerusform>
+            <numerusform>Duplicera %n lager</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Copy of %1</source>
+        <translation>Kopiera av %1</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Merge Layer Down</source>
+        <translation>Sammanfoga lager nedåt</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+73"/>
+        <source>Remove %n Layer(s)</source>
+        <translation>
+            <numerusform>Ta bort %n lager</numerusform>
+            <numerusform>Ta bort %n lager</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+305"/>
+        <source>Tile</source>
+        <translation>Ruta</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Tileset Changes</source>
+        <translation>Rutuppsättningsändringar</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+229"/>
+        <source>Duplicate %n Object(s)</source>
+        <translation>
+            <numerusform>Duplicera %n objekt</numerusform>
+            <numerusform>Duplicera %n objekt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+13"/>
+        <source>Remove %n Object(s)</source>
+        <translation>
+            <numerusform>Ta bort %n objekt</numerusform>
+            <numerusform>Ta bort %n objekt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+11"/>
+        <source>Move %n Object(s) to Layer</source>
+        <translation>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+38"/>
+        <source>Move %n Object(s) Up</source>
+        <translation>
+            <numerusform>Flytta %n objekt uppåt</numerusform>
+            <numerusform>Flytta %n objekt uppåt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+36"/>
+        <source>Move %n Object(s) Down</source>
+        <translation>
+            <numerusform>Flytta %n objekt nedåt</numerusform>
+            <numerusform>Flytta %n objekt nedåt</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MapDocumentActionHandler</name>
+    <message>
+        <location filename="../src/tiled/mapdocumentactionhandler.cpp" line="+68"/>
+        <source>Ctrl+Shift+A</source>
+        <translation>Ctrl+Shift+A</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Ctrl+Shift+D</source>
+        <translation>Ctrl+Shift+D</translation>
+    </message>
+    <message>
+        <location line="-9"/>
+        <source>Ctrl+J</source>
+        <translation>Ctrl+J</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Ctrl+Shift+J</source>
+        <translation>Ctrl+Shift+J</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Ctrl+Shift+Up</source>
+        <translation>Ctrl+Shift+Up</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Ctrl+Shift+Down</source>
+        <translation>Ctrl+Shift+Down</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Ctrl+Shift+H</source>
+        <translation>Ctrl+Shift+H</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Ctrl+Shift+L</source>
+        <translation>Ctrl+Shift+L</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Select &amp;All</source>
+        <translation>Markera &amp;allt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Invert S&amp;election</source>
+        <translation>Invertera &amp;markering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select &amp;None</source>
+        <translation>A&amp;vmarkera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Crop to Selection</source>
+        <translation>&amp;Beskär till markering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Autocrop</source>
+        <translation>Autobeskär</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Tile Layer</source>
+        <translation>&amp;Rutlager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Object Layer</source>
+        <translation>&amp;Objektlager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Image Layer</source>
+        <translation>&amp;Bildlager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Group Layer</source>
+        <translation>&amp;Lagergrupp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+320"/>
+        <source>Layer via Copy</source>
+        <translation>Lager från kopierad markering</translation>
+    </message>
+    <message>
+        <location line="-319"/>
+        <location line="+319"/>
+        <source>Layer via Cut</source>
+        <translation>Lager från utklippt markerad</translation>
+    </message>
+    <message>
+        <location line="-313"/>
+        <source>&amp;Remove Layers</source>
+        <translation>&amp;Ta bort lager</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>R&amp;aise Layers</source>
+        <translation>&amp;Höj lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Lower Layers</source>
+        <translation>S&amp;änk lager</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Select Pre&amp;vious Layer</source>
+        <translation>Markera &amp;föregående lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Select &amp;Next Layer</source>
+        <translation>Markera &amp;nästa lager</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Show/&amp;Hide all Other Layers</source>
+        <translation>Visa/d&amp;ölj alla andra lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Lock/&amp;Unlock all Other Layers</source>
+        <translation>Lås/&amp;lås upp alla andra lager</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>&amp;New</source>
+        <translation>&amp;Ny</translation>
+    </message>
+    <message>
+        <location line="+18"/>
+        <source>&amp;Group</source>
+        <translation>&amp;Gruppera</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Cut</source>
+        <translation>Klipp ut</translation>
+    </message>
+    <message>
+        <location line="+46"/>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+439"/>
+        <source>Duplicate %n Object(s)</source>
+        <translation>
+            <numerusform>Duplicera %n objekt</numerusform>
+            <numerusform>Duplicera %n objekt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+1"/>
+        <source>Remove %n Object(s)</source>
+        <translation>
+            <numerusform>Ta bort %n objekt</numerusform>
+            <numerusform>Ta bort %n objekt</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Duplicate Objects</source>
+        <translation>Duplicera objekt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Objects</source>
+        <translation>Ta bort objekt</translation>
+    </message>
+    <message>
+        <location line="-680"/>
+        <source>Ctrl+PgUp</source>
+        <translation>Ctrl+PgUp</translation>
+    </message>
+    <message>
+        <location line="-3"/>
+        <source>Ctrl+PgDown</source>
+        <translation>Ctrl+PgDown</translation>
+    </message>
+    <message>
+        <location line="+92"/>
+        <source>&amp;Group Layers</source>
+        <translation>&amp;Gruppera lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Ungroup Layers</source>
+        <translation>&amp;Avgruppera lager</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Duplicate Layers</source>
+        <translation>&amp;Duplicera lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Merge Layer Down</source>
+        <translation>&amp;Sammanfoga lager nedåt</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Layer &amp;Properties...</source>
+        <translation>Lager&amp;egenskaper...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MapEditor</name>
+    <message>
+        <location filename="../src/tiled/mapeditor.cpp" line="+665"/>
+        <source>Paste in Place</source>
+        <translation>Klistra in på plats</translation>
+    </message>
+    <message>
+        <location line="+187"/>
+        <location line="+5"/>
+        <source>Error Reading Tileset</source>
+        <translation>Fel uppstod när rutuppsättning lästes</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>%1: %2</source>
+        <translation>%1: %2</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+17"/>
+        <source>Add %n Tileset(s)</source>
+        <translation>
+            <numerusform>Lägg till %n rutuppsättning(ar)</numerusform>
+            <numerusform>Lägg till %n rutuppsättningar</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+57"/>
+        <source>Tool Options</source>
+        <translation>Verktygsalternativ</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Tools</source>
+        <translation>Verktyg</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MapObjectModel</name>
+    <message>
+        <location filename="../src/tiled/mapobjectmodel.cpp" line="+201"/>
+        <source>Change Object Name</source>
+        <translation>Ändra objektnamn</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Change Object Type</source>
+        <translation>Ändra objekttyp</translation>
+    </message>
+    <message>
+        <location line="+55"/>
+        <source>Name</source>
+        <translation>Namn</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Position</source>
+        <translation>Position</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MapsDock</name>
+    <message>
+        <location filename="../src/tiled/mapsdock.cpp" line="+83"/>
+        <source>Browse...</source>
+        <translation>Bläddra...</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Choose the Maps Folder</source>
+        <translation>Välj kartmappen</translation>
+    </message>
+    <message>
+        <location line="+41"/>
+        <source>Maps</source>
+        <translation>Kartor</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::MiniMapDock</name>
+    <message>
+        <location filename="../src/tiled/minimapdock.cpp" line="+60"/>
+        <source>Mini-map</source>
+        <translation>Minikarta</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::NewMapDialog</name>
+    <message>
+        <location filename="../src/tiled/newmapdialog.cpp" line="-19"/>
+        <source>Save As...</source>
+        <translation>Spara som...</translation>
+    </message>
+    <message>
+        <location line="+21"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="-17"/>
+        <source>Orthogonal</source>
+        <translation>Ortogonal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Isometric</source>
+        <translation>Isometrisk</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Isometric (Staggered)</source>
+        <translation>Isometrisk (romber)</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+1"/>
+        <source>Hexagonal (Staggered)</source>
+        <translation>Hexagonal (romber)</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>Tile Layer 1</source>
+        <translation>Rutlager 1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Memory Usage Warning</source>
+        <translation>Varning om minnesanvändning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Tile layers for this map will consume %L1 GB of memory each. Not creating one by default.</source>
+        <translation>Rutlager för denna karta kommer att använda %L1 GB minne vardera. Ett skapas inte som standard.</translation>
+    </message>
+    <message>
+        <location line="+45"/>
+        <source>%1 x %2 pixels</source>
+        <translation>%1 x %2 bildpunkter</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::NewTilesetDialog</name>
+    <message>
+        <location filename="../src/tiled/newtilesetdialog.cpp" line="-43"/>
+        <location line="+7"/>
+        <source>Error</source>
+        <translation>Fel</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Failed to load tileset image &apos;%1&apos;.</source>
+        <translation>Misslyckades att läsa in rutuppsättningsbilden &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>No tiles found in the tileset image when using the given tile size, margin and spacing!</source>
+        <translation>Inga rutor hittades i rutuppsättningsbilden när den angivna rutstorleken, marginalen och mellanrummet används!</translation>
+    </message>
+    <message>
+        <location line="+47"/>
+        <source>Tileset Image</source>
+        <translation>Rutuppsättningsbild</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <location line="+2"/>
+        <source>&amp;OK</source>
+        <translation>&amp;OK</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>&amp;Save As...</source>
+        <translation>&amp;Spara som...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::NewsButton</name>
+    <message>
+        <location filename="../src/tiled/newsbutton.cpp" line="+45"/>
+        <source>News</source>
+        <translation>Nyheter</translation>
+    </message>
+    <message>
+        <location line="+69"/>
+        <source>News Archive</source>
+        <translation>Nyhetsarkiv</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::NoEditorWidget</name>
+    <message>
+        <location filename="../src/tiled/noeditorwidget.ui" line="+19"/>
+        <source>&lt;font size=&quot;+2&quot;&gt;No Open Files&lt;/font&gt;</source>
+        <translation>&lt;font size=&quot;+2&quot;&gt;Inga öppnade filer&lt;/font&gt;</translation>
+    </message>
+    <message>
+        <location line="+28"/>
+        <source>New Map...</source>
+        <translation>Ny karta...</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>New Tileset...</source>
+        <translation>Ny rutuppsättning...</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Open File...</source>
+        <translation>Öppna fil...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ObjectSelectionTool</name>
+    <message>
+        <location filename="../src/tiled/objectselectiontool.cpp" line="+317"/>
+        <location line="+416"/>
+        <source>Select Objects</source>
+        <translation>Markera objekt</translation>
+    </message>
+    <message>
+        <location line="-414"/>
+        <location line="+415"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+    <message numerus="yes">
+        <location line="-289"/>
+        <location line="+719"/>
+        <source>Move %n Object(s)</source>
+        <translation>
+            <numerusform>Flytta %n objekt</numerusform>
+            <numerusform>Flytta %n objekt</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="-593"/>
+        <source>Unnamed object</source>
+        <translation>Namnlöst objekt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Instance of %1</source>
+        <translation>Instans av %1</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>&amp;%1) %2</source>
+        <translation>&amp;%1) %2</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>%1) %2</source>
+        <translation>%1) %2</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+673"/>
+        <source>Rotate %n Object(s)</source>
+        <translation>
+            <numerusform>Rotera %n objekt</numerusform>
+            <numerusform>Rotera %n objekt</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+267"/>
+        <source>Resize %n Object(s)</source>
+        <translation>
+            <numerusform>Storleksändra %n objekt</numerusform>
+            <numerusform>Storleksändra %n objekt</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ObjectTypesEditor</name>
+    <message>
+        <location filename="../src/tiled/objecttypeseditor.cpp" line="+226"/>
+        <source>Add Object Type</source>
+        <translation>Lägg till objekttyp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Object Type</source>
+        <translation>Ta bort objekttyp</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add Property</source>
+        <translation>Lägg till egenskap</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Property</source>
+        <translation>Ta bort egenskap</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+321"/>
+        <source>Rename Property</source>
+        <translation>Byt namn på egenskap</translation>
+    </message>
+    <message>
+        <location line="-266"/>
+        <location line="+128"/>
+        <source>Error Writing Object Types</source>
+        <translation>Fel uppstod när objekttyper skrevs</translation>
+    </message>
+    <message>
+        <location line="-127"/>
+        <source>Error writing to %1:
+%2</source>
+        <translation>Fel uppstod när %1 skrevs: %2</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Choose Object Types File</source>
+        <translation>Välj objektypsfil</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+33"/>
+        <location line="+44"/>
+        <source>Object Types files (*.xml *.json)</source>
+        <translation>Objekttypsfiler (*.xml *.json)</translation>
+    </message>
+    <message>
+        <location line="-62"/>
+        <location line="+44"/>
+        <source>Error Reading Object Types</source>
+        <translation>Fel uppstod när objekttyper lästes</translation>
+    </message>
+    <message>
+        <location line="-28"/>
+        <source>Import Object Types</source>
+        <translation>Importera objekttyper</translation>
+    </message>
+    <message>
+        <location line="+44"/>
+        <source>Export Object Types</source>
+        <translation>Exportera objekttyper</translation>
+    </message>
+    <message>
+        <location line="+146"/>
+        <source>Name:</source>
+        <translation>Namn:</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ObjectTypesModel</name>
+    <message>
+        <location filename="../src/tiled/objecttypesmodel.cpp" line="+65"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Color</source>
+        <translation>Färg</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ObjectsDock</name>
+    <message>
+        <location filename="../src/tiled/objectsdock.cpp" line="+174"/>
+        <source>Object Properties</source>
+        <translation>Objektegenskaper</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>Add Object Layer</source>
+        <translation>Lägg till objektlager</translation>
+    </message>
+    <message>
+        <location line="-2"/>
+        <source>Objects</source>
+        <translation>Objekt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Move Objects Up</source>
+        <translation>Flytta objekt uppåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Objects Down</source>
+        <translation>Flytta objekt nedåt</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+17"/>
+        <source>Move %n Object(s) to Layer</source>
+        <translation>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+            <numerusform>Flytta %n objekt till lager</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::PatreonDialog</name>
+    <message>
+        <location filename="../src/tiled/patreondialog.cpp" line="+49"/>
+        <source>Remind me next week</source>
+        <translation>Påminn mig nästa vecka</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remind me next month</source>
+        <translation>Påminn mig nästa månad</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Don&apos;t remind me</source>
+        <translation>Påminn mig inte</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Thanks!</source>
+        <translation>Tack!</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Thanks a lot for your support! With your help Tiled will keep getting better.</source>
+        <translation>Tack så mycket för ditt stöd! Med din hjälp kommer Tiled bli bättre hela tiden.</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::PreferencesDialog</name>
+    <message>
+        <location filename="../src/tiled/preferencesdialog.cpp" line="-153"/>
+        <location line="+150"/>
+        <source>System default</source>
+        <translation>Systemstandard</translation>
+    </message>
+    <message>
+        <location line="-6"/>
+        <source>Last checked: %1</source>
+        <translation>Senast kontrollerad: %1</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::PropertiesDock</name>
+    <message>
+        <location filename="../src/tiled/propertiesdock.cpp" line="+313"/>
+        <source>Name:</source>
+        <translation>Namn:</translation>
+    </message>
+    <message>
+        <location line="+178"/>
+        <source>Add Property</source>
+        <translation>Lägg till egenskap</translation>
+    </message>
+    <message>
+        <location line="-176"/>
+        <location line="+178"/>
+        <source>Rename Property</source>
+        <translation>Byt namn på egenskap</translation>
+    </message>
+    <message numerus="yes">
+        <location line="-252"/>
+        <source>Paste Property/Properties</source>
+        <translation>
+            <numerusform>Klistra in egenskap/egenskaper</numerusform>
+            <numerusform>Klistra in egenskap/egenskaper</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+50"/>
+        <source>Remove Property/Properties</source>
+        <translation>
+            <numerusform>Ta bort egenskap/egenskaper</numerusform>
+            <numerusform>Ta bort egenskap/egenskaper</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Cu&amp;t</source>
+        <translation>K&amp;lipp ut</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Copy</source>
+        <translation>&amp;Kopiera</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Paste</source>
+        <translation>Klistra &amp;in</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Convert To</source>
+        <translation>Omvandla till</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Rename...</source>
+        <translation>Byt namn...</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+69"/>
+        <source>Convert Property/Properties</source>
+        <translation>
+            <numerusform>Omvandla egenskap/egenskaper</numerusform>
+            <numerusform>Omvandla egenskap/egenskaper</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location line="+58"/>
+        <source>Properties</source>
+        <translation>Egenskaper</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Remove Property</source>
+        <translation>Ta bort egenskap</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::PropertyBrowser</name>
+    <message>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+16"/>
+        <source>Horizontal</source>
+        <translation>Horizontal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertical</source>
+        <translation>Vertikal</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Top Down</source>
+        <translation>Överkant-nedåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Manual</source>
+        <translation>Manuell</translation>
+    </message>
+    <message>
+        <location line="-1090"/>
+        <source>Columns</source>
+        <translation>Kolumner</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Source</source>
+        <translation>Källa</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Relative chance this tile will be picked</source>
+        <translation>Relativ chans att denna ruta väljs ut</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>Wang Set</source>
+        <translation>Wang-uppsättning</translation>
+    </message>
+    <message>
+        <location line="+347"/>
+        <source>Error Reading Tileset</source>
+        <translation>Fel uppstod när rutuppsättning lästes</translation>
+    </message>
+    <message>
+        <location line="+295"/>
+        <source>Custom Properties</source>
+        <translation>Anpassade egenskaper</translation>
+    </message>
+    <message>
+        <location line="-949"/>
+        <source>Map</source>
+        <translation>Karta</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Tile Layer Format</source>
+        <translation>Format för rutlager</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Tile Render Order</source>
+        <translation>Renderingsordning för rutor</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+165"/>
+        <source>Background Color</source>
+        <translation>Bakgrundsfärg</translation>
+    </message>
+    <message>
+        <location line="-133"/>
+        <source>Object</source>
+        <translation>Objekt</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+45"/>
+        <location line="+78"/>
+        <location line="+91"/>
+        <location line="+8"/>
+        <location line="+21"/>
+        <source>Name</source>
+        <translation>Namn</translation>
+    </message>
+    <message>
+        <location line="-240"/>
+        <location line="+179"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location line="-175"/>
+        <location line="+39"/>
+        <source>Visible</source>
+        <translation>Synlig</translation>
+    </message>
+    <message>
+        <location line="-37"/>
+        <location line="+1199"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="-1198"/>
+        <location line="+1199"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="-986"/>
+        <source>Edge Count</source>
+        <translation>Antal kanter</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Corner Count</source>
+        <translation>Antal hörn</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Wang Color</source>
+        <translation>Wangfärg</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Change Infinite Property</source>
+        <translation>Ändra oändlighetsegenskap</translation>
+    </message>
+    <message>
+        <location line="+931"/>
+        <source>Odd</source>
+        <translation>Udda</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Even</source>
+        <translation>Jämna</translation>
+    </message>
+    <message>
+        <location line="-1293"/>
+        <location line="+216"/>
+        <source>Orientation</source>
+        <translation>Orientering</translation>
+    </message>
+    <message>
+        <location line="-211"/>
+        <location line="+92"/>
+        <location line="+170"/>
+        <source>Width</source>
+        <translation>Bredd</translation>
+    </message>
+    <message>
+        <location line="-261"/>
+        <location line="+92"/>
+        <location line="+170"/>
+        <source>Height</source>
+        <translation>Höjd</translation>
+    </message>
+    <message>
+        <location line="-261"/>
+        <location line="+232"/>
+        <source>Tile Width</source>
+        <translation>Rutbredd</translation>
+    </message>
+    <message>
+        <location line="-231"/>
+        <location line="+232"/>
+        <source>Tile Height</source>
+        <translation>Ruthöjd</translation>
+    </message>
+    <message>
+        <location line="-231"/>
+        <source>Infinite</source>
+        <translation>Oändlig</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Tile Side Length (Hex)</source>
+        <translation>Sidlängd på ruta (hex)</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Stagger Axis</source>
+        <translation>Rombaxel</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Stagger Index</source>
+        <translation>Rombindex</translation>
+    </message>
+    <message>
+        <location line="+56"/>
+        <source>Template</source>
+        <translation>Mall</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Rotation</source>
+        <translation>Rotering</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Flipping</source>
+        <translation>Vänder</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Text</source>
+        <translation>Text</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Alignment</source>
+        <translation>Justering</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Font</source>
+        <translation>Typsnitt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Word Wrap</source>
+        <translation>Radbrytning</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <source>Locked</source>
+        <translation>Låst</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Opacity</source>
+        <translation>Opacitet</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Horizontal Offset</source>
+        <translation>Horisontal förskjutning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Vertical Offset</source>
+        <translation>Vertikal förskjutning</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tile Layer</source>
+        <translation>Rutlager</translation>
+    </message>
+    <message>
+        <location line="+7"/>
+        <source>Object Layer</source>
+        <translation>Objektlager</translation>
+    </message>
+    <message>
+        <location line="-32"/>
+        <location line="+35"/>
+        <location line="+176"/>
+        <source>Color</source>
+        <translation>Färg</translation>
+    </message>
+    <message>
+        <location line="-171"/>
+        <source>Drawing Order</source>
+        <translation>Ritningsordning</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Image Layer</source>
+        <translation>Bildlager</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <location line="+62"/>
+        <location line="+48"/>
+        <source>Image</source>
+        <translation>Bild</translation>
+    </message>
+    <message>
+        <location line="-105"/>
+        <location line="+66"/>
+        <source>Transparent Color</source>
+        <translation>Genomskinlig färg</translation>
+    </message>
+    <message>
+        <location line="-59"/>
+        <source>Group Layer</source>
+        <translation>Gruppera lager</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Tileset</source>
+        <translation>Rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Filename</source>
+        <translation>Filnamn</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Drawing Offset</source>
+        <translation>Ritningsförskjutning</translation>
+    </message>
+    <message>
+        <location line="+14"/>
+        <source>Grid Width</source>
+        <translation>Rutnätsbredd</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Grid Height</source>
+        <translation>Rutnätshöjd</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Margin</source>
+        <translation>Marginal</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Spacing</source>
+        <translation>Mellanrum</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Tile</source>
+        <translation>Ruta</translation>
+    </message>
+    <message>
+        <location line="-180"/>
+        <location line="+46"/>
+        <location line="+135"/>
+        <source>ID</source>
+        <translation>ID</translation>
+    </message>
+    <message>
+        <location line="+12"/>
+        <location line="+60"/>
+        <source>Probability</source>
+        <translation>Sannolikhet</translation>
+    </message>
+    <message>
+        <location line="-38"/>
+        <source>Terrain</source>
+        <translation>Terräng</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::SelectSameTileTool</name>
+    <message>
+        <location filename="../src/tiled/selectsametiletool.cpp" line="+31"/>
+        <location line="+26"/>
+        <source>Select Same Tile</source>
+        <translation>Välj likadana rutor</translation>
+    </message>
+    <message>
+        <location line="-23"/>
+        <location line="+24"/>
+        <source>S</source>
+        <translation>S</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::ShapeFillTool</name>
+    <message>
+        <location filename="../src/tiled/shapefilltool.cpp" line="+40"/>
+        <location line="+77"/>
+        <source>Shape Fill Tool</source>
+        <translation>Formfyllningsverktyg</translation>
+    </message>
+    <message>
+        <location line="-74"/>
+        <location line="+75"/>
+        <source>P</source>
+        <translation>P</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Rectangle Fill</source>
+        <translation>Rektangelfyllning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Circle Fill</source>
+        <translation>Cirkelfyllning</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::StampActions</name>
+    <message>
+        <location filename="../src/tiled/stampactions.cpp" line="+48"/>
+        <location line="+25"/>
+        <source>Random Mode</source>
+        <translation>Slumpläge</translation>
+    </message>
+    <message>
+        <location line="-24"/>
+        <location line="+31"/>
+        <source>D</source>
+        <translation>D</translation>
+    </message>
+    <message>
+        <location line="-26"/>
+        <location line="+20"/>
+        <source>Wang Fill Mode</source>
+        <translation>Wangfyllningsläge</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Flip Horizontally</source>
+        <translation>Vänd horisontalt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Flip Vertically</source>
+        <translation>Vänd vertikalt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/abstractobjecttool.cpp" line="-125"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+1"/>
+        <source>Rotate Left</source>
+        <translation>Rotera åt vänster</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+1"/>
+        <source>Rotate Right</source>
+        <translation>Rotera åt höger</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+3"/>
+        <source>X</source>
+        <translation>X</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+1"/>
+        <source>Y</source>
+        <translation>Y</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+1"/>
+        <source>Shift+Z</source>
+        <translation>Shift+Z</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location filename="../src/tiled/stampactions.cpp" line="+1"/>
+        <source>Z</source>
+        <translation>Z</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::StampBrush</name>
+    <message>
+        <location filename="../src/tiled/stampbrush.cpp" line="+49"/>
+        <location line="+158"/>
+        <source>Stamp Brush</source>
+        <translation>Stämpelpensel</translation>
+    </message>
+    <message>
+        <location line="-155"/>
+        <location line="+156"/>
+        <source>B</source>
+        <translation>B</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TemplatesDock</name>
+    <message>
+        <location filename="../src/tiled/templatesdock.cpp" line="+293"/>
+        <source>Open Tileset</source>
+        <translation>Öppna rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <location line="+9"/>
+        <source>%1: Couldn&apos;t find &quot;%2&quot;</source>
+        <translation>%1: Kunde inte hitta &quot;%2&quot;</translation>
+    </message>
+    <message>
+        <location line="-4"/>
+        <source>Locate Tileset</source>
+        <translation>Hitta rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Choose the Templates Folder</source>
+        <translation>Välj mallmappen</translation>
+    </message>
+    <message>
+        <location line="+24"/>
+        <source>Templates</source>
+        <translation>Mallar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Choose Templates Directory</source>
+        <translation>Välj mallkatalog</translation>
+    </message>
+    <message>
+        <location line="+27"/>
+        <source>All Files (*)</source>
+        <translation>Alla filer (*)</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Locate External Tileset</source>
+        <translation>Hitta extern rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Error Reading Tileset</source>
+        <translation>Fel uppstod när rutuppsättning lästes</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TemplatesView</name>
+    <message>
+        <location line="+90"/>
+        <source>Select All Instances</source>
+        <translation>Välj alla instanser</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TerrainBrush</name>
+    <message>
+        <location filename="../src/tiled/terrainbrush.cpp" line="+48"/>
+        <location line="+120"/>
+        <source>Terrain Brush</source>
+        <translation>Terrängpensel</translation>
+    </message>
+    <message>
+        <location line="-117"/>
+        <location line="+118"/>
+        <source>T</source>
+        <translation>T</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TerrainDock</name>
+    <message>
+        <location filename="../src/tiled/terraindock.cpp" line="+338"/>
+        <source>Terrains</source>
+        <translation>Terränger</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Erase Terrain</source>
+        <translation>Radera terräng</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add Terrain Type</source>
+        <translation>Lägg till terrängtyp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Terrain Type</source>
+        <translation>Ta bort terrängtyp</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Terrain Type Up</source>
+        <translation>Flytta terrängtyp uppåt</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Move Terrain Type Down</source>
+        <translation>Flytta terrängtyp nedåt</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TerrainView</name>
+    <message>
+        <location filename="../src/tiled/terrainview.cpp" line="+112"/>
+        <source>Terrain &amp;Properties...</source>
+        <translation>Terräng&amp;egenskaper...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TextPropertyEdit</name>
+    <message>
+        <location filename="../src/tiled/textpropertyedit.cpp" line="+121"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TileAnimationEditor</name>
+    <message>
+        <location filename="../src/tiled/tileanimationeditor.cpp" line="-58"/>
+        <source>Delete Frames</source>
+        <translation>Radera bildrutor</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TileCollisionDock</name>
+    <message>
+        <location filename="../src/tiled/tilecollisiondock.cpp" line="-32"/>
+        <source>Delete</source>
+        <translation>Radera</translation>
+    </message>
+    <message>
+        <location line="+0"/>
+        <source>Cut</source>
+        <translation>Klipp ut</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TileSelectionTool</name>
+    <message>
+        <location filename="../src/tiled/tileselectiontool.cpp" line="+36"/>
+        <location line="+106"/>
+        <source>Rectangular Select</source>
+        <translation>Rektangulär markering</translation>
+    </message>
+    <message>
+        <location line="-103"/>
+        <location line="+104"/>
+        <source>R</source>
+        <translation>R</translation>
+    </message>
+    <message>
+        <location line="-81"/>
+        <source>%1, %2 - Rectangle: (%3 x %4)</source>
+        <translation>%1, %2 - Rektangel: (%3 x %4)</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TileStampModel</name>
+    <message>
+        <location filename="../src/tiled/tilestampmodel.cpp" line="+78"/>
+        <source>Stamp</source>
+        <translation>Stämpel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Probability</source>
+        <translation>Sannorlighet</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TileStampsDock</name>
+    <message>
+        <location filename="../src/tiled/tilestampsdock.cpp" line="+196"/>
+        <source>Delete Stamp</source>
+        <translation>Rader stämpel</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Remove Variation</source>
+        <translation>Ta bort variation</translation>
+    </message>
+    <message>
+        <location line="+71"/>
+        <source>Choose the Stamps Folder</source>
+        <translation>Välj stämpelmappen</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Tile Stamps</source>
+        <translation>Rutstämplar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add New Stamp</source>
+        <translation>Lägg till ny stämpel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Variation</source>
+        <translation>Lägg till variation</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Duplicate Stamp</source>
+        <translation>Duplicera stämpel</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Delete Selected</source>
+        <translation>Radera markerade</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Set Stamps Folder</source>
+        <translation>Ange stämpelmapp</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Filter</source>
+        <translation>Filter</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TilesetDock</name>
+    <message>
+        <location filename="../src/tiled/tilesetdock.cpp" line="+578"/>
+        <source>Remove Tileset</source>
+        <translation>Ta bort rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>The tileset &quot;%1&quot; is still in use by the map!</source>
+        <translation>Rutuppsättningen &quot;%1&quot; används fortfarande av kartan!</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Remove this tileset and all references to the tiles in this tileset?</source>
+        <translation>Ta bort denna rutuppsättning och alla referenser till rutorna i denna rutuppsättning?</translation>
+    </message>
+    <message>
+        <location line="+65"/>
+        <source>Tilesets</source>
+        <translation>Rutuppsättningar</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>New Tileset</source>
+        <translation>Ny rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&amp;Embed Tileset</source>
+        <translation>&amp;Bädda in rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Edit Tile&amp;set</source>
+        <translation>Redigera rut&amp;uppsättning</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>&amp;Export Tileset As...</source>
+        <translation>&amp;Exportera rutuppsättning som...</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>&amp;Remove Tileset</source>
+        <translation>&amp;Ta bort rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+193"/>
+        <source>Error saving tileset: %1</source>
+        <translation>Fel uppstod när rutuppsättning sparades: %1</translation>
+    </message>
+    <message>
+        <location line="-18"/>
+        <location line="+17"/>
+        <source>Export Tileset</source>
+        <translation>Exportera rutuppsättning</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TilesetDocument</name>
+    <message>
+        <location filename="../src/tiled/tilesetdocument.cpp" line="+200"/>
+        <source>untitled.tsx</source>
+        <translation>namnlös.tsx</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TilesetEditor</name>
+    <message>
+        <location filename="../src/tiled/tileseteditor.cpp" line="-406"/>
+        <location line="+400"/>
+        <source>Tileset</source>
+        <translation>Rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location line="+22"/>
+        <location line="+31"/>
+        <location line="+19"/>
+        <source>Add Tiles</source>
+        <translation>Lägg till rutor</translation>
+    </message>
+    <message>
+        <location line="-71"/>
+        <location line="+189"/>
+        <source>Remove Tiles</source>
+        <translation>Ta bort rutor</translation>
+    </message>
+    <message>
+        <location line="-188"/>
+        <source>Tile Animation Editor</source>
+        <translation>Rutanimeringsredigerare</translation>
+    </message>
+    <message>
+        <location line="+49"/>
+        <source>Apply this action to all tiles</source>
+        <translation>Tillämpa denna åtgärd på alla rutor</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Tile &quot;%1&quot; already exists in the tileset!</source>
+        <translation>Rutan &quot;%1&quot; finns redan i rutuppsättningen!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Add anyway?</source>
+        <translation>Lägg till ändå?</translation>
+    </message>
+    <message>
+        <location line="+15"/>
+        <source>Could not load &quot;%1&quot;!</source>
+        <translation>Kunde inte läsa in &quot;%1&quot;!</translation>
+    </message>
+    <message>
+        <location line="+118"/>
+        <source>Tiles to be removed are in use by open maps!</source>
+        <translation>Rutor som ska tas bort används i öppnade kartor!</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Remove all references to these tiles?</source>
+        <translation>Ta bort alla referenser till dessa rutor?</translation>
+    </message>
+    <message>
+        <location line="+82"/>
+        <source>New Terrain</source>
+        <translation>Ny terräng</translation>
+    </message>
+    <message>
+        <location line="+89"/>
+        <source>New Wang Set</source>
+        <translation>Ny Wang-uppsättning</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TilesetParametersEdit</name>
+    <message>
+        <location filename="../src/tiled/tilesetparametersedit.cpp" line="+48"/>
+        <source>Edit...</source>
+        <translation>Redigera...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TilesetView</name>
+    <message>
+        <location filename="../src/tiled/tilesetview.cpp" line="+1210"/>
+        <source>Add Terrain Type</source>
+        <translation>Lägg till terrängtyp</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Terrain Image</source>
+        <translation>Ange terrängbild</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Set Wang Set Image</source>
+        <translation>Ange Wang-uppsättningsbild</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Set Wang Color Image</source>
+        <translation>Ange Wang-färgbild</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>Tile &amp;Properties...</source>
+        <translation>Rut&amp;egenskaper...</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>&amp;Swap Tiles</source>
+        <translation>&amp;Byt rutor</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Show &amp;Grid</source>
+        <translation>Visa &amp;rutnät</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TmxMapFormat</name>
+    <message>
+        <location filename="../src/tiled/tmxmapformat.h" line="+66"/>
+        <source>Tiled map files (*.tmx *.xml)</source>
+        <translation>Tiled-kartfiler (*.tmx *.xml)</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::TsxTilesetFormat</name>
+    <message>
+        <location line="+28"/>
+        <source>Tiled tileset files (*.tsx *.xml)</source>
+        <translation>Tiled-rutuppsättningsfiler (*.tsx *.xml)</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::UndoDock</name>
+    <message>
+        <location filename="../src/tiled/undodock.cpp" line="+69"/>
+        <source>History</source>
+        <translation>Historik</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>&lt;empty&gt;</source>
+        <translation>&lt;tom&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::VariantPropertyManager</name>
+    <message>
+        <location filename="../src/tiled/variantpropertymanager.cpp" line="+169"/>
+        <source>%1, %2</source>
+        <translation>%1, %2</translation>
+    </message>
+    <message>
+        <location line="+126"/>
+        <source>Horizontal</source>
+        <translation>Horisontal</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Vertical</source>
+        <translation>Vertikal</translation>
+    </message>
+    <message>
+        <location line="+114"/>
+        <location line="+6"/>
+        <source>Left</source>
+        <translation>Vänster</translation>
+    </message>
+    <message>
+        <location line="-5"/>
+        <location line="+12"/>
+        <location line="+4"/>
+        <source>Center</source>
+        <translation>Mitten</translation>
+    </message>
+    <message>
+        <location line="-15"/>
+        <source>Right</source>
+        <translation>Höger</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Justify</source>
+        <translation>Justera</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Top</source>
+        <translation>Överkant</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Bottom</source>
+        <translation>Nederkant</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::WangBrush</name>
+    <message>
+        <location filename="../src/tiled/wangbrush.cpp" line="+108"/>
+        <location line="+65"/>
+        <source>Wang Brush</source>
+        <translation>Wangpensel</translation>
+    </message>
+    <message>
+        <location line="-62"/>
+        <location line="+63"/>
+        <source>G</source>
+        <translation>G</translation>
+    </message>
+    <message>
+        <location line="+152"/>
+        <source>Missing Wang tile transition</source>
+        <translation>Övergång för Wang-ruta saknas</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::WangColorModel</name>
+    <message>
+        <location filename="../src/tiled/wangcolormodel.cpp" line="+144"/>
+        <source>Edge Colors</source>
+        <translation>Kantfärger</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Corner Colors</source>
+        <translation>Hörnfärger</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::WangColorView</name>
+    <message>
+        <location filename="../src/tiled/wangcolorview.cpp" line="+184"/>
+        <source>Pick Custom Color</source>
+        <translation>Välj anpassad färg</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::WangDock</name>
+    <message>
+        <location filename="../src/tiled/wangdock.cpp" line="+227"/>
+        <location line="+327"/>
+        <source>Patterns</source>
+        <translation>Mönster</translation>
+    </message>
+    <message>
+        <location line="-326"/>
+        <location line="+327"/>
+        <source>Colors</source>
+        <translation>Färger</translation>
+    </message>
+    <message>
+        <location line="-10"/>
+        <source>Wang Sets</source>
+        <translation>Wang-uppsättningar</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Erase WangIds</source>
+        <translation>Radera Wang-ID:n</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Wang Set</source>
+        <translation>Lägg till Wang-uppsättning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Wang Set</source>
+        <translation>Ta bort Wang-uppsättning</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Edge Color</source>
+        <translation>Lägg till kantfärg</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Add Corner Color</source>
+        <translation>Lägg till hörnfärg</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Remove Color</source>
+        <translation>Ta bort färg</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::WangSetView</name>
+    <message>
+        <location filename="../src/tiled/wangsetview.cpp" line="+105"/>
+        <source>Wang Set &amp;Properties...</source>
+        <translation>&amp;Egenskaper för Wang-uppsättning...</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::Internal::XmlObjectTemplateFormat</name>
+    <message>
+        <location filename="../src/tiled/tmxmapformat.h" line="+27"/>
+        <source>Tiled template files (*.tx)</source>
+        <translation>Tiled-mallfiler (*.tx)</translation>
+    </message>
+</context>
+<context>
+    <name>Tiled::WorldManager</name>
+    <message>
+        <location filename="../src/libtiled/worldmanager.cpp" line="+109"/>
+        <source>Could not open file for reading.</source>
+        <translation>Kunde inte öppna fil för läsning.</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>JSON parse error at offset %1:
+%2.</source>
+        <translation>JSON-tolkningsfel vid förskjutning %1:
+%2.</translation>
+    </message>
+</context>
+<context>
+    <name>TmxViewer</name>
+    <message>
+        <location filename="../src/tmxviewer/tmxviewer.cpp" line="+180"/>
+        <source>TMX Viewer</source>
+        <translation>TMX-visare</translation>
+    </message>
+</context>
+<context>
+    <name>Undo Commands</name>
+    <message>
+        <location filename="../src/tiled/addremovelayer.cpp" line="+66"/>
+        <source>Add Layer</source>
+        <translation>Lägg till lager</translation>
+    </message>
+    <message>
+        <location line="+17"/>
+        <source>Remove Layer</source>
+        <translation>Ta bort lager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/addremovemapobject.cpp" line="+84"/>
+        <source>Add Object</source>
+        <translation>Lägg till objekt</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Add Objects</source>
+        <translation>Lägg till objekt</translation>
+    </message>
+    <message>
+        <location line="+40"/>
+        <source>Remove Object</source>
+        <translation>Ta bort objekt</translation>
+    </message>
+    <message>
+        <location line="+11"/>
+        <source>Remove Objects</source>
+        <translation>Ta bort objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/addremovetileset.cpp" line="+62"/>
+        <source>Add Tileset</source>
+        <translation>Lägg till rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+16"/>
+        <source>Remove Tileset</source>
+        <translation>Ta bort rutuppsättning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changemapobject.cpp" line="+38"/>
+        <source>Change Object</source>
+        <translation>Ändra objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changeobjectgroupproperties.cpp" line="+39"/>
+        <source>Change Object Layer Properties</source>
+        <translation>Ändra egenskaper för objektlager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changeproperties.cpp" line="+41"/>
+        <source>Change Properties</source>
+        <translation>Ändra egenskaper</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Change %1 Properties</source>
+        <translation>Ändra %1 egenskaper</translation>
+    </message>
+    <message>
+        <location line="+42"/>
+        <source>Set Property</source>
+        <translation>Ange egenskap</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Add Property</source>
+        <translation>Lägg till egenskap</translation>
+    </message>
+    <message>
+        <location line="+33"/>
+        <source>Remove Property</source>
+        <translation>Ta bort egenskap</translation>
+    </message>
+    <message>
+        <location line="+22"/>
+        <source>Rename Property</source>
+        <translation>Byt namn på egenskap</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changeselectedarea.cpp" line="+32"/>
+        <source>Change Selection</source>
+        <translation>Ändra markering</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/erasetiles.cpp" line="+37"/>
+        <source>Erase</source>
+        <translation>Suddgummi</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/bucketfilltool.cpp" line="-17"/>
+        <source>Fill Area</source>
+        <translation>Fyll område</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/movemapobject.cpp" line="+42"/>
+        <location line="+14"/>
+        <source>Move Object</source>
+        <translation>Flytta objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/movemapobjecttogroup.cpp" line="+42"/>
+        <source>Move Object to Layer</source>
+        <translation>Flytta objekt till lager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/offsetlayer.cpp" line="+52"/>
+        <source>Offset Layer</source>
+        <translation>Förskjutningslager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/painttilelayer.cpp" line="+69"/>
+        <source>Paint</source>
+        <translation>Färglägg</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/renamelayer.cpp" line="+40"/>
+        <source>Rename Layer</source>
+        <translation>Byt namn på lager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/resizetilelayer.cpp" line="+38"/>
+        <source>Resize Layer</source>
+        <translation>Ändra storlek på lager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/resizemap.cpp" line="+34"/>
+        <source>Resize Map</source>
+        <translation>Ändra storlek på karta</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/resizemapobject.cpp" line="+41"/>
+        <location line="+13"/>
+        <source>Resize Object</source>
+        <translation>Ändra storlek på objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/tilesetchanges.cpp" line="+34"/>
+        <source>Change Tileset Name</source>
+        <translation>Ändra namn på rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Change Drawing Offset</source>
+        <translation>Ändra ritningsförskjutning</translation>
+    </message>
+    <message>
+        <location line="+48"/>
+        <source>Edit Tileset</source>
+        <translation>Redigera rutuppsättning</translation>
+    </message>
+    <message>
+        <location line="+36"/>
+        <source>Change Columns</source>
+        <translation>Ändra kolumner</translation>
+    </message>
+    <message>
+        <location line="+59"/>
+        <source>Change Grid Size</source>
+        <translation>Ändra rutnätsstorlek</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/movelayer.cpp" line="+42"/>
+        <source>Lower Layer</source>
+        <translation>Sänk lager</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Raise Layer</source>
+        <translation>Höj lager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changepolygon.cpp" line="+42"/>
+        <location line="+13"/>
+        <source>Change Polygon</source>
+        <translation>Ändra polygon</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Toggle Polygon/Polyline</source>
+        <translation>Växla mellan polygon/polylinje</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Split Polyline</source>
+        <translation>Dela upp polylinje</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/addremoveterrain.cpp" line="+67"/>
+        <source>Add Terrain</source>
+        <translation>Lägg till terräng</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Remove Terrain</source>
+        <translation>Ta bort terräng</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changeimagelayerproperties.cpp" line="+39"/>
+        <source>Change Image Layer Properties</source>
+        <translation>Ändra egenskaper för bildlager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetileterrain.cpp" line="+139"/>
+        <source>Change Tile Terrain</source>
+        <translation>Ändra rutterräng</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/tileseteditor.cpp" line="-885"/>
+        <source>Change Terrain Image</source>
+        <translation>Ändra terrängbild</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changelayer.cpp" line="+41"/>
+        <source>Show Layer</source>
+        <translation>Visa lager</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Hide Layer</source>
+        <translation>Dölj lager</translation>
+    </message>
+    <message>
+        <location line="+19"/>
+        <source>Lock Layer</source>
+        <translation>Lås lager</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Unlock Layer</source>
+        <translation>Lås upp lager</translation>
+    </message>
+    <message>
+        <location line="+20"/>
+        <source>Change Layer Opacity</source>
+        <translation>Ändra lageropacitet</translation>
+    </message>
+    <message>
+        <location line="+31"/>
+        <source>Change Layer Offset</source>
+        <translation>Ändra lagerförskjutning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changemapobject.cpp" line="+12"/>
+        <source>Show Object</source>
+        <translation>Visa objekt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Hide Object</source>
+        <translation>Dölj objekt</translation>
+    </message>
+    <message numerus="yes">
+        <location line="+59"/>
+        <source>Change %n Object/s Tile</source>
+        <translation>
+            <numerusform>Ändra %n objektruta</numerusform>
+            <numerusform>Ändra %n objektruta</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+65"/>
+        <source>Detach %n Template Instance(s)</source>
+        <translation>
+            <numerusform>Frigör %n mallinstans(er)</numerusform>
+            <numerusform>Frigör %n mallinstanser</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+39"/>
+        <source>Reset %n Instances</source>
+        <translation>
+            <numerusform>Återställ %n instanser</numerusform>
+            <numerusform>Återställ %n instanser</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+46"/>
+        <source>Replace %n Object(s) With Template</source>
+        <translation>
+            <numerusform>Ersätt %n objekt med mall</numerusform>
+            <numerusform>Ersätt %n objekt med mall</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/renameterrain.cpp" line="+36"/>
+        <source>Change Terrain Name</source>
+        <translation>Ändra terrängnamn</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/addremovetiles.cpp" line="+63"/>
+        <source>Add Tiles</source>
+        <translation>Lägg till rutor</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <location filename="../src/tiled/tileseteditor.cpp" line="+645"/>
+        <source>Remove Tiles</source>
+        <translation>Ta bort rutor</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changeimagelayerposition.cpp" line="+36"/>
+        <source>Change Image Layer Position</source>
+        <translation>Ändra position för bildlager</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changemapobjectsorder.cpp" line="+46"/>
+        <location filename="../src/tiled/raiselowerhelper.cpp" line="+69"/>
+        <source>Raise Object</source>
+        <translation>Höj objekt</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <location filename="../src/tiled/raiselowerhelper.cpp" line="+29"/>
+        <source>Lower Object</source>
+        <translation>Sänk objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetileanimation.cpp" line="+35"/>
+        <source>Change Tile Animation</source>
+        <translation>Ändra rutanimering</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetileobjectgroup.cpp" line="+36"/>
+        <source>Change Tile Collision</source>
+        <translation>Ändra rutkollision</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/raiselowerhelper.cpp" line="+43"/>
+        <source>Raise Object To Top</source>
+        <translation>Placera objektet längst upp</translation>
+    </message>
+    <message>
+        <location line="+37"/>
+        <source>Lower Object To Bottom</source>
+        <translation>Placera objektet längst ned</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/rotatemapobject.cpp" line="+41"/>
+        <location line="+13"/>
+        <source>Rotate Object</source>
+        <translation>Rotera objekt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changemapproperty.cpp" line="+42"/>
+        <source>Change Tile Width</source>
+        <translation>Ändra rutbredd</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Change Tile Height</source>
+        <translation>Ändra ruthöjd</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Change Infinite Property</source>
+        <translation>Ändra oändlighetsegenskap</translation>
+    </message>
+    <message>
+        <location line="+4"/>
+        <source>Change Hex Side Length</source>
+        <translation>Ändra sidlängd i hex</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/tiled/tilesetchanges.cpp" line="-40"/>
+        <source>Change Background Color</source>
+        <translation>Ändra bakgrundsfärg</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Change Stagger Axis</source>
+        <translation>Ändra rombaxel</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Change Stagger Index</source>
+        <translation>Ändra rombindex</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <location filename="../src/tiled/tilesetchanges.cpp" line="+20"/>
+        <source>Change Orientation</source>
+        <translation>Ändra orientering</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Change Render Order</source>
+        <translation>Ändra renderingsordning</translation>
+    </message>
+    <message>
+        <location line="+10"/>
+        <source>Change Layer Data Format</source>
+        <translation>Ändra lagerdataformat</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetileprobability.cpp" line="+41"/>
+        <location line="+14"/>
+        <source>Change Tile Probability</source>
+        <translation>Ändra rutsannolikhet</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/adjusttileindexes.cpp" line="-139"/>
+        <location line="+92"/>
+        <source>Adjust Tile Indexes</source>
+        <translation>Justera rutindex</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetileimagesource.cpp" line="+40"/>
+        <source>Change Tile Image</source>
+        <translation>Ändra rutbild</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/replacetileset.cpp" line="+34"/>
+        <source>Replace Tileset</source>
+        <translation>Ersätt rutuppsättning</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/tiled/flipmapobjects.cpp" line="+40"/>
+        <location filename="../src/tiled/propertybrowser.cpp" line="+197"/>
+        <source>Flip %n Object(s)</source>
+        <translation>
+            <numerusform>Vänd %n objekt</numerusform>
+            <numerusform>Vänd %n objekt</numerusform>
+        </translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetile.cpp" line="+34"/>
+        <source>Change Tile Type</source>
+        <translation>Ändra ruttyp</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/swaptiles.cpp" line="+37"/>
+        <source>Swap Tiles</source>
+        <translation>Byt rutor</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/tilesetdocument.cpp" line="-153"/>
+        <source>Reload Tileset</source>
+        <translation>Uppdatera rutuppsättning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/addremovewangset.cpp" line="+65"/>
+        <source>Add Wang Set</source>
+        <translation>Lägg till Wang-uppsättning</translation>
+    </message>
+    <message>
+        <location line="+8"/>
+        <source>Remove Wang Set</source>
+        <translation>Ta bort Wang-uppsättning</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changetilewangid.cpp" line="+36"/>
+        <location line="+12"/>
+        <location line="+14"/>
+        <source>Change Tile WangId</source>
+        <translation>Ändra Wang-ID för ruta</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/changewangsetdata.cpp" line="+38"/>
+        <source>Change Wang Set edge count</source>
+        <translation>Ändra Wang-uppsättningens kantantal</translation>
+    </message>
+    <message>
+        <location line="+66"/>
+        <source>Change Wang Set corner count</source>
+        <translation>Ändra Wang-uppsättningens hörnantal</translation>
+    </message>
+    <message>
+        <location line="+63"/>
+        <source>Remove Wang Color</source>
+        <translation>Ta bort Wang-färg</translation>
+    </message>
+    <message>
+        <location line="+90"/>
+        <source>Set Wang Set Image</source>
+        <translation>Ange Wang-uppsättningsbild</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/moveterrain.cpp" line="+61"/>
+        <source>Move Terrain Up</source>
+        <translation>Flytta terräng uppåt</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Move Terrain Down</source>
+        <translation>Flytta terräng nedåt</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/renamewangset.cpp" line="+35"/>
+        <source>Change Wang Set Name</source>
+        <translation>Ändra Wang-uppsättningens namn</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/replacetemplate.cpp" line="+35"/>
+        <source>Replace Template</source>
+        <translation>Ersätt mall</translation>
+    </message>
+    <message>
+        <location filename="../src/tiled/shapefilltool.cpp" line="-20"/>
+        <source>Shape Fill</source>
+        <translation>Fyll form</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/tiled/mapdocument.cpp" line="-683"/>
+        <source>Raise %n Layer(s)</source>
+        <translation>
+            <numerusform>Höj %n lager</numerusform>
+            <numerusform>Höj %n lager</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location line="+27"/>
+        <source>Lower %n Layer(s)</source>
+        <translation>
+            <numerusform>Sänk %n lager</numerusform>
+            <numerusform>Sänk %n lager</numerusform>
+        </translation>
+    </message>
+</context>
+<context>
+    <name>Utils</name>
+    <message>
+        <location filename="../src/tiled/utils.cpp" line="+43"/>
+        <source>Image files</source>
+        <translation>Bildfiler</translation>
+    </message>
+    <message>
+        <location line="+223"/>
+        <source>Copy File Path</source>
+        <translation>Kopiera filsökväg</translation>
+    </message>
+    <message>
+        <location line="+6"/>
+        <source>Open Containing Folder...</source>
+        <translation>Öppna innehållande mapp...</translation>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <location filename="../src/tmxrasterizer/main.cpp" line="+52"/>
+        <source>Renders a Tiled map (TMX format) to an image.</source>
+        <translation>Renderar en Tiled-karta (TMX-format) till en bild.</translation>
+    </message>
+    <message>
+        <location line="+5"/>
+        <source>The scale of the output image (default: 1).</source>
+        <translation>Skalan för utdatabilden (standard: 1).</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>scale</source>
+        <translation>skala</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>The requested size in pixels at which a tile is rendered (overrides the --scale option).</source>
+        <translation>Den begärda storleken i bildpunkter där en ruta renderas (överskrider alternativet --scale).</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <location line="+3"/>
+        <source>size</source>
+        <translation>storlek</translation>
+    </message>
+    <message>
+        <location line="-1"/>
+        <source>The output image fits within a SIZE x SIZE square (overrides the --scale and --tilesize options).</source>
+        <translation>Utdatabilden passar inom ett fyrkant på SIZE x SIZE (överskrider alternativen --scale och --tilesize).</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Antialias edges of primitives.</source>
+        <translation>Jämna ut kanter på primitiver.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Use nearest neighbour instead of smooth blending of pixels.</source>
+        <translation>Använd närmaste granne istället för mjuk bildpunktsblandning.</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Ignore all layer visibility flags in the map file, and render all layers in the output (default is to omit invisible layers).</source>
+        <translation>Ignorera alla synlighetsflaggor för lager i kartfilen och rendera alla lager i utdata (standard är att utelämna osynliga lager).</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Specifies a layer to omit from the output image. Can be repeated to hide multiple layers.</source>
+        <translation>Specificerar ett lager att utelämna från utdatabilden. Kan upprepas för att dölja flera lager.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>name</source>
+        <translation>namn</translation>
+    </message>
+    <message>
+        <location line="+2"/>
+        <source>Map file to render.</source>
+        <translation>Kartfil att rendera.</translation>
+    </message>
+    <message>
+        <location line="+1"/>
+        <source>Image file to output.</source>
+        <translation>Bildfil att mata ut.</translation>
+    </message>
+    <message>
+        <location line="+23"/>
+        <source>Invalid size specified: &quot;%1&quot;</source>
+        <translation>Ogiltig storlek angavs: &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Invalid tile size specified: &quot;%1&quot;</source>
+        <translation>Ogiltig rutstorlek angavs: &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location line="+9"/>
+        <source>Invalid scale specified: &quot;%1&quot;</source>
+        <translation>Ogiltig skala angavs: &quot;%1&quot;</translation>
+    </message>
+    <message>
+        <location filename="../src/tmxviewer/main.cpp" line="+57"/>
+        <source>Displays a Tiled map (TMX format).</source>
+        <translation>Visar en Tiled-karta (TMX-format).</translation>
+    </message>
+    <message>
+        <location line="+3"/>
+        <source>Map file to display.</source>
+        <translation>Kartfil att visa.</translation>
+    </message>
+</context>
+</TS>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_tr.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_tr.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_tr.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_tr.ts	2019-05-15 15:33:52.000000000 +0000
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Json harita dosyaları (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>JSON harita dosyaları (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,7 +495,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation>json şablon dosyaları (*.json)</translation>
     </message>
 </context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Json desen seti dosyaları (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>JSON desen seti dosyaları (*.json)</translation>
     </message>
 </context>
 <context>
@@ -5487,7 +5487,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation>Eksik Wang desen geçişi</translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_uk.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_uk.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_uk.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_uk.ts	2019-05-15 15:33:52.000000000 +0000
@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/tiled/main.cpp" line="+359"/>
         <source>Export syntax is --export-map [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>Синтаксис команди експорту: --export-map [формат] &lt;джерело&gt; &lt;призначення&gt;</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -85,12 +85,12 @@
     <message>
         <location line="+22"/>
         <source>Failed to load source tileset.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не вдалося завантажити джерельний набір плиток.</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to export tileset to target file.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не вдалося експортувати набір плиток до файлу призначення.</translation>
     </message>
 </context>
 <context>
@@ -139,7 +139,7 @@
     <message>
         <location line="+17"/>
         <source>Show output in Debug Console</source>
-        <translation type="unfinished"></translation>
+        <translation>Показати вивід в консоль зневадження</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -167,22 +167,22 @@
     <message>
         <location line="+5"/>
         <source>Export the specified map file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>Експорт вказаної карти до файлу призначення</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the specified tileset file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>Експорт вказаного набору плиток до файлу призначення</translation>
     </message>
     <message>
         <location line="+84"/>
         <source>Map export formats:</source>
-        <translation type="unfinished"></translation>
+        <translation>Формат експорту карти:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Tileset export formats:</source>
-        <translation type="unfinished"></translation>
+        <translation>Формат експорту набору плиток:</translation>
     </message>
     <message>
         <location line="-90"/>
@@ -192,7 +192,7 @@
     <message>
         <location line="+5"/>
         <source>Export the map with tilesets embedded</source>
-        <translation type="unfinished"></translation>
+        <translation>Експорт карти з вбудованим набором плиток</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -460,8 +460,8 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
-        <translation>Файли карт Json (*.json)</translation>
+        <source>JSON map files (*.json)</source>
+        <translation>Файли карт JSON (*.json)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -495,8 +495,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation>Файли шаблонів Json (*.json)</translation>
+        <source>JSON template files (*.json)</source>
+        <translation>Файли шаблонів JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -525,8 +525,8 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
-        <translation>Файли набору плиток Json (*.json)</translation>
+        <source>JSON tileset files (*.json)</source>
+        <translation>Файли набору плиток JSON (*.json)</translation>
     </message>
 </context>
 <context>
@@ -665,7 +665,7 @@
     <message>
         <location line="+3"/>
         <source>Ctrl+Alt+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -715,7 +715,7 @@
     <message>
         <location line="+5"/>
         <source>Load World...</source>
-        <translation type="unfinished"></translation>
+        <translation>Завантажити світ...</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -910,7 +910,7 @@
     <message>
         <location line="+24"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -1208,7 +1208,7 @@
     <message>
         <location line="+60"/>
         <source>Embed in map</source>
-        <translation>Вбудувати до карти</translation>
+        <translation>Вбудувати в карту</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -1395,7 +1395,7 @@
     <message>
         <location line="+5"/>
         <source>Selected Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>Обрані прошарки</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1559,7 +1559,7 @@
     <message>
         <location line="+10"/>
         <source>Export Options</source>
-        <translation type="unfinished"></translation>
+        <translation>Параметри експорту</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -2383,17 +2383,17 @@
     <message>
         <location line="+11"/>
         <source>Frame Duration: </source>
-        <translation type="unfinished"></translation>
+        <translation>Тривалість кадру: </translation>
     </message>
     <message>
         <location line="+7"/>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation> мс</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>Застосувати</translation>
     </message>
     <message>
         <location line="+98"/>
@@ -3006,7 +3006,7 @@
     <message>
         <location line="+1"/>
         <source>I</source>
-        <translation type="unfinished">I</translation>
+        <translation>I</translation>
     </message>
 </context>
 <context>
@@ -3055,7 +3055,7 @@
     <message>
         <location line="+1"/>
         <source>V</source>
-        <translation type="unfinished">V</translation>
+        <translation>V</translation>
     </message>
 </context>
 <context>
@@ -3094,7 +3094,7 @@
     <message>
         <location filename="../src/tiled/documentmanager.cpp" line="+461"/>
         <source>Unrecognized file format.</source>
-        <translation type="unfinished">Невідомий формат файлу.</translation>
+        <translation>Невідомий формат файлу.</translation>
     </message>
     <message>
         <location line="+257"/>
@@ -3867,7 +3867,7 @@
     <message>
         <location line="+5"/>
         <source>Ctrl+Shift+L</source>
-        <translation type="unfinished">Ctrl+Shift+L</translation>
+        <translation>Ctrl+Shift+L</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -4478,7 +4478,7 @@
     <message>
         <location line="+1"/>
         <source>Thanks a lot for your support! With your help Tiled will keep getting better.</source>
-        <translation type="unfinished"></translation>
+        <translation>Дякуємо Вам за підтримку! З Вашою допомогою Tiled стає кращим.</translation>
     </message>
 </context>
 <context>
@@ -4516,12 +4516,10 @@
     <message numerus="yes">
         <location line="-252"/>
         <source>Paste Property/Properties</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
+        <translation><numerusform>Вставити властивість</numerusform>
+        <numerusform>Вставити властивості</numerusform>
+        <numerusform>Вставити властивості</numerusform>
+        </translation></message>
     <message numerus="yes">
         <location line="+50"/>
         <source>Remove Property/Properties</source>
@@ -4778,7 +4776,7 @@
     <message>
         <location line="+56"/>
         <source>Template</source>
-        <translation type="unfinished">Шаблон</translation>
+        <translation>Шаблон</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -4798,7 +4796,7 @@
     <message>
         <location line="+1"/>
         <source>Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>Вирівнювання</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4873,7 +4871,7 @@
     <message>
         <location line="-59"/>
         <source>Group Layer</source>
-        <translation type="unfinished">Група прошарків</translation>
+        <translation>Група прошарків</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -4893,12 +4891,12 @@
     <message>
         <location line="+14"/>
         <source>Grid Width</source>
-        <translation type="unfinished"></translation>
+        <translation>Ширина сітки</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Grid Height</source>
-        <translation type="unfinished"></translation>
+        <translation>Висота сітки</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -5008,13 +5006,13 @@
         <location filename="../src/tiled/abstractobjecttool.cpp" line="-125"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Обертати ліворуч</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Обертати праворуч</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5061,7 +5059,7 @@
     <message>
         <location filename="../src/tiled/templatesdock.cpp" line="+293"/>
         <source>Open Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>Відкрити набір плиток</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5082,12 +5080,12 @@
     <message>
         <location line="+24"/>
         <source>Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>Шаблони</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Choose Templates Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>Оберіть теку шаблонів</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -5271,7 +5269,7 @@
     <message>
         <location line="+1"/>
         <source>Delete Selected</source>
-        <translation type="unfinished"></translation>
+        <translation>Видалити обране</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -5314,12 +5312,12 @@
     <message>
         <location line="+1"/>
         <source>&amp;Embed Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;Вбудований набір плиток</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Edit Tile&amp;set</source>
-        <translation type="unfinished"></translation>
+        <translation>Редагувати набір плиток</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -5376,22 +5374,22 @@
     <message>
         <location line="-188"/>
         <source>Tile Animation Editor</source>
-        <translation type="unfinished">Редактор плиткової анімації</translation>
+        <translation>Редактор плиток анімації</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Apply this action to all tiles</source>
-        <translation type="unfinished"></translation>
+        <translation>Застосувати дану дію до всіх плиток</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Tile &quot;%1&quot; already exists in the tileset!</source>
-        <translation type="unfinished"></translation>
+        <translation>Плитка «%1» вже є в даному наборі!</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>Все одно додати?</translation>
     </message>
     <message>
         <location line="+15"/>
@@ -5401,7 +5399,7 @@
     <message>
         <location line="+118"/>
         <source>Tiles to be removed are in use by open maps!</source>
-        <translation type="unfinished"></translation>
+        <translation>Плитки що видаляються використовуються в одній з відкрити карт!</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -5515,34 +5513,34 @@
         <location line="+114"/>
         <location line="+6"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Ліворуч</translation>
     </message>
     <message>
         <location line="-5"/>
         <location line="+12"/>
         <location line="+4"/>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>Центр</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Праворуч</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Justify</source>
-        <translation type="unfinished"></translation>
+        <translation>Вирівнювання</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>Зверху</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>Знизу</translation>
     </message>
 </context>
 <context>
@@ -5557,11 +5555,11 @@
         <location line="-62"/>
         <location line="+63"/>
         <source>G</source>
-        <translation type="unfinished"></translation>
+        <translation>G</translation>
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5598,7 +5596,7 @@
         <location line="-326"/>
         <location line="+327"/>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>Кольори</translation>
     </message>
     <message>
         <location line="-10"/>
@@ -5657,13 +5655,14 @@
     <message>
         <location filename="../src/libtiled/worldmanager.cpp" line="+109"/>
         <source>Could not open file for reading.</source>
-        <translation type="unfinished">Не вдалося відкрити файл для читання.</translation>
+        <translation>Не вдалося відкрити файл для читання.</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>JSON parse error at offset %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>Помилка розбору JSON на зсуві %1:
+%2.</translation>
     </message>
 </context>
 <context>
@@ -5694,7 +5693,7 @@
     <message>
         <location line="+11"/>
         <source>Add Objects</source>
-        <translation type="unfinished"></translation>
+        <translation>Додати об&apos;єкти</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -5704,7 +5703,7 @@
     <message>
         <location line="+11"/>
         <source>Remove Objects</source>
-        <translation type="unfinished">Видалити об&apos;єкти</translation>
+        <translation>Видалити об&apos;єкти</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremovetileset.cpp" line="+62"/>
@@ -5857,7 +5856,7 @@
     <message>
         <location line="+19"/>
         <source>Toggle Polygon/Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>Перемкнути полігон/полі-лінія</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -5902,12 +5901,12 @@
     <message>
         <location line="+19"/>
         <source>Lock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>Заблокувати прошарок</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unlock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>Розблокувати прошарок</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -6121,7 +6120,7 @@
     <message>
         <location filename="../src/tiled/tilesetdocument.cpp" line="-153"/>
         <source>Reload Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>Перезавантажити набори плиток</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremovewangset.cpp" line="+65"/>
@@ -6237,7 +6236,7 @@
     <message>
         <location line="+1"/>
         <source>scale</source>
-        <translation type="unfinished"></translation>
+        <translation>масштаб</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -6248,7 +6247,7 @@
         <location line="+1"/>
         <location line="+3"/>
         <source>size</source>
-        <translation type="unfinished"></translation>
+        <translation>розмір</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -6278,7 +6277,7 @@
     <message>
         <location line="+1"/>
         <source>name</source>
-        <translation type="unfinished"></translation>
+        <translation>назва</translation>
     </message>
     <message>
         <location line="+2"/>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_zh_Hans.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_zh_Hans.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_zh_Hans.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_zh_Hans.ts	2019-05-15 15:33:52.000000000 +0000
@@ -398,7 +398,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -432,7 +432,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_zh.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_zh.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_zh.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_zh.ts	2019-05-15 15:33:52.000000000 +0000
@@ -50,7 +50,7 @@
     <message>
         <location filename="../src/tiled/main.cpp" line="+359"/>
         <source>Export syntax is --export-map [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>导出语法为 --export-map [文件格式] &lt;源文件&gt; &lt;目标文件&gt;</translation>
     </message>
     <message>
         <location line="-232"/>
@@ -80,17 +80,17 @@
     <message>
         <location line="+9"/>
         <source>Export syntax is --export-tileset [format] &lt;source&gt; &lt;target&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>导出语法为 --export-tileset [文件格式] &lt;源文件&gt; &lt;目标文件&gt;</translation>
     </message>
     <message>
         <location line="+22"/>
         <source>Failed to load source tileset.</source>
-        <translation type="unfinished"></translation>
+        <translation>载入源图块集失败。</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Failed to export tileset to target file.</source>
-        <translation type="unfinished"></translation>
+        <translation>导出图块集到目标文件失败。</translation>
     </message>
 </context>
 <context>
@@ -109,7 +109,7 @@
         <location line="+14"/>
         <location line="+74"/>
         <source>Browse...</source>
-        <translation type="unfinished">浏览...</translation>
+        <translation>浏览...</translation>
     </message>
     <message>
         <location line="-61"/>
@@ -129,17 +129,17 @@
     <message>
         <location line="+20"/>
         <source>Arguments:</source>
-        <translation type="unfinished"></translation>
+        <translation>参数:</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation type="unfinished"></translation>
+        <translation>工作目录:</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Show output in Debug Console</source>
-        <translation type="unfinished"></translation>
+        <translation>在调试窗口中输出执行结果</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -167,22 +167,22 @@
     <message>
         <location line="+5"/>
         <source>Export the specified map file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>导出指定地图为目标文件</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the specified tileset file to target</source>
-        <translation type="unfinished"></translation>
+        <translation>导出指定图块集到目标文件</translation>
     </message>
     <message>
         <location line="+84"/>
         <source>Map export formats:</source>
-        <translation type="unfinished"></translation>
+        <translation>地图导出格式:</translation>
     </message>
     <message>
         <location line="+11"/>
         <source>Tileset export formats:</source>
-        <translation type="unfinished"></translation>
+        <translation>图块集导出格式:</translation>
     </message>
     <message>
         <location line="-90"/>
@@ -192,17 +192,17 @@
     <message>
         <location line="+5"/>
         <source>Export the map with tilesets embedded</source>
-        <translation type="unfinished"></translation>
+        <translation>将图块集嵌入到导出的地图文件中</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with template instances detached</source>
-        <translation type="unfinished"></translation>
+        <translation>导出地图或图块集时分离模板实例</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Export the map or tileset with types and properties resolved</source>
-        <translation type="unfinished"></translation>
+        <translation>导出地图或图块集中的类型和属性</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -299,7 +299,7 @@
     <message>
         <location filename="../src/plugins/defold/defoldplugin.cpp" line="+83"/>
         <source>Defold files (*.tilemap)</source>
-        <translation>Defold图块文件 (*.tilemap)</translation>
+        <translation>展开图块文件 (*.tilemap)</translation>
     </message>
     <message>
         <location line="+51"/>
@@ -461,7 +461,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation>JSON 地图文件 (*.json)</translation>
     </message>
     <message>
@@ -475,29 +475,29 @@
     <message>
         <location line="+178"/>
         <source>Could not open file for reading.</source>
-        <translation type="unfinished">无法打开文件进行读取。</translation>
+        <translation>无法打开文件进行读取。</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Error parsing file.</source>
-        <translation type="unfinished"></translation>
+        <translation>解析文件时发生错误。</translation>
     </message>
     <message>
         <location line="+37"/>
         <source>Could not open file for writing.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Error while writing file:
 %1</source>
-        <translation type="unfinished">写入文件发生错误：
+        <translation>写入文件发生错误：
 %1</translation>
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
-        <translation type="unfinished"></translation>
+        <source>JSON template files (*.json)</source>
+        <translation>JSON 模板文件 (*.json)</translation>
     </message>
 </context>
 <context>
@@ -526,7 +526,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation>JSON 地形文件 (*.json)</translation>
     </message>
 </context>
@@ -535,12 +535,12 @@
     <message>
         <location filename="../src/plugins/lua/luaplugin.cpp" line="+103"/>
         <source>Could not open file for writing.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Lua files (*.lua)</source>
-        <translation type="unfinished">Lua 文件 (*.lua)</translation>
+        <translation>Lua 文件 (*.lua)</translation>
     </message>
 </context>
 <context>
@@ -548,12 +548,12 @@
     <message>
         <location line="+18"/>
         <source>Could not open file for writing.</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Lua files (*.lua)</source>
-        <translation type="unfinished">Lua 文件 (*.lua)</translation>
+        <translation>Lua 文件 (*.lua)</translation>
     </message>
 </context>
 <context>
@@ -736,7 +736,7 @@
     <message>
         <location line="-346"/>
         <source>&amp;New</source>
-        <translation type="unfinished">新建</translation>
+        <translation>新建</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -746,7 +746,7 @@
     <message>
         <location line="+49"/>
         <source>Unload World</source>
-        <translation type="unfinished"></translation>
+        <translation>卸载世界</translation>
     </message>
     <message>
         <location line="+32"/>
@@ -756,7 +756,7 @@
     <message>
         <location line="+25"/>
         <source>Tileset</source>
-        <translation>Tile集</translation>
+        <translation>图块集</translation>
     </message>
     <message>
         <location line="+100"/>
@@ -766,7 +766,7 @@
     <message>
         <location line="+31"/>
         <source>Ctrl+Alt+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Alt+S</translation>
     </message>
     <message>
         <location line="+52"/>
@@ -796,7 +796,7 @@
     <message>
         <location line="+3"/>
         <source>Ctrl+Shift+W</source>
-        <translation></translation>
+        <translation>Ctrl+Shift+W</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -816,7 +816,7 @@
     <message>
         <location line="+3"/>
         <source>H</source>
-        <translation></translation>
+        <translation>H</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -841,7 +841,7 @@
     <message>
         <location line="+24"/>
         <source>Ctrl+Shift+S</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+S</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -866,32 +866,32 @@
     <message>
         <location line="+10"/>
         <source>Edit Commands...</source>
-        <translation type="unfinished">编辑命令...</translation>
+        <translation>编辑命令...</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Clear View</source>
-        <translation type="unfinished"></translation>
+        <translation>清空视图</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Tab</source>
-        <translation type="unfinished">Tab</translation>
+        <translation>Tab</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>For Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation>悬停对象</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Load World...</source>
-        <translation type="unfinished"></translation>
+        <translation>载入世界</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Highlight Hovered Object</source>
-        <translation type="unfinished"></translation>
+        <translation>悬停对象高亮</translation>
     </message>
     <message>
         <location line="-329"/>
@@ -977,17 +977,17 @@
     <message>
         <location filename="../src/libtiled/mapreader.cpp" line="+164"/>
         <source>Not a map file.</source>
-        <translation>该地图的文件不可用.</translation>
+        <translation>不是一个地图文件。</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Not a tileset file.</source>
-        <translation>不是一个图块集文件.</translation>
+        <translation>不是一个图块集文件。</translation>
     </message>
     <message>
         <location line="+17"/>
         <source>Not a template file.</source>
-        <translation type="unfinished"></translation>
+        <translation>不是一个模板文件。</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1001,7 +1001,7 @@
     <message>
         <location line="+10"/>
         <source>File not found: %1</source>
-        <translation>文件没有找到: %1</translation>
+        <translation>没有找到文件: %1</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1127,7 +1127,7 @@
     <message>
         <location line="-38"/>
         <source>Fixed</source>
-        <translation type="unfinished"></translation>
+        <translation>固定</translation>
     </message>
     <message>
         <location line="+54"/>
@@ -1138,7 +1138,7 @@
     <message>
         <location line="-42"/>
         <source>Infinite</source>
-        <translation type="unfinished"></translation>
+        <translation>无限</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1150,7 +1150,7 @@
         <location line="+26"/>
         <source> px</source>
         <extracomment>Remember starting with a space.</extracomment>
-        <translation> 像素点</translation>
+        <translation> 像素</translation>
     </message>
     <message>
         <location line="-202"/>
@@ -1165,12 +1165,12 @@
     <message>
         <location line="+20"/>
         <source>Tile layer format:</source>
-        <translation>图块层格式：</translation>
+        <translation>图块层格式:</translation>
     </message>
     <message>
         <location line="+13"/>
         <source>Tile render order:</source>
-        <translation>图块渲染顺序：</translation>
+        <translation>图块渲染顺序:</translation>
     </message>
 </context>
 <context>
@@ -1179,12 +1179,12 @@
         <location filename="../src/tiled/newtilesetdialog.ui" line="+14"/>
         <location filename="../src/tiled/newtilesetdialog.cpp" line="+269"/>
         <source>New Tileset</source>
-        <translation>新图块</translation>
+        <translation>新图块集</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Tileset</source>
-        <translation>图块</translation>
+        <translation>图块集</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -1238,7 +1238,7 @@
         <location line="+16"/>
         <source> px</source>
         <extracomment>Remember starting with a space.</extracomment>
-        <translation> 像素点</translation>
+        <translation> 像素</translation>
     </message>
     <message>
         <location line="-142"/>
@@ -1248,7 +1248,7 @@
     <message>
         <location line="+22"/>
         <source>Source:</source>
-        <translation>源：</translation>
+        <translation>源文件:</translation>
     </message>
     <message>
         <location line="+94"/>
@@ -1268,7 +1268,7 @@
     <message>
         <location line="+91"/>
         <source>The space between the tiles.</source>
-        <translation>Tile间距.</translation>
+        <translation>图块之间的距离.</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -1286,7 +1286,7 @@
     <message>
         <location filename="../src/tiled/tilesetdock.cpp" line="+85"/>
         <source>New Tileset...</source>
-        <translation type="unfinished">新建Tile集...</translation>
+        <translation>新建图块集...</translation>
     </message>
 </context>
 <context>
@@ -1294,12 +1294,12 @@
     <message>
         <location filename="../src/libtiled/objecttypes.cpp" line="+251"/>
         <source>Could not open file for writing.</source>
-        <translation>文件不可写.</translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+33"/>
         <source>Could not open file.</source>
-        <translation>不能打开文件.</translation>
+        <translation>无法打开文件。</translation>
     </message>
     <message>
         <location line="-89"/>
@@ -1396,7 +1396,7 @@
     <message>
         <location line="+5"/>
         <source>Selected Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>被选中的图层</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -1560,22 +1560,22 @@
     <message>
         <location line="+10"/>
         <source>Export Options</source>
-        <translation type="unfinished"></translation>
+        <translation>导出选项</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Resolve object types and properties</source>
-        <translation type="unfinished"></translation>
+        <translation>识别对象类型和属性</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Detach templates</source>
-        <translation type="unfinished"></translation>
+        <translation>分离模板</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Embed tilesets</source>
-        <translation type="unfinished"></translation>
+        <translation>嵌入图块集</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -1585,7 +1585,7 @@
     <message>
         <location line="+46"/>
         <source>Fine grid divisions:</source>
-        <translation>精细网格划分：</translation>
+        <translation>精细网格划分:</translation>
     </message>
     <message>
         <location line="-16"/>
@@ -1595,12 +1595,12 @@
     <message>
         <location line="-10"/>
         <source>Object line width:</source>
-        <translation>对象线宽：</translation>
+        <translation>对象线宽:</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Mouse wheel &amp;zooms by default</source>
-        <translation type="unfinished"></translation>
+        <translation>默认使用鼠标滚轮进行缩放</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -1622,17 +1622,17 @@
     <message>
         <location filename="../src/tiled/preferencesdialog.ui" line="+22"/>
         <source>Selection color:</source>
-        <translation>选中颜色：</translation>
+        <translation>选中颜色:</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Style:</source>
-        <translation>风格：</translation>
+        <translation>风格:</translation>
     </message>
     <message>
         <location line="+26"/>
         <source>Base color:</source>
-        <translation>基色：</translation>
+        <translation>基色:</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -1780,7 +1780,7 @@
     <message>
         <location line="+8"/>
         <source>Alpha</source>
-        <translation>Alpha</translation>
+        <translation>透明度</translation>
     </message>
 </context>
 <context>
@@ -1899,7 +1899,7 @@
     <message>
         <location filename="../src/qtpropertybrowser/src/qtpropertymanager.cpp" line="-362"/>
         <source>Family</source>
-        <translation>家族</translation>
+        <translation>字体系列</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -2275,47 +2275,47 @@
     <message>
         <location filename="../src/plugins/tbin/tbinplugin.cpp" line="+109"/>
         <source>Could not open file for reading.</source>
-        <translation type="unfinished">无法打开文件进行读取。</translation>
+        <translation>无法打开文件进行读取。</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Tilesheet must have equal spacings.</source>
-        <translation type="unfinished"></translation>
+        <translation>图集间应该有相同的空间距离。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Tilesheet must have equal margins.</source>
-        <translation type="unfinished"></translation>
+        <translation>图块间应该有相同的边距。</translation>
     </message>
     <message>
         <location line="+34"/>
         <source>Different tile sizes per layer are not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>不支持在层之间使用不同的图块大小。</translation>
     </message>
     <message>
         <location line="+21"/>
         <source>Invalid animation frame.</source>
-        <translation type="unfinished"></translation>
+        <translation>无效的动画帧</translation>
     </message>
     <message>
         <location line="+112"/>
         <source>Only object and tile layers supported.</source>
-        <translation type="unfinished"></translation>
+        <translation>仅支持对象层和图块层</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Could not open file for writing</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Exception: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>异常信息: %1</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Tbin map files (*.tbin)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tbin 地图文件 (*.tbin)</translation>
     </message>
 </context>
 <context>
@@ -2324,33 +2324,33 @@
         <location filename="../src/plugins/tbin/tbin/Map.cpp" line="+99"/>
         <location line="+23"/>
         <source>Bad property type</source>
-        <translation type="unfinished"></translation>
+        <translation>错误的属性类型</translation>
     </message>
     <message>
         <location line="+69"/>
         <location line="+68"/>
         <source>Bad layer tile data</source>
-        <translation type="unfinished"></translation>
+        <translation>错误的图层数据</translation>
     </message>
     <message>
         <location line="+72"/>
         <source>Failed to open file.</source>
-        <translation type="unfinished"></translation>
+        <translation>打开文件失败。</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>File is not a tbin file.</source>
-        <translation type="unfinished"></translation>
+        <translation>不是一个 Tbin 地图文件</translation>
     </message>
     <message>
         <location line="+35"/>
         <source>Failed to open file</source>
-        <translation type="unfinished"></translation>
+        <translation>无法打开文件</translation>
     </message>
     <message>
         <location filename="../src/plugins/tbin/tbinplugin.cpp" line="-255"/>
         <source>Unsupported property type</source>
-        <translation type="unfinished"></translation>
+        <translation>不支持的属性类型</translation>
     </message>
 </context>
 <context>
@@ -2358,7 +2358,7 @@
     <message>
         <location filename="../src/plugins/tengine/tengineplugin.cpp" line="+49"/>
         <source>Could not open file for writing.</source>
-        <translation>无法对文件进行读写.</translation>
+        <translation>无法打开文件进行写入。</translation>
     </message>
     <message>
         <location line="+244"/>
@@ -2384,17 +2384,17 @@
     <message>
         <location line="+11"/>
         <source>Frame Duration: </source>
-        <translation type="unfinished"></translation>
+        <translation>帧时长</translation>
     </message>
     <message>
         <location line="+7"/>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation>毫秒</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>Apply</source>
-        <translation type="unfinished"></translation>
+        <translation>应用</translation>
     </message>
     <message>
         <location line="+98"/>
@@ -2428,32 +2428,32 @@
     <message>
         <location line="+16"/>
         <source>Replace Tile</source>
-        <translation type="unfinished"></translation>
+        <translation>替换图块</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Replace With Template</source>
-        <translation type="unfinished"></translation>
+        <translation>替换为模板</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Replace With Template &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>替换为模板 &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Save As Template</source>
-        <translation type="unfinished"></translation>
+        <translation>保存为模板</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Detach</source>
-        <translation type="unfinished"></translation>
+        <translation>拆分</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Reset Template Instance(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>重置模板实例</translation>
     </message>
     <message>
         <location line="-334"/>
@@ -2480,12 +2480,12 @@
     <message>
         <location line="+5"/>
         <source>Raise Object</source>
-        <translation>提高对象</translation>
+        <translation>提升对象</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>PgUp</source>
-        <translation>PgUp</translation>
+        <translation>上一页</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2495,17 +2495,17 @@
     <message>
         <location line="+0"/>
         <source>PgDown</source>
-        <translation>PgDown</translation>
+        <translation>下一页</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Raise Object to Top</source>
-        <translation>提高对象到顶层</translation>
+        <translation>提升对象到顶层</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Home</source>
-        <translation>Home</translation>
+        <translation>首页</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2515,7 +2515,7 @@
     <message>
         <location line="+0"/>
         <source>End</source>
-        <translation>End</translation>
+        <translation>末尾</translation>
     </message>
     <message numerus="yes">
         <location line="+6"/>
@@ -2535,22 +2535,22 @@
     <message>
         <location filename="../src/tiled/abstracttileselectiontool.cpp" line="+137"/>
         <source>Replace Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>替换选中项</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>添加选中项</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Subtract Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>减去选中项</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Intersect Selection</source>
-        <translation type="unfinished"></translation>
+        <translation>插入选中项</translation>
     </message>
 </context>
 <context>
@@ -2587,13 +2587,13 @@
     <message>
         <location line="-25"/>
         <source>&apos;%1&apos;: Property &apos;%2&apos; = &apos;%3&apos; on layer &apos;%4&apos; does not make sense. Ignoring this property.</source>
-        <translation type="unfinished"></translation>
+        <translation>&apos;%1&apos;: 属性 &apos;%2&apos; = &apos;%3&apos; 在层 &apos;%4&apos; 中没有意义。忽略此属性。</translation>
     </message>
     <message>
         <location line="+31"/>
         <location line="+13"/>
         <source>&apos;regions_*&apos; layers must be tile layers.</source>
-        <translation>&apos;regions_*&apos; 层必须是层.</translation>
+        <translation>&apos;regions_*&apos; 层必须是图块图层.</translation>
     </message>
     <message>
         <location line="-6"/>
@@ -2618,12 +2618,12 @@
     <message>
         <location line="+3"/>
         <source>No input_&lt;name&gt; layer found!</source>
-        <translation>找不到 input_&lt;名称&gt; 图层！</translation>
+        <translation>找不到 input_&lt;name&gt; 图层！</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>No output_&lt;name&gt; layer found!</source>
-        <translation type="unfinished"></translation>
+        <translation>找不到 output_&lt;name&gt; 图层！</translation>
     </message>
 </context>
 <context>
@@ -2631,7 +2631,7 @@
     <message>
         <location filename="../src/tiled/automappingmanager.cpp" line="+122"/>
         <source>Apply AutoMap rules</source>
-        <translation>自动映射图层规则应用</translation>
+        <translation>应用自动映射规则</translation>
     </message>
     <message>
         <location line="+24"/>
@@ -2676,7 +2676,7 @@
     <message>
         <location line="+2"/>
         <source>Template tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>图块集模板</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -2686,7 +2686,7 @@
     <message>
         <location line="+2"/>
         <source>Template</source>
-        <translation type="unfinished"></translation>
+        <translation>模板</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -2709,7 +2709,7 @@
     <message>
         <location line="+97"/>
         <source>Some files could not be found</source>
-        <translation>一些文件无法打开</translation>
+        <translation>一些文件未找到</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -2726,12 +2726,12 @@
     <message>
         <location line="-5"/>
         <source>Open Template...</source>
-        <translation type="unfinished"></translation>
+        <translation>打开模板...</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Open Tileset...</source>
-        <translation>打开Tile集...</translation>
+        <translation>打开图块集...</translation>
     </message>
     <message>
         <location line="+31"/>
@@ -2742,7 +2742,7 @@
     <message>
         <location line="+50"/>
         <source>Locate Object Template</source>
-        <translation type="unfinished"></translation>
+        <translation>定位对象模板</translation>
     </message>
     <message>
         <location line="+25"/>
@@ -2752,7 +2752,7 @@
     <message>
         <location line="+48"/>
         <source>Error Reading Object Template</source>
-        <translation type="unfinished"></translation>
+        <translation>读取对象模板出错</translation>
     </message>
     <message>
         <location line="-89"/>
@@ -2783,7 +2783,7 @@
         <location line="-132"/>
         <location line="+133"/>
         <source>F</source>
-        <translation></translation>
+        <translation>F</translation>
     </message>
 </context>
 <context>
@@ -2916,7 +2916,7 @@
     <message>
         <location line="+10"/>
         <source>Select Working Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>设置工作目录</translation>
     </message>
 </context>
 <context>
@@ -2924,7 +2924,7 @@
     <message>
         <location filename="../src/tiled/commandmanager.cpp" line="+127"/>
         <source>Edit Commands...</source>
-        <translation type="unfinished">编辑命令...</translation>
+        <translation>编辑命令...</translation>
     </message>
 </context>
 <context>
@@ -2942,7 +2942,7 @@
     <message>
         <location line="+26"/>
         <source>Executing: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>执行: %1</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -2996,12 +2996,12 @@
     <message>
         <location filename="../src/tiled/createpointobjecttool.cpp" line="+51"/>
         <source>Insert Point</source>
-        <translation type="unfinished"></translation>
+        <translation>插入点</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>I</source>
-        <translation type="unfinished"></translation>
+        <translation>I</translation>
     </message>
 </context>
 <context>
@@ -3019,12 +3019,12 @@
     <message>
         <location line="+122"/>
         <source>Connect Polylines</source>
-        <translation type="unfinished"></translation>
+        <translation>连接折线</translation>
     </message>
     <message>
         <location line="+202"/>
         <source>Create Polygon</source>
-        <translation type="unfinished"></translation>
+        <translation>创建多边形</translation>
     </message>
 </context>
 <context>
@@ -3045,12 +3045,12 @@
     <message>
         <location filename="../src/tiled/createtemplatetool.cpp" line="+53"/>
         <source>Insert Template</source>
-        <translation type="unfinished"></translation>
+        <translation>插入模板</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>V</source>
-        <translation type="unfinished"></translation>
+        <translation>V</translation>
     </message>
 </context>
 <context>
@@ -3063,7 +3063,7 @@
     <message>
         <location line="+1"/>
         <source>E</source>
-        <translation type="unfinished"></translation>
+        <translation>E</translation>
     </message>
     <message>
         <location line="+6"/>
@@ -3089,7 +3089,7 @@
     <message>
         <location filename="../src/tiled/documentmanager.cpp" line="+461"/>
         <source>Unrecognized file format.</source>
-        <translation type="unfinished">文件格式不可识别.</translation>
+        <translation>文件格式不可识别.</translation>
     </message>
     <message>
         <location line="+257"/>
@@ -3104,17 +3104,17 @@
     <message>
         <location line="+111"/>
         <source>Close</source>
-        <translation type="unfinished">关闭</translation>
+        <translation>关闭</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Close Other Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭其他标签页</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Close Tabs to the Right</source>
-        <translation type="unfinished"></translation>
+        <translation>关闭右侧标签页</translation>
     </message>
     <message>
         <location line="+241"/>
@@ -3139,12 +3139,12 @@
         <location line="-292"/>
         <location line="+293"/>
         <source>O</source>
-        <translation type="unfinished"></translation>
+        <translation>O</translation>
     </message>
     <message>
         <location line="-23"/>
         <source>Split Segment</source>
-        <translation type="unfinished"></translation>
+        <translation>分割线段</translation>
     </message>
     <message numerus="yes">
         <location line="+265"/>
@@ -3171,18 +3171,18 @@
         <location line="-263"/>
         <location line="+299"/>
         <source>Split Segments</source>
-        <translation>分割段</translation>
+        <translation>分割线段</translation>
     </message>
     <message>
         <location line="-298"/>
         <location line="+365"/>
         <source>Delete Segment</source>
-        <translation type="unfinished"></translation>
+        <translation>删除线段</translation>
     </message>
     <message>
         <location line="-334"/>
         <source>Extend Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>扩展折线</translation>
     </message>
 </context>
 <context>
@@ -3197,7 +3197,7 @@
         <location line="-54"/>
         <location line="+55"/>
         <source>E</source>
-        <translation></translation>
+        <translation>E</translation>
     </message>
 </context>
 <context>
@@ -3255,7 +3255,7 @@
     <message>
         <location line="+8"/>
         <source>Reload</source>
-        <translation type="unfinished">重新载入</translation>
+        <translation>重新载入</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3299,18 +3299,18 @@
     <message>
         <location line="+1"/>
         <source>Visible</source>
-        <translation type="unfinished">可见</translation>
+        <translation>可见</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>锁定</translation>
     </message>
     <message numerus="yes">
         <location line="+74"/>
         <source>Drag Layer(s)</source>
         <translation>
-            <numerusform>播放Layer</numerusform>
+            <numerusform>拖动图</numerusform>
         </translation>
     </message>
     <message>
@@ -3326,12 +3326,12 @@
     <message>
         <location line="+31"/>
         <source>Lock Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>锁定其他层</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Unlock Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>解锁其他层</translation>
     </message>
 </context>
 <context>
@@ -3369,19 +3369,19 @@
     <message>
         <location filename="../src/tiled/maintoolbar.cpp" line="+42"/>
         <source>Main Toolbar</source>
-        <translation type="unfinished">主工具栏</translation>
+        <translation>主工具栏</translation>
     </message>
     <message>
         <location line="+26"/>
         <location line="+70"/>
         <source>Undo</source>
-        <translation type="unfinished">撤销</translation>
+        <translation>撤销</translation>
     </message>
     <message>
         <location line="-69"/>
         <location line="+68"/>
         <source>Redo</source>
-        <translation type="unfinished">恢复</translation>
+        <translation>恢复</translation>
     </message>
     <message>
         <location line="-4"/>
@@ -3419,17 +3419,17 @@
     <message>
         <location line="+6"/>
         <source>Ctrl+=</source>
-        <translation></translation>
+        <translation>Ctrl+=</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>+</source>
-        <translation></translation>
+        <translation>+</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>-</source>
-        <translation></translation>
+        <translation>-</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -3465,7 +3465,7 @@
     <message>
         <location line="+6"/>
         <source>Alt+C</source>
-        <translation></translation>
+        <translation>Alt+C</translation>
     </message>
     <message>
         <location line="-437"/>
@@ -3550,32 +3550,32 @@
     <message>
         <location line="+71"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Q</translation>
     </message>
     <message>
         <location line="+167"/>
         <source>Load World</source>
-        <translation type="unfinished"></translation>
+        <translation>载入世界</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Error Loading World</source>
-        <translation type="unfinished"></translation>
+        <translation>载入世界错误</translation>
     </message>
     <message>
         <location line="+79"/>
         <source>Reset to Default Layout</source>
-        <translation type="unfinished"></translation>
+        <translation>重置默认布局</translation>
     </message>
     <message>
         <location line="+269"/>
         <source>Open File</source>
-        <translation type="unfinished"></translation>
+        <translation>打开文件</translation>
     </message>
     <message>
         <location line="+789"/>
         <source>Some export files already exist:</source>
-        <translation>某些导出文件已经存在：</translation>
+        <translation>某些导出文件已经存在:</translation>
     </message>
     <message>
         <location line="+10"/>
@@ -3601,7 +3601,7 @@
         <location line="+62"/>
         <location line="+30"/>
         <source>Error Exporting Map!</source>
-        <translation type="unfinished"></translation>
+        <translation>导出地图失败！</translation>
     </message>
     <message>
         <location line="+48"/>
@@ -3649,17 +3649,17 @@
         <location filename="../src/tiled/documentmanager.cpp" line="+19"/>
         <location line="+20"/>
         <source>untitled</source>
-        <translation type="unfinished"></translation>
+        <translation>未命名</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Save Template</source>
-        <translation type="unfinished"></translation>
+        <translation>保存模板</translation>
     </message>
     <message>
         <location line="+14"/>
         <source>Error Saving Template</source>
-        <translation type="unfinished"></translation>
+        <translation>保存模板错误</translation>
     </message>
 </context>
 <context>
@@ -3667,7 +3667,7 @@
     <message>
         <location filename="../src/tiled/mapdocument.cpp" line="+210"/>
         <source>untitled.tmx</source>
-        <translation>untitled.tmx</translation>
+        <translation>未命名.tmx</translation>
     </message>
     <message>
         <location line="+83"/>
@@ -3689,7 +3689,7 @@
     <message>
         <location line="+36"/>
         <source>Tile Layer %1</source>
-        <translation>块层 %1</translation>
+        <translation>图块层 %1</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -3710,28 +3710,28 @@
     <message numerus="yes">
         <location line="+2"/>
         <source>Group %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>编组 %n 层</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+16"/>
         <source>Ungroup %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>解散 %n 层编组</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+46"/>
         <source>Duplicate %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>复制 %n 层</numerusform>
         </translation>
     </message>
     <message>
         <location line="+27"/>
         <source>Copy of %1</source>
-        <translation>复制 %1</translation>
+        <translation>%1的副本</translation>
     </message>
     <message>
         <location line="+46"/>
@@ -3741,8 +3741,8 @@
     <message numerus="yes">
         <location line="+73"/>
         <source>Remove %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>移除 %n 层</numerusform>
         </translation>
     </message>
     <message>
@@ -3816,7 +3816,7 @@
     <message>
         <location line="+27"/>
         <source>Ctrl+Shift+H</source>
-        <translation></translation>
+        <translation>Ctrl+Shift+H</translation>
     </message>
     <message>
         <location line="+67"/>
@@ -3827,17 +3827,17 @@
     <message>
         <location line="+9"/>
         <source>&amp;Group Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>遍组图层</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Ungroup Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>解散遍组</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>&amp;Duplicate Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>复制层</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3872,7 +3872,7 @@
     <message>
         <location line="-44"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location line="+55"/>
@@ -3882,7 +3882,7 @@
     <message>
         <location line="+10"/>
         <source>Ctrl+Shift+L</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Shift+L</translation>
     </message>
     <message>
         <location line="+60"/>
@@ -3892,7 +3892,7 @@
     <message>
         <location line="+3"/>
         <source>Autocrop</source>
-        <translation type="unfinished"></translation>
+        <translation>自动裁剪</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -3929,17 +3929,17 @@
     <message>
         <location line="-313"/>
         <source>&amp;Remove Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>移除层</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>R&amp;aise Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>上移层</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Lower Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>下移层</translation>
     </message>
     <message>
         <location line="-3"/>
@@ -3959,7 +3959,7 @@
     <message>
         <location line="+1"/>
         <source>Lock/&amp;Unlock all Other Layers</source>
-        <translation type="unfinished"></translation>
+        <translation>锁定/解锁其他所有层</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -3969,7 +3969,7 @@
     <message>
         <location line="+39"/>
         <source>&amp;New</source>
-        <translation type="unfinished">新建</translation>
+        <translation>新建</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -4016,35 +4016,35 @@
     <message>
         <location filename="../src/tiled/mapeditor.cpp" line="+665"/>
         <source>Paste in Place</source>
-        <translation type="unfinished"></translation>
+        <translation>粘贴</translation>
     </message>
     <message>
         <location line="+187"/>
         <location line="+5"/>
         <source>Error Reading Tileset</source>
-        <translation>读取Tile集错误</translation>
+        <translation>读取图块集错误</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>%1: %2</source>
-        <translation type="unfinished">%1: %2</translation>
+        <translation>%1: %2</translation>
     </message>
     <message numerus="yes">
         <location line="+17"/>
         <source>Add %n Tileset(s)</source>
-        <translation type="unfinished">
+        <translation>
             <numerusform>添加 %n 个图块集</numerusform>
         </translation>
     </message>
     <message>
         <location line="+57"/>
         <source>Tool Options</source>
-        <translation type="unfinished"></translation>
+        <translation>工具选项</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>Tools</source>
-        <translation type="unfinished">工具</translation>
+        <translation>工具</translation>
     </message>
 </context>
 <context>
@@ -4072,7 +4072,7 @@
     <message>
         <location line="+1"/>
         <source>ID</source>
-        <translation type="unfinished">ID</translation>
+        <translation>ID</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -4198,12 +4198,12 @@
     <message>
         <location filename="../src/tiled/newsbutton.cpp" line="+45"/>
         <source>News</source>
-        <translation type="unfinished"></translation>
+        <translation>最新消息</translation>
     </message>
     <message>
         <location line="+69"/>
         <source>News Archive</source>
-        <translation type="unfinished"></translation>
+        <translation>最新版本</translation>
     </message>
 </context>
 <context>
@@ -4226,7 +4226,7 @@
     <message>
         <location line="+11"/>
         <source>Open File...</source>
-        <translation type="unfinished"></translation>
+        <translation>打开文件...</translation>
     </message>
 </context>
 <context>
@@ -4241,7 +4241,7 @@
         <location line="-414"/>
         <location line="+415"/>
         <source>S</source>
-        <translation></translation>
+        <translation>S</translation>
     </message>
     <message numerus="yes">
         <location line="-289"/>
@@ -4264,12 +4264,12 @@
     <message>
         <location line="+4"/>
         <source>&amp;%1) %2</source>
-        <translation type="unfinished"></translation>
+        <translation>&amp;%1) %2</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>%1) %2</source>
-        <translation type="unfinished">%1: %2 {1)?}</translation>
+        <translation>%1) %2</translation>
     </message>
     <message numerus="yes">
         <location line="+673"/>
@@ -4291,12 +4291,12 @@
     <message>
         <location filename="../src/tiled/objecttypeseditor.cpp" line="+226"/>
         <source>Add Object Type</source>
-        <translation>增加物件类型</translation>
+        <translation>增加对象类型</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Object Type</source>
-        <translation>移除物件类型</translation>
+        <translation>移除对象类型</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4419,22 +4419,22 @@
     <message>
         <location line="+1"/>
         <source>Remind me next month</source>
-        <translation type="unfinished"></translation>
+        <translation>下个月提醒我</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Don&apos;t remind me</source>
-        <translation type="unfinished"></translation>
+        <translation>不要再提醒我</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Thanks!</source>
-        <translation type="unfinished"></translation>
+        <translation>谢谢！</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Thanks a lot for your support! With your help Tiled will keep getting better.</source>
-        <translation type="unfinished"></translation>
+        <translation>非常感谢您的支持！Tiled 可以在您的帮助下变得更好。</translation>
     </message>
 </context>
 <context>
@@ -4472,31 +4472,31 @@
     <message numerus="yes">
         <location line="-252"/>
         <source>Paste Property/Properties</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>粘贴属性</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+50"/>
         <source>Remove Property/Properties</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>移除属性</numerusform>
         </translation>
     </message>
     <message>
         <location line="+65"/>
         <source>Cu&amp;t</source>
-        <translation type="unfinished">剪切(&amp;T)</translation>
+        <translation>剪切(&amp;T)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Copy</source>
-        <translation type="unfinished">复制(&amp;C)</translation>
+        <translation>复制(&amp;C)</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>&amp;Paste</source>
-        <translation type="unfinished">粘贴(&amp;P)</translation>
+        <translation>粘贴(&amp;P)</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4516,8 +4516,8 @@
     <message numerus="yes">
         <location line="+69"/>
         <source>Convert Property/Properties</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>转换属性</numerusform>
         </translation>
     </message>
     <message>
@@ -4571,7 +4571,7 @@
     <message>
         <location line="+27"/>
         <source>Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>王氏图块集</translation>
     </message>
     <message>
         <location line="+347"/>
@@ -4646,22 +4646,22 @@
     <message>
         <location line="-986"/>
         <source>Edge Count</source>
-        <translation type="unfinished"></translation>
+        <translation>边数</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Corner Count</source>
-        <translation type="unfinished"></translation>
+        <translation>角数</translation>
     </message>
     <message>
         <location line="+16"/>
         <source>Wang Color</source>
-        <translation type="unfinished"></translation>
+        <translation>王氏颜色</translation>
     </message>
     <message>
         <location line="+40"/>
         <source>Change Infinite Property</source>
-        <translation type="unfinished"></translation>
+        <translation>改变无限属性</translation>
     </message>
     <message>
         <location line="+931"/>
@@ -4708,7 +4708,7 @@
     <message>
         <location line="-231"/>
         <source>Infinite</source>
-        <translation type="unfinished"></translation>
+        <translation>无限</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -4728,7 +4728,7 @@
     <message>
         <location line="+56"/>
         <source>Template</source>
-        <translation type="unfinished"></translation>
+        <translation>模板</translation>
     </message>
     <message>
         <location line="+22"/>
@@ -4743,27 +4743,27 @@
     <message>
         <location line="+6"/>
         <source>Text</source>
-        <translation type="unfinished"></translation>
+        <translation>文本</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Alignment</source>
-        <translation type="unfinished"></translation>
+        <translation>对齐</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>字体</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Word Wrap</source>
-        <translation type="unfinished"></translation>
+        <translation>文字环绕</translation>
     </message>
     <message>
         <location line="+12"/>
         <source>Locked</source>
-        <translation type="unfinished"></translation>
+        <translation>锁定</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -4823,7 +4823,7 @@
     <message>
         <location line="-59"/>
         <source>Group Layer</source>
-        <translation type="unfinished">加入组的Layer</translation>
+        <translation>加入组的层</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -4843,12 +4843,12 @@
     <message>
         <location line="+14"/>
         <source>Grid Width</source>
-        <translation type="unfinished"></translation>
+        <translation>网格宽度</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Grid Height</source>
-        <translation type="unfinished"></translation>
+        <translation>网格高度</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -4905,23 +4905,23 @@
         <location filename="../src/tiled/shapefilltool.cpp" line="+40"/>
         <location line="+77"/>
         <source>Shape Fill Tool</source>
-        <translation type="unfinished"></translation>
+        <translation>填充形状工具</translation>
     </message>
     <message>
         <location line="-74"/>
         <location line="+75"/>
         <source>P</source>
-        <translation type="unfinished">P</translation>
+        <translation>P</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Rectangle Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>填充矩形</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Circle Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>填充圆形</translation>
     </message>
 </context>
 <context>
@@ -4930,65 +4930,65 @@
         <location filename="../src/tiled/stampactions.cpp" line="+48"/>
         <location line="+25"/>
         <source>Random Mode</source>
-        <translation type="unfinished">随机模式</translation>
+        <translation>随机模式</translation>
     </message>
     <message>
         <location line="-24"/>
         <location line="+31"/>
         <source>D</source>
-        <translation type="unfinished">D</translation>
+        <translation>D</translation>
     </message>
     <message>
         <location line="-26"/>
         <location line="+20"/>
         <source>Wang Fill Mode</source>
-        <translation type="unfinished"></translation>
+        <translation>填空王氏图块集模式</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Flip Horizontally</source>
-        <translation type="unfinished">水平翻转</translation>
+        <translation>水平翻转</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Flip Vertically</source>
-        <translation type="unfinished">垂直翻转</translation>
+        <translation>垂直翻转</translation>
     </message>
     <message>
         <location filename="../src/tiled/abstractobjecttool.cpp" line="-125"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Left</source>
-        <translation type="unfinished"></translation>
+        <translation>向左旋转</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Rotate Right</source>
-        <translation type="unfinished"></translation>
+        <translation>向右旋转</translation>
     </message>
     <message>
         <location line="+2"/>
         <location filename="../src/tiled/stampactions.cpp" line="+3"/>
         <source>X</source>
-        <translation type="unfinished">X</translation>
+        <translation>X</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Y</source>
-        <translation type="unfinished">Y</translation>
+        <translation>Y</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Shift+Z</source>
-        <translation type="unfinished"></translation>
+        <translation>Shift+Z</translation>
     </message>
     <message>
         <location line="+1"/>
         <location filename="../src/tiled/stampactions.cpp" line="+1"/>
         <source>Z</source>
-        <translation type="unfinished"></translation>
+        <translation>Z</translation>
     </message>
 </context>
 <context>
@@ -5011,48 +5011,48 @@
     <message>
         <location filename="../src/tiled/templatesdock.cpp" line="+293"/>
         <source>Open Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>打开图块集</translation>
     </message>
     <message>
         <location line="+4"/>
         <location line="+9"/>
         <source>%1: Couldn&apos;t find &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>%1: 找不到 &quot;%2&quot;</translation>
     </message>
     <message>
         <location line="-4"/>
         <source>Locate Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>定位图块集</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Choose the Templates Folder</source>
-        <translation type="unfinished"></translation>
+        <translation>选择模板所在文件夹</translation>
     </message>
     <message>
         <location line="+24"/>
         <source>Templates</source>
-        <translation type="unfinished"></translation>
+        <translation>模板</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Choose Templates Directory</source>
-        <translation type="unfinished"></translation>
+        <translation>选择模板目录</translation>
     </message>
     <message>
         <location line="+27"/>
         <source>All Files (*)</source>
-        <translation type="unfinished"></translation>
+        <translation>全部文件 (*)</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Locate External Tileset</source>
-        <translation type="unfinished">定位外部图块</translation>
+        <translation>定位外部图块集</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>Error Reading Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>读取图块集错误</translation>
     </message>
 </context>
 <context>
@@ -5060,7 +5060,7 @@
     <message>
         <location line="+90"/>
         <source>Select All Instances</source>
-        <translation type="unfinished"></translation>
+        <translation>保存所有实例</translation>
     </message>
 </context>
 <context>
@@ -5093,22 +5093,22 @@
     <message>
         <location line="+2"/>
         <source>Add Terrain Type</source>
-        <translation type="unfinished">增加地形类型</translation>
+        <translation>增加地形类型</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Terrain Type</source>
-        <translation type="unfinished">移除地形类型</translation>
+        <translation>移除地形类型</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move Terrain Type Up</source>
-        <translation type="unfinished"></translation>
+        <translation>上移地形</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Move Terrain Type Down</source>
-        <translation type="unfinished"></translation>
+        <translation>下移地形</translation>
     </message>
 </context>
 <context>
@@ -5140,12 +5140,12 @@
     <message>
         <location filename="../src/tiled/tilecollisiondock.cpp" line="-32"/>
         <source>Delete</source>
-        <translation type="unfinished">删除</translation>
+        <translation>删除</translation>
     </message>
     <message>
         <location line="+0"/>
         <source>Cut</source>
-        <translation type="unfinished">剪切</translation>
+        <translation>剪切</translation>
     </message>
 </context>
 <context>
@@ -5160,7 +5160,7 @@
         <location line="-103"/>
         <location line="+104"/>
         <source>R</source>
-        <translation></translation>
+        <translation>R</translation>
     </message>
     <message>
         <location line="-81"/>
@@ -5264,12 +5264,12 @@
     <message>
         <location line="+1"/>
         <source>&amp;Embed Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>嵌入图块集(&amp;E)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Edit Tile&amp;set</source>
-        <translation type="unfinished"></translation>
+        <translation>编辑图块集</translation>
     </message>
     <message>
         <location line="-1"/>
@@ -5298,7 +5298,7 @@
     <message>
         <location filename="../src/tiled/tilesetdocument.cpp" line="+200"/>
         <source>untitled.tsx</source>
-        <translation type="unfinished">未命令.tsx</translation>
+        <translation>未命名.tsx</translation>
     </message>
 </context>
 <context>
@@ -5307,7 +5307,7 @@
         <location filename="../src/tiled/tileseteditor.cpp" line="-406"/>
         <location line="+400"/>
         <source>Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>图块集</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -5315,58 +5315,58 @@
         <location line="+31"/>
         <location line="+19"/>
         <source>Add Tiles</source>
-        <translation type="unfinished">添加图块</translation>
+        <translation>添加图块</translation>
     </message>
     <message>
         <location line="-71"/>
         <location line="+189"/>
         <source>Remove Tiles</source>
-        <translation type="unfinished">移除图块</translation>
+        <translation>移除图块</translation>
     </message>
     <message>
         <location line="-188"/>
         <source>Tile Animation Editor</source>
-        <translation type="unfinished">图块动画编辑器</translation>
+        <translation>图块动画编辑器</translation>
     </message>
     <message>
         <location line="+49"/>
         <source>Apply this action to all tiles</source>
-        <translation type="unfinished"></translation>
+        <translation>将此动作应用于所有图块</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Tile &quot;%1&quot; already exists in the tileset!</source>
-        <translation type="unfinished"></translation>
+        <translation>图块 &quot;%1&quot; 在图块集中已存在！</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Add anyway?</source>
-        <translation type="unfinished"></translation>
+        <translation>仍然要填加吗？</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>Could not load &quot;%1&quot;!</source>
-        <translation type="unfinished">无法加载 %1 ！</translation>
+        <translation>无法加载 %1 ！</translation>
     </message>
     <message>
         <location line="+118"/>
         <source>Tiles to be removed are in use by open maps!</source>
-        <translation type="unfinished"></translation>
+        <translation>将要移除的图块已经在地图中使用！</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Remove all references to these tiles?</source>
-        <translation type="unfinished">确定要移除所有关于此图块的引用？</translation>
+        <translation>确定要移除所有关于此图块的引用？</translation>
     </message>
     <message>
         <location line="+82"/>
         <source>New Terrain</source>
-        <translation type="unfinished">新地形</translation>
+        <translation>新建地形</translation>
     </message>
     <message>
         <location line="+89"/>
         <source>New Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>新建王氏图块集</translation>
     </message>
 </context>
 <context>
@@ -5397,17 +5397,17 @@
     <message>
         <location line="+9"/>
         <source>Set Wang Set Image</source>
-        <translation type="unfinished"></translation>
+        <translation>设置王氏图块集的图像</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Set Wang Color Image</source>
-        <translation type="unfinished"></translation>
+        <translation>设置王氏图块集的颜色图像</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>&amp;Swap Tiles</source>
-        <translation type="unfinished"></translation>
+        <translation>交换图块</translation>
     </message>
     <message>
         <location line="+8"/>
@@ -5420,7 +5420,7 @@
     <message>
         <location filename="../src/tiled/tmxmapformat.h" line="+66"/>
         <source>Tiled map files (*.tmx *.xml)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled 地图文件 (*.tmx *.xml)</translation>
     </message>
 </context>
 <context>
@@ -5428,7 +5428,7 @@
     <message>
         <location line="+28"/>
         <source>Tiled tileset files (*.tsx *.xml)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled 图会集文件 (*.tsx *.xml)</translation>
     </message>
 </context>
 <context>
@@ -5449,50 +5449,50 @@
     <message>
         <location filename="../src/tiled/variantpropertymanager.cpp" line="+169"/>
         <source>%1, %2</source>
-        <translation type="unfinished">%1, %2</translation>
+        <translation>%1, %2</translation>
     </message>
     <message>
         <location line="+126"/>
         <source>Horizontal</source>
-        <translation type="unfinished">水平</translation>
+        <translation>水平</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Vertical</source>
-        <translation type="unfinished">垂直</translation>
+        <translation>垂直</translation>
     </message>
     <message>
         <location line="+114"/>
         <location line="+6"/>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>左对齐</translation>
     </message>
     <message>
         <location line="-5"/>
         <location line="+12"/>
         <location line="+4"/>
         <source>Center</source>
-        <translation type="unfinished"></translation>
+        <translation>居中</translation>
     </message>
     <message>
         <location line="-15"/>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>右对齐</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Justify</source>
-        <translation type="unfinished"></translation>
+        <translation>自动调整</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Top</source>
-        <translation type="unfinished"></translation>
+        <translation>顶部对齐</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Bottom</source>
-        <translation type="unfinished"></translation>
+        <translation>底部对齐</translation>
     </message>
 </context>
 <context>
@@ -5501,18 +5501,18 @@
         <location filename="../src/tiled/wangbrush.cpp" line="+108"/>
         <location line="+65"/>
         <source>Wang Brush</source>
-        <translation type="unfinished"></translation>
+        <translation>王氏刷子</translation>
     </message>
     <message>
         <location line="-62"/>
         <location line="+63"/>
         <source>G</source>
-        <translation type="unfinished"></translation>
+        <translation>G</translation>
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
-        <translation type="unfinished"></translation>
+        <source>Missing Wang tile transition</source>
+        <translation>找不到王氏渐变图块</translation>
     </message>
 </context>
 <context>
@@ -5520,12 +5520,12 @@
     <message>
         <location filename="../src/tiled/wangcolormodel.cpp" line="+144"/>
         <source>Edge Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>边缘颜色</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Corner Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>拐角颜色</translation>
     </message>
 </context>
 <context>
@@ -5533,7 +5533,7 @@
     <message>
         <location filename="../src/tiled/wangcolorview.cpp" line="+184"/>
         <source>Pick Custom Color</source>
-        <translation type="unfinished"></translation>
+        <translation>选择自定义颜色</translation>
     </message>
 </context>
 <context>
@@ -5542,48 +5542,48 @@
         <location filename="../src/tiled/wangdock.cpp" line="+227"/>
         <location line="+327"/>
         <source>Patterns</source>
-        <translation type="unfinished"></translation>
+        <translation>模式</translation>
     </message>
     <message>
         <location line="-326"/>
         <location line="+327"/>
         <source>Colors</source>
-        <translation type="unfinished"></translation>
+        <translation>颜色</translation>
     </message>
     <message>
         <location line="-10"/>
         <source>Wang Sets</source>
-        <translation type="unfinished"></translation>
+        <translation>王氏图块集</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Erase WangIds</source>
-        <translation type="unfinished"></translation>
+        <translation>擦除 WangId</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>添加王氏图块集</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>移除王氏图块集</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Edge Color</source>
-        <translation type="unfinished"></translation>
+        <translation>添加边缘颜色</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Add Corner Color</source>
-        <translation type="unfinished"></translation>
+        <translation>添加拐角颜色</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Remove Color</source>
-        <translation type="unfinished"></translation>
+        <translation>移除颜色</translation>
     </message>
 </context>
 <context>
@@ -5591,7 +5591,7 @@
     <message>
         <location filename="../src/tiled/wangsetview.cpp" line="+105"/>
         <source>Wang Set &amp;Properties...</source>
-        <translation type="unfinished"></translation>
+        <translation>王氏图集属性</translation>
     </message>
 </context>
 <context>
@@ -5599,7 +5599,7 @@
     <message>
         <location filename="../src/tiled/tmxmapformat.h" line="+27"/>
         <source>Tiled template files (*.tx)</source>
-        <translation type="unfinished"></translation>
+        <translation>Tiled 模板文件 (*.tx)</translation>
     </message>
 </context>
 <context>
@@ -5607,13 +5607,13 @@
     <message>
         <location filename="../src/libtiled/worldmanager.cpp" line="+109"/>
         <source>Could not open file for reading.</source>
-        <translation type="unfinished">无法打开文件进行读取。</translation>
+        <translation>无法打开文件进行读取。</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>JSON parse error at offset %1:
 %2.</source>
-        <translation type="unfinished"></translation>
+        <translation>JSON文件解析到 %1 时发生错误: %2.</translation>
     </message>
 </context>
 <context>
@@ -5644,7 +5644,7 @@
     <message>
         <location line="+11"/>
         <source>Add Objects</source>
-        <translation type="unfinished"></translation>
+        <translation>添加多个对象</translation>
     </message>
     <message>
         <location line="+40"/>
@@ -5654,7 +5654,7 @@
     <message>
         <location line="+11"/>
         <source>Remove Objects</source>
-        <translation type="unfinished">移除对象</translation>
+        <translation>移除多个对象</translation>
     </message>
     <message>
         <location filename="../src/tiled/changemapobject.cpp" line="+38"/>
@@ -5669,7 +5669,7 @@
     <message>
         <location filename="../src/tiled/changeproperties.cpp" line="+41"/>
         <source>Change Properties</source>
-        <translation type="unfinished"></translation>
+        <translation>修改属性</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -5781,7 +5781,7 @@
     <message>
         <location line="+59"/>
         <source>Change Grid Size</source>
-        <translation type="unfinished"></translation>
+        <translation>修改网格尺寸</translation>
     </message>
     <message>
         <location filename="../src/tiled/movemapobjecttogroup.cpp" line="+42"/>
@@ -5812,12 +5812,12 @@
     <message>
         <location line="+19"/>
         <source>Toggle Polygon/Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>多边形/折线 开关</translation>
     </message>
     <message>
         <location line="+20"/>
         <source>Split Polyline</source>
-        <translation type="unfinished"></translation>
+        <translation>分割折线</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremoveterrain.cpp" line="+67"/>
@@ -5852,12 +5852,12 @@
     <message>
         <location line="+19"/>
         <source>Lock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>锁定层</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Unlock Layer</source>
-        <translation type="unfinished"></translation>
+        <translation>解锁层</translation>
     </message>
     <message>
         <location line="+20"/>
@@ -5882,29 +5882,29 @@
     <message numerus="yes">
         <location line="+59"/>
         <source>Change %n Object/s Tile</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>修改 %n 个对象/图块</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+65"/>
         <source>Detach %n Template Instance(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>拆分 %n 个模板实例</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+39"/>
         <source>Reset %n Instances</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>重置 %n 个实例</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+46"/>
         <source>Replace %n Object(s) With Template</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>使用模板替换 %n 个对象</numerusform>
         </translation>
     </message>
     <message>
@@ -5979,7 +5979,7 @@
     <message>
         <location line="+4"/>
         <source>Change Infinite Property</source>
-        <translation type="unfinished"></translation>
+        <translation>更改无限属性</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -6051,92 +6051,92 @@
     <message>
         <location filename="../src/tiled/changetile.cpp" line="+34"/>
         <source>Change Tile Type</source>
-        <translation type="unfinished"></translation>
+        <translation>修改图块类型</translation>
     </message>
     <message>
         <location filename="../src/tiled/swaptiles.cpp" line="+37"/>
         <source>Swap Tiles</source>
-        <translation type="unfinished"></translation>
+        <translation>交换图块</translation>
     </message>
     <message>
         <location filename="../src/tiled/tilesetdocument.cpp" line="-153"/>
         <source>Reload Tileset</source>
-        <translation type="unfinished"></translation>
+        <translation>重新加载图块集</translation>
     </message>
     <message>
         <location filename="../src/tiled/addremovewangset.cpp" line="+65"/>
         <source>Add Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>添加王氏图块集</translation>
     </message>
     <message>
         <location line="+8"/>
         <source>Remove Wang Set</source>
-        <translation type="unfinished"></translation>
+        <translation>移除王氏图块集</translation>
     </message>
     <message>
         <location filename="../src/tiled/changetilewangid.cpp" line="+36"/>
         <location line="+12"/>
         <location line="+14"/>
         <source>Change Tile WangId</source>
-        <translation type="unfinished"></translation>
+        <translation>修改图块 WangId</translation>
     </message>
     <message>
         <location filename="../src/tiled/changewangsetdata.cpp" line="+38"/>
         <source>Change Wang Set edge count</source>
-        <translation type="unfinished"></translation>
+        <translation>修改王氏图块集的边数</translation>
     </message>
     <message>
         <location line="+66"/>
         <source>Change Wang Set corner count</source>
-        <translation type="unfinished"></translation>
+        <translation>修改王氏图块集的拐角数</translation>
     </message>
     <message>
         <location line="+63"/>
         <source>Remove Wang Color</source>
-        <translation type="unfinished"></translation>
+        <translation>移除王氏颜色</translation>
     </message>
     <message>
         <location line="+90"/>
         <source>Set Wang Set Image</source>
-        <translation type="unfinished"></translation>
+        <translation>设置王氏图块集的图像</translation>
     </message>
     <message>
         <location filename="../src/tiled/moveterrain.cpp" line="+61"/>
         <source>Move Terrain Up</source>
-        <translation type="unfinished"></translation>
+        <translation>上移地形</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Move Terrain Down</source>
-        <translation type="unfinished"></translation>
+        <translation>下移地形</translation>
     </message>
     <message>
         <location filename="../src/tiled/renamewangset.cpp" line="+35"/>
         <source>Change Wang Set Name</source>
-        <translation type="unfinished"></translation>
+        <translation>修改王氏图块集的名称</translation>
     </message>
     <message>
         <location filename="../src/tiled/replacetemplate.cpp" line="+35"/>
         <source>Replace Template</source>
-        <translation type="unfinished"></translation>
+        <translation>替换模板</translation>
     </message>
     <message>
         <location filename="../src/tiled/shapefilltool.cpp" line="-20"/>
         <source>Shape Fill</source>
-        <translation type="unfinished"></translation>
+        <translation>填充形状</translation>
     </message>
     <message numerus="yes">
         <location filename="../src/tiled/mapdocument.cpp" line="-683"/>
         <source>Raise %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>上移 %n 个层</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+27"/>
         <source>Lower %n Layer(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>下移 %n 个层</numerusform>
         </translation>
     </message>
 </context>
@@ -6150,12 +6150,12 @@
     <message>
         <location line="+223"/>
         <source>Copy File Path</source>
-        <translation type="unfinished">复制文件路径</translation>
+        <translation>复制文件路径</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Open Containing Folder...</source>
-        <translation type="unfinished">定位文件...</translation>
+        <translation>打开包含的文件夹...</translation>
     </message>
 </context>
 <context>
@@ -6163,93 +6163,93 @@
     <message>
         <location filename="../src/tmxrasterizer/main.cpp" line="+52"/>
         <source>Renders a Tiled map (TMX format) to an image.</source>
-        <translation type="unfinished"></translation>
+        <translation>将地图 (TMX格式) 渲染到一张图片。</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>The scale of the output image (default: 1).</source>
-        <translation type="unfinished"></translation>
+        <translation>输出图片的缩放比例 (默认:1倍)。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>scale</source>
-        <translation type="unfinished"></translation>
+        <translation>缩放比例</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>The requested size in pixels at which a tile is rendered (overrides the --scale option).</source>
-        <translation type="unfinished"></translation>
+        <translation>渲染每个图块的像素尺寸(会覆盖 --scale 选项)。</translation>
     </message>
     <message>
         <location line="+1"/>
         <location line="+3"/>
-        <source>size</source>
-        <translation type="unfinished"></translation>
+        <source>tilesize</source>
+        <translation>图块尺寸</translation>
     </message>
     <message>
         <location line="-1"/>
         <source>The output image fits within a SIZE x SIZE square (overrides the --scale and --tilesize options).</source>
-        <translation type="unfinished"></translation>
+        <translation>输出的图像将会对齐为一个 SIZE * SIZE 大小的方块 (覆盖 --scale 和 --tilesize 选项)。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Antialias edges of primitives.</source>
-        <translation type="unfinished"></translation>
+        <translation>边缘抗锯齿</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Use nearest neighbour instead of smooth blending of pixels.</source>
-        <translation type="unfinished"></translation>
+        <translation>使用最邻近原则渲染，而不是平滑像素渲染。(译注:当图像被放大时，最邻近原渲染会产生马赛克感。)</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ignore all layer visibility flags in the map file, and render all layers in the output (default is to omit invisible layers).</source>
-        <translation type="unfinished"></translation>
+        <translation>忽略地图文件中的所有层的可见性标志，并在输出中呈现所有层 (默认情况下是省略不可见层)。</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Specifies a layer to omit from the output image. Can be repeated to hide multiple layers.</source>
-        <translation type="unfinished"></translation>
+        <translation>指定从输出图像中省略的层。可重复设置，以忽略多个层。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>name</source>
-        <translation type="unfinished"></translation>
+        <translation>名称</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Map file to render.</source>
-        <translation type="unfinished"></translation>
+        <translation>要渲染的地图文件。</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Image file to output.</source>
-        <translation type="unfinished"></translation>
+        <translation>输出的图像文件。</translation>
     </message>
     <message>
         <location line="+23"/>
         <source>Invalid size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>不可用的图块尺寸: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid tile size specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>不可用的图块尺寸: &quot;%1&quot;</translation>
     </message>
     <message>
         <location line="+9"/>
         <source>Invalid scale specified: &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation>不可用的缩放比例: &quot;%1&quot;</translation>
     </message>
     <message>
         <location filename="../src/tmxviewer/main.cpp" line="+57"/>
         <source>Displays a Tiled map (TMX format).</source>
-        <translation type="unfinished"></translation>
+        <translation>显示一个 Tiled 地图 (TMX格式)。</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>Map file to display.</source>
-        <translation type="unfinished"></translation>
+        <translation>要显示的地图文件。</translation>
     </message>
 </context>
 </TS>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/tiled_zh_TW.ts tiled-qt-1.2.4+dfsg.1/translations/tiled_zh_TW.ts
--- tiled-qt-1.2.1+dfsg.1/translations/tiled_zh_TW.ts	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/tiled_zh_TW.ts	2019-05-15 15:33:52.000000000 +0000
@@ -461,7 +461,7 @@
     </message>
     <message>
         <location line="+15"/>
-        <source>Json map files (*.json)</source>
+        <source>JSON map files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -496,7 +496,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json template files (*.json)</source>
+        <source>JSON template files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -526,7 +526,7 @@
     </message>
     <message>
         <location line="+14"/>
-        <source>Json tileset files (*.json)</source>
+        <source>JSON tileset files (*.json)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -5510,7 +5510,7 @@
     </message>
     <message>
         <location line="+152"/>
-        <source>Missing wang tile transition</source>
+        <source>Missing Wang tile transition</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff -Nru tiled-qt-1.2.1+dfsg.1/translations/translations.pro tiled-qt-1.2.4+dfsg.1/translations/translations.pro
--- tiled-qt-1.2.1+dfsg.1/translations/translations.pro	2018-11-14 09:48:34.000000000 +0000
+++ tiled-qt-1.2.4+dfsg.1/translations/translations.pro	2019-05-15 15:33:52.000000000 +0000
@@ -27,6 +27,7 @@
     pt \
     pt_PT \
     ru \
+    sv \
     tr \
     uk \
     zh \