commit 836c82cf5c45644a8ab44f5aed5acf27898f454d
Author: Jim Evins <evins@snaught.com>
Date:   2018-04-27

    Reconcile with newer translations in master.

M	po/eo.po
M	po/fi.po

commit 88c59e9042b8609101418c1528734aeb2ba8f16e
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-22

    Reconcile with newer translations in master.

M	po/da.po
M	po/es.po
M	po/fr.po
M	po/hu.po
M	po/pt_BR.po
M	po/sr.po
M	po/sr@latin.po

commit cb9b03d0d2ed1e48b6335ffdd723e75632efb412
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2018-04-22

    Update German translation

M	po/de.po

commit d0b9785ef32e27bccd03cf2abe58d6b3f6faf56c
Author: Rūdolfs Mazurs <rudolfs.mazurs@gmail.com>
Date:	2018-04-18

    Update Latvian translation

M	po/lv.po

commit 4c405f41ce2409e0e5e7aed22ecbc2b3b756953f
Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
Date:	2018-04-16

    Update Swedish translation

M	po/sv.po

commit 6ec9bda994d8966f057aa0c6248c1d31418fb529
Author: Marek Černocký <marek@manet.cz>
Date:	2018-04-15

    Updated Czech translation

M	po/cs.po

commit 24cff272f90e82dd226578538082f5fe5dc0a693
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-09

    Add online-templates.xml for translation

M	po/POTFILES.in

commit 3064517ab07c74d6998c9522d8078dae82392dba
Author: Marek Černocký <marek@manet.cz>
Date:	2016-09-16

    Add hisago-templates.xml for translations

M	po/POTFILES.in

commit 17239150d67e62b103e1c07dbb34f9444c0e6a35
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Fixed cut&paste error in page size of Dymo 11356.

M	templates/dymo-other-templates.xml

commit e5ff4a232836ac0dd60a23194498b2f5f3aa53ae
Author: killermoehre <killermoehre@gmx.net>
Date:	2018-02-05

    add definition for Dymo 11356 Small Name Badge labels

    - remove whitespaces on line ending and empty lines
    - add definition for Dymo 11356 Small Name Badge labels
    - added template credit.

M	AUTHORS
M	templates/dymo-other-templates.xml

commit f33b030339f9cfe1c263debf3af6f3528c06ca62
Author: Chris Mayo <aklhfex@gmail.com>
Date:	2018-01-24

    Remove deprecated Application category from desktop file

M	data/desktop/glabels-3.0.desktop.in

commit 809b6de1ebebcd2df3a85b45928e089332d51db6
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2017-09-18

    Fix out of bounds read when label is empty

M	src/text-node.c

commit 056f8fc9c0dffc86b04bc5dcc133265a36324be5
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2017-09-18

    Prevent crash when using combo search on “Select Product”

    GtkSelectionMode can also be GTK_SELECTION_BROWSE, which does not
    guarantee that a selection is available. Checking the return value
    of gtk_tree_selection_get_selected() seems to provides a clearer
    picture.

M	src/media-select.c

commit 5ad39b9b63258cbe851b60332bf22833d3957bd5
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Fixed typo.  Numbers in template files should be in the C locale.

M	templates/online-templates.xml

commit ef9686762bb6b0a1b490c2f6c8ea87b3ee963691
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Added new template file to templates/Makefile.am and po/POTFILES.in

M	po/POTFILES.in
M	templates/Makefile.am

commit 87c2635baa981bbee935972b743e93ca94f3c30c
Author: Jim Evins <evins@snaught.com>
Date:	2018-04-14

    Added Felga Etichette labels for laser printers templates

    Template file provided by Jean-Marie Auffray

M	AUTHORS
A	templates/felga-templates.xml
M	templates/vendors.xml

commit 549c2fb13a05c7f28710804b010f5652bb2b9533
Author: Marek Černocký <marek@manet.cz>
Date:	2016-09-16

    Hisago templates

M	templates/Makefile.am
A	templates/hisago-templates.xml
M	templates/vendors.xml

commit 685c35db069396c89edfa9145fa14418f0f39782
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2016-06-18

    Fixed typo

M	templates/online-templates.xml

commit 7d1064aae86b8accf3869fdb5172504320914a74
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-10

    Fix descriptions

M	templates/online-templates.xml

commit 5aaca871c6c7fc6a921924aee5b4641587c9c518
Author: Marek Černocký <marek@manet.cz>
Date:	2016-06-09

    Templates for Online Labels vendor

M	templates/Makefile.am
M	templates/misc-us-templates.xml
A	templates/online-templates.xml

commit 03f0eb410dd8711573a1150a1528ab4c93cc2c98
Author: Jim Evins <evins@snaught.com>
Date:	2018-03-31

    Fix portability issue due to signedness of char.

M	src/merge-text.c

commit 44de146c6b35e1c7b7354b13eb9f34eef58419a1
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2018-02-18

    Update Indonesian translation

M	po/id.po

commit 8b9c34a0fc745cd11e31cf4390be211ce2033f35
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2018-02-11

    Update Indonesian translation

M	po/id.po

commit 0016899b9ac2e91cdde7e7ef225020757809bed8
Author: Marek Cernocky <marek_cernocky@conel.cz>
Date:	2017-08-01

    Fixed typo

M	templates/avery-iso-templates.xml

commit fcb79a2c6fa5b8d0dbe4b8e9f5d6983af8aa0f13
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2017-07-24

    Update German translation

M	po/de.po

commit 5d036452d6ae6ffe5f8c764a779c95a2d180e801
Author: David Griffith <dave@661.org>
Date:	2017-07-15

    Added Avery 89100 family Binder Spine Inserts

M	AUTHORS
M	templates/avery-us-templates.xml

commit 992ada07544cebce3bb353ba83f0644be52c5937
Author: Matthias Mailänder <Mailaender@users.noreply.github.com>
Date:	2016-09-17

    Fix screenshot URL.

M	data/appdata/glabels-3.appdata.xml.in

commit c3146edcaf251f953435718991346b5e7977a06e
Author: Jim Evins <evins@snaught.com>
Date:	2017-07-15

    Added Avery-L6043 and Herma-10001 product templates.

    Glabels issue # 25.  Provided by Johnny A. Solbu (solbu).

M	AUTHORS
M	templates/avery-iso-templates.xml
M	templates/herma-iso-templates.xml

commit cd5bf70e223765a5a2c524fdc9a51ab06f43c2c7
Author: Jim Evins <evins@snaught.com>
Date:	2017-07-15

    Completely disable word-wrap of text objects when auto_shrink
    is enabled.

    Fixes glabels issue #29.

M	src/label-text.c

commit 20ba816250e79129d773936d68acb4bc61fcdd9a
Author: Cédric Valmary <cvalmary@yahoo.fr>
Date:	2016-10-24

    Add Occitan translation

M	po/LINGUAS
A	po/oc.po

commit e8cbdc86e4f3d91060825b5ae483dffc98089a40
Author: Tiago Santos <tiagofsantos81@sapo.pt>
Date:	2016-09-04

    Updated Portuguese translation

M	po/pt.po

commit 45c97672abe07c5193d57c9a295768024e6b7278
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
Date:	2016-08-22

    Updated Serbian translation

M	po/sr.po
M	po/sr@latin.po

commit eaab6b15e35389cfb2ce8e1256d7ca4be10a6954
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-08-10

    Updated Slovak translation

M	po/sk.po

commit 685fc60af3e2f8b34ac3ece48e7a24aeda759b72
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2016-07-17

    Add Language headers to po files

    Future versions of gettext will fail if this header is missing.

M	po/ar.po
M	po/ca.po
M	po/ca@valencia.po
M	po/eo.po
M	po/es.po
M	po/it.po
M	po/ko.po
M	po/sl.po
M	po/sr@latin.po
M	po/zh_CN.po
M	po/zh_HK.po
M	po/zh_TW.po

commit 5a68e9ea31630170de7ac9ef08c985e89274d959
Author: Tiago Santos <tiagofsantos81@sapo.pt>
Date:	2016-07-04

    Updated Portuguese translation

M	po/pt.po

commit 94696c4583ccadd49e843187cafebf791e82d414
Author: Andika Triwidada <atriwidada@gnome.org>
Date:	2016-07-04

    Updated Indonesian translation

M	po/id.po

commit 4ee89d913ade530ad70ebe0aa09540e420d14b9d
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-03

    Updated Slovak translation

M	po/sk.po

commit f5202431517ce26bae5288b7ae6d70b54e5df07d
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-02

    Updated Slovak translation

M	po/sk.po

commit 818cb6cd70e6c3f9ed68bb431973fc1699090398
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-07-01

    Updated Slovak translation

M	po/sk.po

commit 0b46b9c106cadc61ce08db7d2d43f4e7076eea58
Author: Claude Paroz <claude@2xlibre.net>
Date:	2016-05-10

    Updated French translation

    Thanks Mathieu Stumpf for the initial translation.

M	help/fr/fr.po
M	po/fr.po

commit f23c43bbeb9074e283ca72d745af7122c21798f4
Author: Balázs Meskó <meskobalazs@gmail.com>
Date:	2016-04-29

    Updated Hungarian translation

M	po/hu.po

commit 0cb43dc87be96bbf5cce06f4b31624183193a64f
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-28

    Updated Slovak translation

M	po/sk.po

commit c001d7c2ffd4142d72f26820bfd71dd3533780de
Author: Clemens Fries <githubert@xenoworld.de>
Date:	2016-04-27

    Prevent crash when providing an invalid file on the command line

M	src/window.c

commit d277ea8a3f2e30e41b45363f152b283a1e4579d3
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-26

    Updated Slovak translation

M	po/sk.po

commit d9a8f3f69745079b449b939caf651095ee24a604
Author: Dušan Kazik <prescott66@gmail.com>
Date:	2016-04-26

    Updated Slovak translation

M	po/sk.po

commit 0b5d2091ef018840bc0e352a09bbabd67cc0e76c
Author: Jim Evins <evins@snaught.com>
Date:	2016-04-24

    Added missing function prototype to header.

M	src/prefs-model.h