commit 37829049642492bdf38dc07f5e5cfe2058251583
Author: Jim Evins <evins@snaught.com>
Date:   2013-10-28

    Preparation for 3.2.0.

M	NEWS

commit f83a7be3ae49998ae7707753689f3fb6d02f5f95
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2013-10-15

    Updated Spanish translation

M	help/es/es.po

commit be522c6a8644dd93ce09d682e28d27f4639234fd
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2013-10-15

    Updated Spanish translation

M	po/es.po

commit 8e199f487e6389d9b09c5b2cc08c788dc755a0d3
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2013-10-13

    Updated Slovenian translation

M	po/sl.po

commit cf13c952d484d553c68bc87d6c9064f22dc17427
Author: Marek Černocký <marek@manet.cz>
Date:	2013-10-13

    Updated Czech translation

M	po/cs.po

commit 78123e5af3fa9a3e1c7a7e23012dd960535b53db
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	2013-10-13

    Updated Latvian translation

M	po/lv.po

commit 7581fcf2509fc7f73f81482a0ee6fa96efdd0d8e
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2013-10-12

    Updated Brazilian Portuguese translation

M	po/pt_BR.po

commit 0498e6ca94e28d39f9498bc433fb3d5ce262224e
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-10-12

    [l10n] Updated German translation

M	po/de.po

commit 94a070900b814f500f3da45e372e18c968a33825
Author: Claude Paroz <claude@2xlibre.net>
Date:	2013-10-12

    Updated French manual translation

M	help/fr/fr.po

commit a430c9937118bff27a7c24eb9d9c7b8eab723231
Author: Claude Paroz <claude@2xlibre.net>
Date:	2013-10-12

    Updated French translation

M	po/fr.po

commit cfeb47947d11c45271bbb86ca357231c3a610778
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-10

    Bump version to 3.2.0.

M	configure.ac

commit 81bfea5ad77360d2d8f26b61b17ddc4c207ca7d5
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-09

    Generated new app and mimetype bitmaps from scalable icons.

M	.gitignore
M	data/icons/16x16/apps/glabels-3.0.png
M	data/icons/22x22/apps/glabels-3.0.png
M	data/icons/24x24/apps/glabels-3.0.png
M	data/icons/32x32/apps/glabels-3.0.png
M	data/icons/48x48/apps/glabels-3.0.png
M	data/icons/48x48/mimetypes/application-x-glabels.png

commit 63ad6763093d0ff95b2233bbc54a14029f0217da
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-09

    Added scalable app and mimetype icons.

M	configure.ac
M	data/icons/Makefile.am
A	data/icons/scalable/Makefile.am
A	data/icons/scalable/apps/glabels-3.0.svg
A	data/icons/scalable/mimetypes/application-x-glabels.svg

commit 11e93788cf275580c27c13eec376f2f9dba56bad
Author: Jim Evins <evins@snaught.com>
Date:	2013-10-05

    Added appdata file

M	configure.ac
M	data/Makefile.am
A	data/appdata/Makefile.am
A	data/appdata/glabels-3.appdata.xml.in
M	po/POTFILES.in

commit 3e730864d88a9dd9af9fe8ece3a9539ad15d764c
Author: Timo Jyrinki <timo@debian.org>
Date:	2013-09-23

    Finnish translation update

M	po/fi.po

commit f54e34afe43a049754cd992149eb6fd192bef228
Author: Enrico Nicoletto <liverig@gmail.com>
Date:	2013-09-20

    Updated Brazilian Portuguese translation

M	help/Makefile.am
A	help/pt_BR/pt_BR.po

commit 065065c183fe3121f76a55a82657e000836bde8d
Author: Piotr Drąg <piotrdrag@gmail.com>
Date:	2013-09-15

    Fix a broken tag in German help translation

M	help/de/de.po

commit 67bf47d1c529ad76f874d649f232ecd4f8e6f2c0
Author: Marek Černocký <marek@manet.cz>
Date:	2013-07-21

    Updated Czech translation

M	help/cs/cs.po

commit 450e436800ed173f4300a66009556149a02dad32
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-06-26

    [l10n] Updated German doc translation

M	help/de/de.po

commit 02617415fef9b490f44fc8aa54998e91a274e41c
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-06-26

    [l10n] Updated German translation

M	po/de.po

commit 36de4c460e0106357bf34919e4c085fbb00047f6
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-23

    Emit selection_changed after delete_selection

    Emit selection_changed signal after a delete_selection.  Fixes bug
    where object
    editor remained active after an object was deleted.

M	src/label.c

commit 063afbdeece38750044f2462837246bb1c8346c6
Author: James Cloos <cloos@jhcloos.com>
Date:	2013-06-22

    Embed the text in the printstream as text rather that as an outline

    Fixes bug #702783.	Render text directly using pango-cairo API
    instead of
    filling text outline path.	Original patch modified to still use
    path to test
    for selection.

M	src/label-text.c

commit 48bdf0059de924880e20fc7641b7b5e6e33476dd
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-20

    Add decoration to new label dialog.

    Manually added decorations back to new label dialog that have been
    deprecated
    in recent versions of Gtk.	Still need to look for proper way to
    use theming
    information to select text and background colors.

M	data/ui/new-label-dialog.ui
M	src/new-label-dialog.c

commit acb8a0c8e4ee4131b059aeb4544c4ef108dd183c
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-16

    Workaround for pango kerning bug.

    Fixes bug #698777.	This is a workaround for pango-cairo bug #700592,
    which is
    a regression of bug #341481 which was originally fixed back in 2009.
    This
    workaround works by rendering the font at device scale rather than
    world scale.
    To make this work the actual font size is manually scaled
    appropriately to
    compensate for this.

M	src/label-text.c

commit e3a8b073f0f914b71279f28630f79f0cfec736e2
Author: Jim Evins <evins@snaught.com>
Date:	2013-06-15

    Reconcile object-editor glade file with 3.0.

    Reconciled object-editor glade file with 3.0 version to correct
    vertical
    packing of widgets.

    This file should probably be rebuilt to remove gtk+-2 deprecations.

M	data/ui/object-editor.ui

commit d3701e7eccee70258b7092848c5009dd1ab0a839
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date:	2013-05-31

    l10n: Update Japanese translation

M	po/ja.po

commit 748c4120718803a54040400e074db7fd250fc813
Author: Jim Evins <evins@snaught.com>
Date:	2013-05-19

    Fixed low hanging deprecations and warnings.

M	src/color-combo-button.c
M	src/color-combo.c
M	src/field-button.c
M	src/font-combo-menu-item.c
M	src/font-combo.c
M	src/font-util.c
M	src/label-image.c
M	src/label-object.c
M	src/label-text.c
M	src/label.h
M	src/merge-text.c
M	src/mini-preview.c
M	src/str-util.h
M	src/ui-property-bar.c
M	src/view.c
M	src/window.c
M	src/xml-label.c

commit 329d5bb8abd2962e51fa76655a53357061f100bd
Author: Jim Evins <evins@snaught.com>
Date:	2013-05-14

    Fix autogen.sh that was mistakenly broken in previous commit.

M	autogen.sh

commit b78e6f1d6ef50cca053ba671dc02826e5dbba91b
Author: OKANO Takayoshi <kano@na.rim.or.jp>
Date:	2013-04-27

    l10n: Update Japanese translation

M	po/ja.po

commit ce86b981a8a04f8d7ef26c3406a3f8d810c2361f
Author: Marek Černocký <marek@manet.cz>
Date:	2013-04-26

    Updated Czech translation

M	help/cs/cs.po

commit 090ba2cab4666137839e03b2488cbc40f0851039
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	2013-04-18

    Updated Greek translation

M	help/el/el.po

commit d7daf5a802fdfb252d63995515ae4e930d6665a0
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-04-17

    [doc] Notes about creating CSV from kaddressbook and Thunderbird

M	help/C/mergefeatures.page

commit 6d5918ace1f8d47b2a0e462d7eeaf6ad4d0220aa
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-04-16

    Added more SheetLabels templates

M	templates/sheetlabels-us-templates.xml

commit 6b7d7e831e5542b6ea3c15802fa882a42399fc15
Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
Date:	2013-04-01

    unbreak with evolution-data-server >= 3.6.0

    https://bugzilla.gnome.org/show_bug.cgi?id=685130

M	src/merge-evolution.c
M	src/merge-vcard.c

commit e4d56c40e66a1bc53974800d8fe48dd5da432878
Author: Yusuf Bolu <yusufbolu@gmail.com>
Date:	2013-03-28

    [l10n] Added Turkish translation

M	po/LINGUAS
A	po/tr.po

commit 41ce4d95a8f4ae1f071f0fd2cb3b00e8d09cb17f
Author: Marek Černocký <marek@manet.cz>
Date:	2013-03-21

    Fixed XML

M	help/cs/cs.po

commit b13952d2c74cef740f18f9a790471ade2b2b5ae9
Author: Marek Černocký <marek@manet.cz>
Date:	2013-02-19

    Updated Czech translation

M	help/cs/cs.po

commit e011f5927d44b2eca758550c72811edd30404908
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2013-02-02

    [l10n] Updated German translation, SourceForge bug #3601568

M	po/de.po

commit 95b8f0e2f01d09b019cb499afe296740228242e3
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2013-01-06

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

M	po/LINGUAS

commit 041bbd9b5e19a527a860a9c1052ca8b73b5c7067
Author: Walter Cheuk <wwycheuk@gmail.com>
Date:	2013-01-06

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

C051	po/zh_TW.po	po/zh_HK.po
M	po/zh_TW.po

commit 63bf696bcc7402ca21858e9f8cb293a74c12622a
Author: Gebhard Moser <gebhard.moser@yahoo.com>
Date:	2012-12-13

    Added Avery template

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

commit a24cc21714ac2427025f1b6c67edef0984b6754d
Author: Fran Diéguez <fran.dieguez@mabishu.com>
Date:	2012-11-01

    Aded galician translations

M	po/LINGUAS
A	po/gl.po

commit ef295496fd140a64688d9c36d5761eddf1e90350
Author: Dimitris Spingos <dmtrs32@gmail.com>
Date:	2012-10-30

    Updated Greek translation

M	po/el.po

commit da5ea59a91a3a0a679ad9e84f9d9cdd03558a440
Author: Matej Urbančič <mateju@svn.gnome.org>
Date:	2012-10-25

    Updated Slovenian translation

M	help/sl/sl.po

commit 7e25731ad2e921b57651e377acbf9e3decac9427
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2012-10-19

    Updated Spanish translation

M	help/es/es.po

commit a46132113544510803ad9c03a25010ad319e8b26
Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
Date:	2012-10-17

    Added Latvian translation

M	po/LINGUAS
A	po/lv.po

commit cf5bf48b821dd7fe62037c3d7c464c549880b7b4
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-10-17

    Dummy commit to test the itstool functionality on Damned Lies

M	po/de.po

commit eb71b33d66bf5e81d3417edce1a224efa619f505
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-10-04

    Added Sigel template

M	AUTHORS
M	templates/misc-iso-templates.xml

commit 933a3996cf531177ba200d8ce21b753033f33530
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-24

    Some fixes around itstool

M	help/C/about.page
M	help/C/basicusage.page
M	help/C/createnew.page
M	help/C/customize.page
M	help/C/customtemplate.page
M	help/C/editprop.page
M	help/C/index.page
M	help/C/labelprop.page
M	help/C/mancreate.page
M	help/C/merge-ex1.page
M	help/C/merge-ex2.page
M	help/C/merge-ex3.page
M	help/C/merge-ex4.page
M	help/C/merge.page
M	help/C/mergefeatures.page
M	help/C/multifile.page
M	help/C/newlabel.page
M	help/C/printfile.page
M	help/C/select.page
M	help/C/skipfields.page

commit ad8e5a2f73991152989b75f2860c31ab562c6924
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-23

    Fixed menu entry for the user docs

M	src/ui-commands.c

commit 431595191971940954bc843973cee1a2466cecac
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date:	2012-09-23

    First try to migrate to itstool

M	Makefile.am
M	autogen.sh
M	configure.ac
M	help/Makefile.am

commit 35637bb33b5cbe5b4937cf6bd328b0d232a9d687
Author: Jim Evins <evins@snaught.com>
Date:	2012-09-22

    Fix validation problems with desktop file.

    Fixes bug #684612.	Removed png extension from Icon.  Also removed
    deprecated
    Encoding key.

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

commit 3337c1bb1a0fbe677f9aacde21dd93eea08f0bd5
Author: Jim Evins <evins@snaught.com>
Date:	2012-09-17

    Preparation for 3.0.1

M	NEWS
M	configure.ac
M	templates/Makefile.am

commit 8e726680fe879928c5f75e252f21de1a7cc51e90