commit d01a448a3e9c0719a2adfb6d51591e78148cfee3
Author: Jim Evins <evins@snaught.com>
Date:   2011-05-16

    Even more preparation for 3.0.0 release.

M	README
M	configure.ac

commit 12e55e8a835df758b00cdf65532978b6bd508ee7
Author: Jim Evins <evins@snaught.com>
Date:	2011-05-16

    More preparation for 3.0 release

M	NEWS
M	libglabels/lgl-xml.h
M	templates/Makefile.am
M	templates/ascom-iso-templates.xml
M	templates/databecker-iso-templates.xml
M	templates/dataline-iso-templates.xml
M	templates/geha-iso-templates.xml
R099	templates/glabels-2.3.dtd	templates/glabels-3.0.dtd
M	templates/hama-iso-templates.xml
M	templates/jac-iso-templates.xml
M	templates/misc-iso-templates.xml
M	templates/pearl-iso-templates.xml

commit 4c07f4f573f171a64bbe7119d3c97a043123f8b6
Author: Jim Evins <evins@snaught.com>
Date:	2011-05-15

    Preparation for 3.0 release.

D	MESSAGE-OF-DOOM
M	Makefile.am
M	configure.ac

commit 29073d4b56183bcb43dc859d17e7c079482e5a63
Author: Claude Paroz <claude@2xlibre.net>
Date:	2011-05-05

    Updated French translation

M	po/fr.po

commit 6a47b5cdab899590651b0abda7ad34e9f3bcd3e5
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-04-29

    Updated Spanish translation

M	po/es.po

commit ff1569ac39ceb866ead6394033376eff6d2bf940
Author: Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>
Date:	2011-04-25

    Updated Japanese translation

M	po/ja.po

commit 186d2516639549c56cb1f513932f23e08eb769bf
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex2-1.png

commit 63747f9f9684a54cdff32474b8a228d3ab9d1d71
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex1-1.png

commit 3307da9d369704bae244d9501975b6f90caec6c9
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex3-1.png

commit 76ac17d3725ac4ed80e76b9c1e199ac5af80f146
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/merge-ex3-1.png

commit 1e5f1c5c5ecb5733dbfa29a9c81c68613c753c5a
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Czech screenshot

A	help/cs/figures/merge-ex3-1.png

commit b5f72ac136910eaa830b777a126c097595183df2
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech translation

M	po/cs.po

commit 43b1ee240a0eefdc0c30391d21bf0bf15fca0891
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/object-editor-sidebar.png

commit 986b010c2b29f4937ed0fa5bc4eb61704c8ac9e1
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/object-editor-sidebar.png

commit 677a726bcd9c8bcd55e573c35ba288c63c521598
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/skip-fields-screenshot.png

commit 1e9b39dad778cd4ebfac00372bd54f46e973ec09
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/skip-fields-screenshot.png

commit 15b8149e3d0c08e32554c2fe20a78eb53774cde6
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/print-merge.png

commit 6ca652b51d095de7e0eaa92bfeee0f230c3d1dca
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Updated Czech screenshot

M	help/cs/figures/print-copies.png

commit 91557a5e46e0ce14b5365212d9280d9e258141b5
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Unused Czech screenshot

D	help/cs/figures/main-window-empty.png

commit 47891355ecebefb5ae826a2a3f0dfba3a1386e63
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-22

    Czech screenshot

A	help/cs/figures/skip-fields-screenshot.png

commit 500279e89312f9ae2090a89a3feb24fc35b84c10
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-21

    Czech screenshot

A	help/cs/figures/skip-fields-output.png

commit 22acea090ca313b616ebb0c90fcf5846d3885447
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-21

    Updated Czech translation

M	help/cs/cs.po

commit e17dffc422199abd882d4448a4d8fe5672989636
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-19

    Updated Czech translation

M	help/cs/cs.po

commit bf73db190505f297c640bb76ccdde3895f613681
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-18

    Updated Czech translation

M	po/cs.po

commit edc606015a0252f66a57c332dd6524c48e2653d4
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-04-17

    [l10n] Updated German translation

M	po/de.po

commit ec58a44af91d79d9be9fe63f7814327602ba5cd7
Author: Marek Černocký <marek@manet.cz>
Date:	2011-04-17

    Updated Czech translation

M	po/cs.po

commit 6141161e4a031f6b15de83379f6f690096eaa524
Author: Jim Evins <evins@snaught.com>
Date:	2011-04-16

    Reorganization of object alignment menus

    Object alignment menus have been reorganized and menu items renamed to
    remove any ambiguity as to what horizontal versus vertical alignment
    mean.  The new labels and organization attempt to be consistent with
    other graphic applications.

M	src/ui.c

commit 51b590ea08683c08ab39366970c140b1fc6f5eef
Author: Takayoshi OKANO <kano@na.rim.or.jp>
Date:	2011-04-14

    Updated Japanese translation

M	po/ja.po

commit 64d6190bf896630e8c1cafb61bd6132b3e453592
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-04-03

    Updated Spanish translation

M	help/es/es.po

commit 68d10df024493df3045b4a5ebbd88f76ddbb6f45
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-03-03

    Some corrections to the newest Kores template

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

commit ae2c5aa93dcdc9f93de163c6d598373062b15669
Author: Jean-Philippe Guérard <jean-philippe.guerard@tigreraye.org>
Date:	2011-03-03

    Added Korres template

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

commit 67785b3fe46e285c80b5c312aedcda7daff29192
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-27

    Updated Spanish translation

M	help/es/es.po

commit 66d2aa8ed705bbb573571e8ea16328cfbae56731
Author: Jim Evins <evins@snaught.com>
Date:	2011-02-26

    Don't require windowing system for glabels-batch.

    Use gtk_init_check() instead of gtk_init() to initialize GTK.

M	src/glabels-batch.c

commit 7e55002270dda25fc70c379be19396f449d5aa89
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-22

    Updated Spanish translation

M	help/es/es.po

commit bd3208b5cac24a8d6f231a72ed45bb0e73d1bb6e
Author: Jim Evins <evins@snaught.com>
Date:	2011-02-21

    Modified CSV parser.

    Modified CSV parser to more closely follow the format outlined in
    RFC 4180.
    The primary difference is that quoted text cannot be embedded in
    the middle
    of a field.  I.e. the quotes (") should envelope the entire field.
    Legacy
    "escape" rules still apply.

M	src/merge-text.c

commit 61a7ec1126f33c26dcb57fb3423df70df32b8e71
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-20

    Updated Spanish translation

M	help/es/es.po

commit 92192b1e5c37f4a0d2bdf363d80d0c380c4b56a4
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-20

    Updated Spanish translation

M	po/es.po

commit 7dd57e55560e8132dd9d251c640061bbfc235c32
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-14

    Added Avery template

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

commit d1ccf52d5d0ebdd533ad0692e5e375ee90444b63
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-12

    Added Merax template

M	AUTHORS
M	templates/misc-other-templates.xml
M	templates/vendors.xml

commit f9dd2935eefff13bbdcff719801feca62aa8c95a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-07

    Updated Spanish translation

M	help/es/es.po

commit 240cc08cb6b9a9350ea358fb4828f32a5001c16a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-06

    Updated Spanish translation

M	po/es.po

commit d0ec06d8c6f4ec8c3fa26fa946991aa5e904d162
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-02-05

    Updated Spanish translation

M	help/es/es.po

commit 8481ea582aa78a7973d8199062cb3737ad75b07e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Added nl to DOC_LINGUAS

M	help/Makefile.am

commit f8d673a02c64aaffd27304d7b3a50cc26bf55754
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Added initial Dutch doc translation to prevent translating
    actually untranslatable strings

A	help/nl/nl.po

commit 3840d11039df4c6834a4675d7e0a5b6a47ec5d7e
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-02-03

    [l10n] Updated Dutch translation

M	po/nl.po

commit 3943dd1240c9a6ef449fccfd52e7302baf9c5ae4
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2011-02-02

    Updated French doc translation

M	help/fr/fr.po

commit 124cff7d1682058043276ce0ee4845010e25b43a
Author: Bruno Brouard <annoa.b@gmail.com>
Date:	2011-02-02

    Updated French Doc Translation

    Gérard Baylard and Bruno Brouard

D	help/fr/figures/main-window-empty.png
D	help/fr/figures/merge-ex1-1.png
D	help/fr/figures/merge-ex1-2.png
D	help/fr/figures/merge-ex1-3.png
D	help/fr/figures/merge-ex1-4.png
D	help/fr/figures/merge-ex2-1.png
D	help/fr/figures/merge-ex2-2.png
D	help/fr/figures/merge-ex2-3.png
D	help/fr/figures/merge-ex2-4.png
D	help/fr/figures/object-editor-sidebar.png
D	help/fr/figures/print-copies.png
D	help/fr/figures/print-merge.png
M	help/fr/fr.po

commit 0bd38baa90a0f44b58d90bb4c02abd73b84f0f51
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-29

    [l10n] Updated German translation

M	po/de.po

commit ddbff2b17acd43e4e9c67a40158c4d884a8d611e
Author: Marek Černocký <marek@manet.cz>
Date:	2011-01-29

    Updated Czech translation

M	po/cs.po

commit 94e5539014882d3974c84eef6b2fa13acf60dbe1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-27

    Updated Spanish translation

M	help/es/es.po

commit 63cb045c9cc3abbe2af6a62166b891a417ce17f8
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-27

    Updated Spanish translation

M	po/es.po

commit c839157ab3638b4935a8a4021855515d83b07f2b
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-26

    Added acknowledgement for template submission

M	AUTHORS

commit 714ed64ebe1bef13073168e78b9a9a86bb2588dc
Author: Mario Blättermann <mariobl@gnome.org>
Date:	2011-01-26

    Added Brother template, changed obsolete part numbers

M	templates/brother-other-templates.xml

commit cb3d9f9aa69b717f6f6d2870b2eb7aa9bc37215a
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-19

    Updated Spanish translation

M	help/es/es.po

commit 6c28e77fb42ad477370cdd4e104c2a05981951f3
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-16

    Updated Spanish translation

M	po/es.po

commit ebe69bb2755eef349159e9ccfbdc34c1906038e1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-13

    Updated Spanish translation

M	help/es/es.po

commit 69517f49cd41645693dc186f791a7a32203d92ba
Author: Wouter Bolsterlee <wbolster@gnome.org>
Date:	2011-01-08

    Added Dutch translation by Mario Blättermann and Hannie Dumoleyn

M	po/LINGUAS
A	po/nl.po

commit 9b82ba17efaef7634a4be9fef0dd90313ed8e3b1
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date:	2011-01-06

    Updated Spanish translation

M	help/es/es.po