Upload to unstable

[glabels] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a78e471bb517f138c9399ae1b644a6f12217f178..5cc61c4acaddf47af7f0434c50ee9e41bbfbdfa8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,2543 @@
-commit d01a448a3e9c0719a2adfb6d51591e78148cfee3
+commit e57db9c16130658be12e57f81f41215de4e9d50d
 Author: Jim Evins <evins@snaught.com>
-Date:   2011-05-16
+Date:   2016-04-23
+
+    Some final preparation for 3.4.0.
+
+M      AUTHORS
+M      NEWS
+M      README
+M      configure.ac
+
+commit f09166de12e7a3113d234a2fccf30ec1358a4171
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:  2016-04-13
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit 151c7ccd501b4c5ea55da1394b5393d5f156e657
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-04-13
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+M      po/cs.po
+
+commit c13334665d39fbd09e83d53fbbd4a084da8e0501
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-04-12
+
+    Updated German doc translation
+
+M      help/de/de.po
+
+commit d8be24be28be70bd1ea4581cbfd7de105dd60014
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-04-12
+
+    Fixed logical issue in German translation
+
+M      po/de.po
+
+commit 8b7724075ffd2e852617866a000f2eb0451bfee9
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2016-04-12
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit d7f901a7a2bc9bb24403bed9184762a9952c5b04
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2016-04-12
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 6bc5aa0a09356039c4c36122ab0a92103562b386
+Author: Rafael Fontenelle <rafaelff@gnome.org>
+Date:  2016-04-12
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit e85cda0e27d7ec23ab733d43b9e91c0861bb38c6
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-04-11
+
+    Updated manual page for the new Label properties dialog.
+
+M      help/C/labelprop.page
+
+commit ea0cef41ce6e18ae99a329b85080623f74ca64b2
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2016-04-11
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit 05d49201e0b5549f0b556ee416c7671ac0711c47
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-04-11
+
+    Updated German translation
+
+M      po/de.po
+
+commit 26dbf498143e1a98146dff0cf5ce79565a127fd1
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-04-11
+
+    Added SheetLabels templates
+
+M      templates/sheetlabels-us-templates.xml
+
+commit 212cffd51f6eee69186f195098d6299ae6d261a7
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2016-04-11
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit ed52a7ae4585751c659506805b6064208b32dbed
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-03-31
+
+    Use pre-2.44 GObject boilerplate in new glLabelPropertiesDialog.
+
+    Maintains compatability with older or less bleeding-edge
+    distributions.
+
+M      src/label-properties-dialog.c
+M      src/label-properties-dialog.h
+
+commit dbd7de13a3c6d3d62d7f9cd245d3674d5410c88b
+Author: Balázs Meskó <meskobalazs@gmail.com>
+Date:  2016-03-31
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit cfb648be19b9fc82afeea91f9b9271f9e7d3b00d
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-03-30
+
+    Added a few SheetLabels templates
+
+M      templates/sheetlabels-us-templates.xml
+
+commit e30a5855354169b942c27d332f346cc8a61ae7c5
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-03-30
+
+    Updated German translation
+
+M      po/de.po
+
+commit 966a54971c015dacb123abab77ed5989f42c546f
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-03-30
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit b132259e00150627c23cbcb9ffdf8bff19e041bc
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-03-29
+
+    Added Datamatrix with GS1 input mode barcode type to zint backend.
+
+M      src/bc-backends.c
+M      src/bc-zint.c
+
+commit d0282fa9043f5e5e1c5cd00ff8a4ec0eab29df98
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:  2016-03-24
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit 18b14950c2d929cdda40617bfef2da0aeadcbb16
+Author: GHPS <GHPS@users.noreply.github.com>
+Date:  2016-03-07
+
+    Unified description, fixed English translation, added filing-category
+
+M      templates/zweckform-iso-templates.xml
+
+commit c34d782e781f37a7b5086c35ec78ca40700267b2
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-03-12
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 53362e5dbc67b05e7318de5240cadfdcdbd8f508
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-03-08
+
+    Updated German translation
+
+M      po/de.po
+
+commit e4f6a47abcab7fed87f198f3c62b6da4f1d5a311
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:  2016-03-06
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit ae4aad4994a8a355680c873923b84dd8231aba8d
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-03-06
+
+    Added translation context for "Select Product" (Bug #763003).
+
+M      src/new-label-dialog.c
+
+commit 3c195d74dc71d4facc7c32a49f0219e368db5f0c
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:  2016-03-06
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit 4c4e9491e19bd0f0e102371913b96010d84126c3
+Author: GHPS <GHPS@users.noreply.github.com>
+Date:  2016-03-03
+
+    Update to new Dymo labels, pt -> mm (Dymo official dimensions),
+    file sorted
+
+M      templates/dymo-other-templates.xml
+
+commit 0526c761afa92ee7c008985b1234f1be4e70c8dc
+Author: GHPS <GHPS@users.noreply.github.com>
+Date:  2016-03-03
+
+    New categories for name badges (name-badge) and filing.
+
+M      templates/categories.xml
+
+commit fd29a33c46d4cd344a2e7b7c5864a88531d71e09
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:  2016-03-04
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit c7470d41b65c4d26846cf5ac2aa04189af690f93
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-03-03
+
+    Removed laste vestiges of windowing system or dbus dependencies
+    from glabels-batch.
+
+M      src/font-history-model.c
+M      src/font-history-model.h
+M      src/font-history.c
+M      src/font-history.h
+M      src/glabels-batch.c
+M      src/prefs-model.c
+M      src/prefs.c
+M      src/prefs.h
+M      src/template-history-model.c
+M      src/template-history-model.h
+M      src/template-history.c
+M      src/template-history.h
+
+commit 138ff1b448ed1fe75e674d5006130652c289a8e1
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-03-03
+
+    Fixes for Begalabel templates
+
+M      po/POTFILES.in
+M      templates/Makefile.am
+M      templates/begalabel-templates.xml
+
+commit 193f0e3c97a102220585990d65a2a2a58971fd6b
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-03-03
+
+    Add new Begalabel templates
+
+A      templates/begalabel-templates.xml
+M      templates/vendors.xml
+
+commit 13e6059ad706c4b9c839f598df7a0a3e3bbbd06d
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2016-03-03
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit aa254d8d573e1ace39cee5c7d1f65b8800835262
+Author: Dušan Kazik <prescott66@gmail.com>
+Date:  2016-03-02
+
+    Updated Slovak translation
+
+M      po/sk.po
+
+commit 7a66286430281f7ea1fb1ccb3055fe293ae726ba
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-02-28
+
+    Fix drawing beyond drawing area viewport (bug #762307).
+
+    Fixes Bug #762307. Clip the drawing area's bin_window to a
+    viewport determined by the widget's physical window size and
+    current scroll adjustments.
+
+M      src/view.c
+
+commit 99b749f214affdb3d7fe590f675ea23ba9d7fb23
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-25
+
+    Show changes immediately after rotate/flip
+
+M      src/label.c
+
+commit 46d0313b58e5d0c18f6a1803b6940934c59db199
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-22
+
+    Fix crash on Select All
+
+M      src/object-editor.c
+
+commit 71a6570fad3df336c275f6dd1a12b1ee749d8333
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-25
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit ed04ee3f971c85073417b8a4f7f09078bd80d947
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-25
+
+    Fix typo
+
+M      src/label.c
+
+commit 71b63b09608b5bc1dfeb6037bcf0e9d21030d69f
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-02-24
+
+    Updated German translation
+
+M      po/de.po
+
+commit 215f105bfe9b5436e29873efefdb9ec8067366d2
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-24
+
+    Be more specific comments for translators
+
+M      src/label.c
+
+commit 29cdcc4644e6900fb0913dc37b6f21acc0f52b77
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-24
+
+    Fix typos
+
+M      src/label.c
+
+commit 085265d35e5f67a789ecca4056b66ba66c5ed06f
+Author: Rafael Fontenelle <rffontenelle@gmail.com>
+Date:  2016-02-23
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit 8b1e71279e63cfbd5f2f5f26ce6bc553dff91508
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2016-02-22
+
+    Updated POTFILES.in
+
+M      po/POTFILES.in
+
+commit c719015609b943decb76fbbdf18618227b6654a9
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-18
+
+    Add properties dialog
+
+M      data/ui/Makefile.am
+A      data/ui/label-properties-dialog.ui
+M      src/Makefile.am
+M      src/file.c
+M      src/file.h
+A      src/label-properties-dialog.c
+C058   src/file.h      src/label-properties-dialog.h
+M      src/label.c
+M      src/label.h
+
+commit a8fdd2ef48cd8bd832f6c85c8f2a2903ac39c346
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-14
+
+    Set path for Save As
+
+M      src/file.c
+
+commit c7004d7988d2b47d9f09226301bab2d21f1a12dd
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-17
+
+    Some dimension fixes
+
+M      templates/rayfilm-templates.xml
+
+commit bfd72b4fd652140f7987058e49bae2c62b44696a
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-17
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+
+commit b5e16a792c68cdd5b809b878a4573db7ba83604f
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-13
+
+    Fix text and line shadow color from key
+
+M      src/color.c
+M      src/color.h
+M      src/label-line.c
+M      src/label-text.c
+
+commit cb06227147d7c6eda9074530baabe75307773883
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-13
+
+    Object dragging enhancement
+
+M      src/view-box.c
+M      src/view-box.h
+M      src/view-ellipse.c
+M      src/view-ellipse.h
+M      src/view-line.c
+M      src/view-line.h
+M      src/view.c
+M      src/view.h
+
+commit fbacfb3d00e89daffced4586f4654c65ce2111bd
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-11
+
+    Fix line handle P1 sensitive
+
+M      src/label-object.c
+
+commit aae4fee62cf98b130cfa25a056b35ad203fedb5c
+Author: Windel Bouwman <windel@windel.nl>
+Date:  2016-02-07
+
+    Add full page Bruna template for A4.
+
+M      templates/misc-iso-templates.xml
+
+commit d5ff2a4052fcc0c9b26e3410f69fd2903e704583
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-02-02
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 6c9a0a990219d15eacefc873befe71b966678046
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-02-01
+
+    Updated German translation
+
+M      po/de.po
+
+commit 12aacd1a153b89e91081da811bc4b41235bd1cf9
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-01-31
+
+    Bump version.
+
+M      configure.ac
+
+commit 5b6f8fb1f98967833b9954baa43d50750531d043
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-01-31
+
+    Some cleanup to satisfy distcheck.
+
+M      .gitignore
+M      po/POTFILES.skip
+M      templates/Makefile.am
+
+commit e1a38920a8968afec6949759040f7f393fe5b2be
+Author: Richard Hughes <richard@hughsie.com>
+Date:  2016-01-25
+
+    Update the AppData to spec version 0.7+
+
+M      data/appdata/glabels-3.appdata.xml.in
+
+commit 1f4d83785171ef57e1342dcfeed063c5a00b28d2
+Author: Richard Hughes <richard@hughsie.com>
+Date:  2016-01-25
+
+    Add a missing tag to the AppData file
+
+M      data/appdata/glabels-3.appdata.xml.in
+
+commit d68a06597d8ca19b654138001ee653fb9dd2f80e
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:  2016-01-24
+
+    Updated Chinese (Hong Kong) translation
+    (cherry picked from commit 752f97a141e3613d2aeb4bbf30667716cd4e986f)
+
+M      po/zh_HK.po
+
+commit 419a15ed0b11cfe7a4eaa49f3cc8317a2cded728
+Author: Walter Cheuk <wwycheuk@gmail.com>
+Date:  2016-01-24
+
+    Updated Chinese (Taiwan) translation
+    (cherry picked from commit 861305ac11561bb1dab661d89de3f38db7f28815)
+
+M      po/zh_TW.po
+
+commit b3e7d28f699a196a37aa53fd345af8ef36b2718d
+Author: Marek Černocký <marek@manet.cz>
+Date:  2016-01-31
+
+    Udated Czech translation
+
+M      po/cs.po
+
+commit 626bf4f71bdeb977424a31145842cf58269b09c3
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2016-01-24
+
+    Updated German translation
+
+M      po/de.po
+
+commit 7a93d511a50d066409ddeac313e9a5bad277bd7e
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-01-23
+
+    Fixes to doap file from master.
+
+M      glabels.doap
+
+commit 9b1aa2676512c1d4e2101847a1be38504bdda88a
+Author: Jim Evins <evins@snaught.com>
+Date:  2016-01-23
+
+    Update project meta data.
+
+M      .gitignore
+M      HACKING
+M      README
+M      data/desktop/glabels-3.0.desktop.in
+M      glabels.doap
+
+commit 6efdb7f35c3f0cf8b61178bde5a7912f627bdf7e
+Author: Jiri Grönroos <jiri.gronroos@iki.fi>
+Date:  2016-01-21
+
+    Updated Finnish translation
+
+M      po/fi.po
+
+commit f12018edd8857d91a5d4662fd8d8fbadd505a358
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:  2015-12-31
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit 41a843b11d604be1f76b03ec2c915112f3ce74ac
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2015-12-30
+
+    Updated German translation
+
+M      po/de.po
+
+commit 49d65be25f8eef69fd7b258db342dac07d56c002
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:  2015-12-30
+
+    Updated Serbian translation
+
+M      po/sr.po
+M      po/sr@latin.po
+
+commit 7fc57ed02d2b73badc789020ec9506ffac817ea9
+Author: Jim Evins <evins@snaught.com>
+Date:  2015-12-26
+
+    Reconcile whitespace styles.
+
+M      src/merge-text.c
+
+commit 641ac096f10a846f620551563327da67be16ae67
+Author: Jim Patterson <sf.rs9z@ncf.ca>
+Date:  2015-12-26
+
+    Auto-detect file encoding of CSV files and process accordingly.
+
+    Fixes sourceforge bug# 139. The changes scan any CSV file for a BOM
+    (Byte Order Mark) when it's opened. If one is found, then the getc
+    routine will use g_iconv to convert code sequences to utf-8 before
+    passing them up for processing. Since it checks for the UTF-8 BOM as
+    well as those for UTF-16 and UTF-32, this change also provides a way
+    in which a UTF-8 CSV file can be passed into GLabels on those systems
+    which aren't using UTF-8 as the system codeset. Currently, those
+    files are (it appears) assumed to be in the system code set, and so
+    are a bit problematic.
+
+M      src/merge-text.c
+
+commit 0f73a4fd412c9e4812926747ef8a0ed68d9096c8
+Author: Marek Černocký <marek@manet.cz>
+Date:  2015-12-20
+
+    Fixed typo mm8 -> 8mm
+
+M      templates/endisch-templates.xml
+
+commit c8be3946b6389beb51da7ecafe96854d20383369
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2015-12-17
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 3b3ab61c724d0e83e5a826446642191df57f7a31
+Author: Muhammet Kara <muhammetk@gmail.com>
+Date:  2015-12-13
+
+    Updated Turkish translation
+
+M      po/tr.po
+
+commit f8adad57e31608beb9cca35de3cd0313facda856
+Author: Necdet Yücel <necdetyucel@gmail.com>
+Date:  2015-12-13
+
+    Updated Turkish translation
+    (cherry picked from commit 0d23cb983ceb1eb7fe49c8dd1297c13b8649e40b)
+
+M      po/tr.po
+
+commit 2e2474159e3b7e1f7dfcf778cedc7adbb5801298
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2015-12-13
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit fc69408fa71d9b13788b0fb45a93aaee452eaadb
+Author: Pedro Albuquerque <palbuquerque73@gmail.com>
+Date:  2015-12-13
+
+    Updated Portuguese translation
+
+M      po/pt.po
+
+commit 5dc90f7519e81ab21e04d5885618ea41a9e958c1
+Author: Marek Černocký <marek@manet.cz>
+Date:  2015-12-08
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit f1de8eb10559e97747ba75a0754d622c30a5739c
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2014-12-15
+
+    Fix a typo
+
+    Signed-off-by: Marek Černocký <marek@manet.cz>
+
+M      src/bc-backends.c
+
+commit a393c8109108f04ae5e77b1fa3fa406e2f5c40a8
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2015-12-02
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit bb90018a24d222db468ee0fe5f2377a26ade10e8
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2015-11-21
+
+    Updated German doc translation
+
+M      help/de/de.po
+
+commit 470594f178029d92c77b3f8e221fcb689486aa90
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2015-11-21
+
+    Updated German translation
+
+M      po/de.po
+
+commit 19f231afa72c63c46b58293adc9c30663cd17338
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2015-10-26
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit 3acce37267ce4fdeb978616a65a83c6784ae9255
+Author: Tom Tryfonidis <tomtryf@gmail.com>
+Date:  2015-10-18
+
+    Updated Greek translation
+
+M      po/el.po
+
+commit 5e6cc832e13669dc2e17e17c34208738d29c92d6
+Author: Marek Černocký <marek@manet.cz>
+Date:  2015-09-14
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+
+commit a1c3cccdbb7c8c21f69694f55d06d10bb97b60b7
+Author: Dimitris Spingos <dmtrs32@gmail.com>
+Date:  2015-08-17
+
+    Updated Greek translation
+
+M      help/el/el.po
+
+commit bb3bd64bad2c7b8afcb601370ff065efc1a4c0d0
+Author: Alexandre Franke <alexandre.franke@gmail.com>
+Date:  2015-08-15
+
+    Updated French translation
+
+M      help/fr/fr.po
+
+commit b227668b1a477231a39cd95aab8549797a247032
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2015-08-08
+
+    Updated POTFILES.in
+
+M      po/POTFILES.in
+
+commit 982c22b9e923eca694d6482c42b6afde4a6c8302
+Author: Thomas Steinert <contact.steinert@gmail.com>
+Date:  2015-08-08
+
+    Add Avery L4730 and Cable Lable Co CableBug Labels.
+
+    - Includes some whitespace cleanup in vendor.xml and categories.xml.
+
+M      .gitignore
+M      templates/Makefile.am
+M      templates/avery-iso-templates.xml
+A      templates/cablelabel-templates.xml
+M      templates/categories.xml
+M      templates/vendors.xml
+
+commit a5a1d5e3ccc502d89ec224d4af67b5b1c75226b7
+Author: Anders Jonsson <anders.jonsson@norsjovallen.se>
+Date:  2015-08-07
+
+    Fix typos in manual
+
+M      help/C/customize.page
+M      help/C/mancreate.page
+M      help/C/merge-ex3.page
+
+commit 318e05e03840a452ae7b44f9576485d51bd6585f
+Author: Jim Evins <evins@snaught.com>
+Date:  2015-08-02
+
+    Fixed names of brother templates.
+
+M      templates/brother-other-templates.xml
+
+commit 15786d2aecdca97834ab6ed4f42d83d4592990b4
+Author: Marek Černocký <marek@manet.cz>
+Date:  2015-07-22
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 8b6f024a6d81f10ca74c987571cd30ff55095d37
+Author: Pedro Albuquerque <palbuquerque73@gmail.com>
+Date:  2015-07-19
+
+    Updated Portuguese translation
+
+M      po/pt.po
+
+commit 3a57a96a64b4eb606434a524a85b136c188a12a1
+Author: Balázs Úr <urbalazs@gmail.com>
+Date:  2015-07-18
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit 149b37a7ddf58dd287426443fe9114a5209bca85
+Author: Jim Evins <evins@snaught.com>
+Date:  2015-07-17
+
+    Updated Brother QL-500/550/... templates.
+
+    Updated these templates to use the foomatic ptouch driver. The
+    label sizes and measurements come directly from version 1.1 of
+    the 'Brother-QL-500-ptouch.ppd' file.
+
+    Kept old templates around for backwards compatability.
+
+M      templates/brother-other-templates.xml
+M      templates/vendors.xml
+
+commit 4f3e3e8e3ba98a27e8378fb2ffd38ae9f59d659a
+Author: Pedro Albuquerque <palbuquerque73@gmail.com>
+Date:  2015-07-07
+
+    Updated Portuguese translation
+
+M      po/pt.po
+
+commit 05c43afd5967c441c3568d49629824572745cd90
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2015-06-27
+
+    Updated POTFILES.in
+
+M      po/POTFILES.in
+
+commit 074c6bb6a77d208568bf99a0c02ec01a66e98f18
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2015-06-27
+
+    Add Malte Skoruppa to AUTHORS
+
+M      AUTHORS
+
+commit cc3d2a9547e22d429691471198b45fca9e5ee666
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2015-06-27
+
+    Add Mayspies to vendors
+
+M      templates/vendors.xml
+
+commit 6e682a8b1573b4cff774377f114d5231a9c5b023
+Author: Malte Skoruppa <skoruppa@cs.uni-saarland.de>
+Date:  2015-06-27
+
+    Add new template file for Mayspies
+
+A      templates/mayspies-templates.xml
+
+commit 757777500e690976dabb2e5e4803fcdbf82326b5
+Author: Gábor Kelemen <kelemeng@openscope.org>
+Date:  2015-05-28
+
+    Updated Hungarian translation
+
+M      po/hu.po
+
+commit 2c5e4afcb665478cee337d2939a6a01ec3168d71
+Author: Gabor Kelemen <kelemeng@gnome.hu>
+Date:  2015-05-26
+
+    Initial Hungarian translation by Balazs UR <urbalazs at gmail dot
+    com>, corrections by me
+
+A      po/hu.po
+
+commit 31e12b92e72a93dd3e0a892cc5a4c1557fb7323d
+Author: Gabor Kelemen <kelemeng@gnome.hu>
+Date:  2015-05-26
+
+    Added hu to LINGUAS
+
+M      po/LINGUAS
+
+commit 3480159dacc5c7576562c1fff7bcdd8303347629
+Author: Jordi Mas <jmas@softcatala.org>
+Date:  2015-05-06
+
+    Fixes to Catalan translation
+
+M      po/ca.po
+
+commit d9b453d0b3a79ec74a8e35573ed23fda820f9c5d
+Author: Daniel Șerbănescu <daniel@serbanescu.dk>
+Date:  2015-04-06
+
+    Added Romanian Translation
+
+M      po/LINGUAS
+A      po/ro.po
+
+commit 6e3afc47ed6b8ca72393c740d5dfa489ca8163f2
+Author: Samir Ribic <samir.ribic@etf.unsa.ba>
+Date:  2015-03-13
+
+    Added Bosnian translation
+
+M      po/LINGUAS
+A      po/bs.po
+
+commit 5a6da4851e83b52ba56b3d59c652c29c229b7916
+Author: Dušan Kazik <prescott66@gmail.com>
+Date:  2015-03-11
+
+    Added Slovak translation
+
+M      po/LINGUAS
+A      po/sk.po
+
+commit abb54d7416428501e26f9a121135ddc043034b61
+Author: Tim Waugh <twaugh@redhat.com>
+Date:  2015-01-19
+
+    Handle vcard entries with addresses but no address labels (bug
+    #742441).
+
+    Fixes Bug #742441. A vcard entry that has no address labels but
+    does include
+    structured address components can be handled by fabricating the
+    address label
+    from the address components.
+
+M      src/merge-vcard.c
+
+commit 1dd1d6e1697373140eea0373beb195c0ca4534c0
+Author: Tim Waugh <twaugh@redhat.com>
+Date:  2015-01-06
+
+    Fixed missing contacts when importing from vcard.
+
+    Fixes Bug #742440. After checking for an END line, another line
+    was read
+    before breaking out of the loop. This could have been the BEGIN
+    line for
+    the next record, in which case that record will be lost.
+
+M      src/merge-vcard.c
+
+commit 42d630343f0da1ef616b6252e352e1602832e088
+Author: Åke Engelbrektson <eson57@gmail.com>
+Date:  2015-01-13
+
+    Updated Swedish translation
+
+M      po/sv.po
+
+commit f9ab70e76c6d0493ad388c30ba3d80d27bdb4487
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2014-12-19
+
+    Add a few SheetLabels templates
+
+M      templates/sheetlabels-us-templates.xml
+
+commit bb7d492a4469a92e8d9f56912522c127505ca7cc
+Author: Bruce Dagel <bdagel@machlink.com>
+Date:  2014-12-18
+
+    Add SheetLabels SL 573 template
+
+M      templates/sheetlabels-us-templates.xml
+
+commit 6aab0235a879e6c9dff561a35335958ab056008a
+Author: Muhammet Kara <muhammetk@gmail.com>
+Date:  2014-12-11
+
+    Updated Turkish translation
+
+M      po/tr.po
+
+commit 3e7beab866edeb88bd87742eaa86ff3cb014f41b
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-11-10
+
+    Post 3.2.1 preparation.
+
+M      configure.ac
+
+commit 7956897f0dec97f6297bd438a175e3934bf8ec5e
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-11-09
+
+    Final preparation for 3.2.1.
+
+M      NEWS
+
+commit a3c7ddc68495c9391b2295c0806ce6dcadbaeac0
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Preparation for 3.2.1
+
+M      NEWS
+M      configure.ac
+
+commit 60557cad418e0caf2687f8e365a9e7f7cf1e11ce
+Author: Alexandre Franke <alexandre.franke@gmail.com>
+Date:  2014-11-02
+
+    Updated French translation
+
+M      po/fr.po
+
+commit a19c15779d09aecc5f48556d5f531cf96694bd5d
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:  2014-11-01
+
+    Updated Latvian translation
+
+M      po/lv.po
+
+commit 3700cd8f40e429bb9a562533493a352fc40c3d4e
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Removed obsolete tab-hborder property from media-select UI file.
+
+    Unfortunately, beginning with gtk 3.14, rather than ignoring this
+    obsolete
+    property, having it in a UI file is considered a critical error,
+    thus crashing
+    glabels on newer distributions.
+
+M      data/ui/media-select.ui
+
+commit b66c0076908a706235af21b2c1d3ef04a6ba1f7f
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-10-23
+
+    Added dummy window as parent in warning and critical error handlers.
+
+    In gtk 3.14, creating a message dialog without a parent window
+    causes a crash.  Unfortunately this causes the original error or
+    warning message from being seen by the user.
+
+M      src/critical-error-handler.c
+M      src/warning-handler.c
+
+commit 20975776a273e48bbd5d600cdff7040b159ba162
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-10-05
+
+    Removed Polish translation
+
+    Last updated in 2002 (that's 12 years ago) and with 68 strings
+    translated,
+    it's doing more harm than good at this point. It can always be
+    brought back
+    from git, but it's probably easier to just start from scratch,
+    if anyone's
+    interested.
+
+M      po/LINGUAS
+D      po/pl.po
+
+commit 6f7078360ec06f2baab951c897c05b57dc6b4a42
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2014-04-15
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit b1eae7c6d2430974c409c9a019f4d2b6b52a5628
+Author: Jordi Mas <jmas@softcatala.org>
+Date:  2014-04-06
+
+    Fix typos in Catalan translation
+
+M      po/ca.po
+
+commit 099514976b443da7e26097e1df820c9295cb2acd
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-03-10
+
+    Fix a tag in French help translation
+
+M      help/fr/fr.po
+
+commit fcaf1b13e5f7d411a245c6cc682bb32f5bb002e4
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2014-02-28
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit 535782f91a75f0ad09bea38b373d09ffa1493ded
+Author: Marek Černocký <marek@manet.cz>
+Date:  2014-02-13
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit bcd9e861895c8e10ba8f72e10230f73222bec888
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date:  2014-02-11
+
+    Updated POTFILES.in
+
+M      po/POTFILES.in
+
+commit 83f437bdae66b307066b5bc3a40e8b8ea03f1c51
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-02-09
+
+    Added Canon Type J CD/DVD Tray template.
+
+M      AUTHORS
+M      templates/Makefile.am
+A      templates/canon-other-templates.xml
+M      templates/vendors.xml
+
+commit a65a7dfee1053660679989a9a28ae10d4e589648
+Author: Jim Evins <evins@snaught.com>
+Date:  2014-01-25
+
+    Fix layout problems with center and right text alignment to text box.
+
+    Pango layout width should be 6 pts smaller than text object width
+    to account
+    for a 3 pt margin around layout.
+
+M      src/label-text.c
+
+commit 10eeb5e0e0edfacbd7c2bfb66855b46f02475e80
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2014-01-03
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 69feb397965f45985cf6128d46ba292b4944d115
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2014-01-03
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit c2222b5dfa2865b9b38c43b6eb22368e1efa7d06
+Author: Marek Černocký <marek@manet.cz>
+Date:  2013-12-27
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+
+commit b7081a1bacf28232c7342fdd12f9ec44b8d94f89
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:  2013-11-26
+
+    [l10n] Updated Serbian translations
+
+M      po/sr.po
+M      po/sr@latin.po
+
+commit 5da2300ccdaa0bdb4d38e820cc6ab4f95c664b7f
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date:  2013-10-29
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit b315c9acd46d106710b318d54b8f752358744466
+Author: Jim Evins <evins@snaught.com>
+Date:  2013-10-28
+
+    Preparation for 3.2.0.
+
+M      NEWS
+
+commit 3185fe6c520ca2386bcbb0e4288cdd95c7c1c07e
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2013-10-13
+
+    Updated Slovenian translation
+
+M      po/sl.po
+
+commit e60a0076cf975abc88ae24949867b340d430e678
+Author: Marek Černocký <marek@manet.cz>
+Date:  2013-10-13
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 6da1e7523a81fbf524e8c6c8ccf59c6566e0f3fb
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date:  2013-10-13
+
+    Updated Latvian translation
+
+M      po/lv.po
+
+commit daaf0c74eac5498dffaf947742b91e6e681174bd
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date:  2013-10-12
+
+    Updated Brazilian Portuguese translation
+
+M      po/pt_BR.po
+
+commit f07cd37c71d5a49443ced7f50c834905512922ac
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2013-10-12
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 89e0ba6d44387274aab5f512c7cb499b66a77871
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2013-10-12
+
+    Updated French manual translation
+
+M      help/fr/fr.po
+
+commit f6c1d7ec099672a6dfa5dbae3f1ae9c0b2c39cda
+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
+Author: Hatim Ali <dr.hatim@hotmail.com>
+Date:  2012-09-17
+
+    Added Arabic translation.
+
+M      po/LINGUAS
+A      po/ar.po
+
+commit 0bf9aa6a1022b981dad8b718ec50f466d56743bc
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-09-07
+
+    Fixed calculation of number of pages when printing merge jobs
+
+    Fixes bug #680585. Poorly placed parenthesis caused the calculation
+    of the
+    number of sheets to be wrong whenever starting on any label other
+    than the
+    first one on a page.
+
+M      src/print-op-dialog.c
+
+commit f07b8360fd82befbd06642b0f646325c291d5597
+Author: Timo Jyrinki <timo@debian.org>
+Date:  2012-09-06
+
+    Finnish translation update by Jiri Grönroos
+
+M      po/LINGUAS
+A      po/fi.po
+
+commit 1e8097a4df10a4ac802efe6fd457013c6a9f55dd
+Author: Bruce Cowan <bruce@bcowan.me.uk>
+Date:  2012-09-04
+
+    Adeed British English translation
+
+M      po/LINGUAS
+A      po/en_GB.po
+
+commit a8c50effd6d66ee7948c4938ad062a2816239473
+Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
+Date:  2012-09-04
+
+    Updated Russian translation
+
+M      po/ru.po
+
+commit 338bf28d2d9fc0b0b1950330b6a0ab5e7359433b
+Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
+Date:  2012-09-04
+
+    Updated copyright years
+
+M      src/ui-commands.c
+
+commit 49471d0070c747f10dc209451b700afc142434db
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2012-09-04
+
+    Updated French help translation
+
+M      help/fr/fr.po
+
+commit d86f08b2278658e273558beb281643ccf0e7c8d0
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2012-09-04
+
+    Updated French translation
+
+M      po/fr.po
+
+commit 671bbb8ef104f1fb99de25cc88002dfdc7c69278
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-09-03
+
+    Added APLI 1271 label
+
+M      templates/misc-iso-templates.xml
+
+commit c1885eefcdfa29126dbe814d3f0cdcfc08015469
+Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
+Date:  2012-08-12
+
+    [l10n] Update Japanese translation
+
+    Modify the About label
+
+M      po/ja.po
+
+commit d9594a085ffa6f17ea116aecbd24aa9d349c4b72
+Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
+Date:  2012-08-12
+
+    [l10n] Update Japanese translation
+
+    Merge latest pot
+
+M      po/ja.po
+
+commit 11ad1bb970c8ce47e24db76214b80f076a85470e
+Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
+Date:  2012-01-08
+
+    Updated Japanese translation
+
+M      po/ja.po
+
+commit 7c80dbc86607edd5835419a4b6404bd0e70db1c6
+Author: Andika Triwidada <andika@gmail.com>
+Date:  2012-07-24
+
+    Added Indonesian translation to UI and User Guide
+
+M      help/Makefile.am
+A      help/id/id.po
+M      po/LINGUAS
+A      po/id.po
+
+commit 0a48ec82bbe12a289c7e467af122dbe39d54e9e0
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-07-22
+
+    Make sure word wrap is consistent at all zoom levels.
+
+M      src/label-text.c
+
+commit 83977eda4a92c19f4f8ae44879d5041231b84f80
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-07-14
+
+    Use line spacing when automatically adjusting font size.
+
+    Consider line spacing when automatically adjusting font size to
+    keep within
+    vertical dimension of bounding box.
+
+M      src/label-text.c
+
+commit aed8853e6e6007b9e18341da84b099a1ab9dda31
+Author: Konstantinos Chortis <cograss@yahoo.com>
+Date:  2012-07-12
+
+    Updated Greek help translation
+
+M      help/el/el.po
+
+commit 875974e0832c9a11d046d276e32dc02d8c4a9194
+Author: Konstantinos Chortis <cograss@yahoo.com>
+Date:  2012-07-12
+
+    Added Greek help translation
+
+M      help/Makefile.am
+A      help/el/el.po
+
+commit 1f4a9a4d6e256a708581e37a77a3edd5d5c327d2
+Author: Efstathios Iosifidis <diamond_gr@freemail.gr>
+Date:  2012-07-12
+
+    Added Greek translation
+
+M      po/LINGUAS
+A      po/el.po
+
+commit 642a686f03e5be944a153f995c49e44516717a99
+Author: Samuel Sieb <samuel-gnome@sieb.net>
+Date:  2012-07-10
+
+    Don't add newline when last line is an empty merge field.
+
+    Fixes bug #679600. Fixes problem by only prepending newlines to
+    lines as they
+    are added, except on the first line.
+
+M      src/text-node.c
+
+commit b1edca8e32ac3322dbbad5a63d2151a6092a228c
+Author: Samuel Sieb <samuel-gnome@sieb.net>
+Date:  2012-07-10
+
+    Apply merge shrinkage both horizontally and vertically.
+
+    Implements enhancement suggested in Bug #679594.  When "Allow merge to
+    automatically shrink text" option is selected, allow both the
+    horizontal
+    and vertical dimensions of the text bounding box to trigger this
+    behavior.
+
+M      src/label-text.c
+
+commit c691553a05723f7802f2356a3ed4d096ee1feab1
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-07-08
+
+    Fix font scaling problem.
+
+    Fixes bug #679531. Don't apply font scale twice when "Allow merge to
+    automatically shrink text."  This also correctly applies font
+    scale when
+    line spacing is not 1.
+
+M      src/label-text.c
+
+commit 61788fad790e275ba45005302341c2f5d890d7ca
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-05-01
+
+    Added Sigel template
+
+M      templates/misc-iso-templates.xml
+
+commit 840201bf140c77b6594485d478b6ee130c9c72e8
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-04-21
+
+    Removed reference to unused screenshot.
+
+    Fixes sourceforge bug #3514704
+    (http://sourceforge.net/tracker/index.php?func=detail&aid=3514704&group_id=46122&atid=445116).
+    Removed reference to unused/non-existant screenshot from
+    help/Makefile.am.
+
+M      help/Makefile.am
+
+commit f208a3c2bbb3075c13970c6795a528481ba3d506
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-04-21
+
+    Fix incomplete library dependencies.
+
+    Fixes Sourcforge bug #3514704
+    (http://sourceforge.net/tracker/?func=detail&aid=3514704&group_id=46122&atid=445116).
+    Added missing dependencies to pkg-config files for libglabels and
+    libglbarcode.
+
+M      libglabels/libglabels-3.0.pc.in
+M      libglbarcode/libglbarcode-3.0.pc.in
+
+commit 78a98cda1a6e2673bffdf0278fc0be9dc9926a10
+Author: Joe Hansen <joedalton2@yahoo.dk>
+Date:  2012-04-21
+
+    Updated Danish translation
+
+M      po/da.po
+
+commit 4b6db420d7d21d8777c1d10738d89de16c520490
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date:  2012-04-08
+
+    Updated Slovenian translation
+
+M      help/sl/sl.po
+
+commit 2d8b64f7c2eb5ac29d1eedd1510960e0dc70ad8a
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date:  2012-04-08
+
+    Added Slovenian translation
+
+M      help/sl/sl.po
+
+commit 05b0564b40ca1cea67f6cd14459914b39ca2c69c
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-03-25
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit c06983885014c9cbac39796e51637a27f2f4adfc
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2012-03-22
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 95bbe61fee30d144129f11ca842c87207f011b8a
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-03-18
+
+    Hint about the  migration from gnome-doc-utils to itstool
+
+M      TODO
+
+commit d8504adf1ab5e18e31ec0093e72f72993fd78452
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-03-18
+
+    Added missing xml files to Makefile.am
+
+M      templates/Makefile.am
+
+commit c3f389ba22c86ca1faaaa53342c9bc43bb000a8c
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-03-18
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 21278df5bdb4af4c7cc6f1a56110d7c4e3bcc8a9
+Author: Marek černocký <marek@manet.cz>
+Date:  2012-03-18
+
+    Added new Igepa and Rayfilm templates
+
+A      templates/igepa-templates.xml
+A      templates/rayfilm-templates.xml
+M      templates/vendors.xml
+
+commit 0a70f1cea96245c5b80edd6a65506178ac2f86bd
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-03-18
+
+    Added missing xml files to POTFILES.in
+
+M      po/POTFILES.in
+
+commit e20ef8e3fe1bd88f6eb1dfb0ca2da3691b10d648
+Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
+Date:  2012-03-04
+
+    Added Serbian translation
+
+M      po/LINGUAS
+A      po/sr.po
+A      po/sr@latin.po
+
+commit 094183af76ff377062bcaa213b4aeee41c23f2ec
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-02-26
+
+    Fix invalid schema file.
+
+    Fixes Redhat bug 795241.  Fixes minor errors in schema file: child
+    schema ids
+    are incorrect.
+
+M      data/schemas/org.gnome.glabels-3.gschema.xml.in.in
+
+commit 8bb6ba804d0d9f91e31731451e258bb29cd6c025
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-02-26
+
+    More specific dependencies.
+
+    Fixes bug 669899.  Added finer grain dependencies to libglabels and
+    libglbarcode.
+
+M      configure.ac
+
+commit 9ebb9e62a91639b34878275a7d627ff39309326f
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-02-25
+
+    Added Desmat template
+
+M      AUTHORS
+M      po/POTFILES.in
+A      templates/desmat-templates.xml
+M      templates/vendors.xml
+
+commit 3893ab23a9e7210740d5a7ccf0e3d763e11048bf
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-02-17
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 181df0f23155c19818b250b0c970b5f16bb51e0c
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2012-01-29
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit a8d81b84d87266d5e2513068f7f8f316352b68ac
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2012-01-29
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit a608963262d9ff192259c11fd4a9a6cb88706f11
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2012-01-29
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 24bca86c6e0ba5f68c4cfc00fd20bd525713194f
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2012-01-29
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 76079b979a047260c5a1e58887d51a27c8c2a9d5
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-29
+
+    Added new screenshots
+
+M      help/C/figures/merge-ex3-2.png
+M      help/C/figures/print-copies.png
+
+commit ae661707369f6cd111c5f3bb3c36d464638fc6af
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-29
+
+    Added new screenshot
+
+M      help/C/figures/print-merge.png
+
+commit 91c30c10aa65b0b42e67019628837c8f851592e1
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-29
+
+    Added new screenshots to match the Adwaita style
+
+M      help/C/figures/introduction-glabels-main-window.png
+M      help/C/figures/merge-ex1-1.png
+M      help/C/figures/merge-ex1-2.png
+M      help/C/figures/merge-ex1-3.png
+M      help/C/figures/merge-ex1-4.png
+M      help/C/figures/merge-ex2-1.png
+M      help/C/figures/merge-ex2-2.png
+M      help/C/figures/merge-ex3-3.png
+M      help/C/figures/merge-ex3-4.png
+M      help/C/figures/object-editor-sidebar.png
+
+commit 360168e7d2887b87895abcd2d58746be605bc054
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-29
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 3b5cfb6eef8bca1c48497f28729e8f08b3ccfbeb
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-28
+
+    [i18n] Added missing file to POTFILES
+
+M      po/POTFILES.in
+
+commit 98d8954fffe00c2f48dc30d9191c0c9c27e7dba9
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-28
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 994c8afc198c67532661c0f89f0715dd74aaddbf
+Author: Gaz Davidson <gaz@bitplane.net>
+Date:  2012-01-28
+
+    Added Q-CONNECT template
+
+M      AUTHORS
+M      templates/misc-iso-templates.xml
+M      templates/vendors.xml
+
+commit 5637571945adbadaaa8861364c751ec3045b0bee
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date:  2012-01-28
+
+    Added acknowledgement for new templates
+
+M      AUTHORS
+
+commit c14f227ddafe1f623a1f9c0978b11750a6aa3ede
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-28
+
+    Added Endisch templates
+
+A      templates/endisch-templates.xml
+M      templates/vendors.xml
+
+commit 6b7da2b054019e900df0bd248a518a5f5a3f99cf
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-28
+
+    Added ISO 217 paper sizes
+
+M      templates/paper-sizes.xml
+
+commit c821271c41201e099f1f1d491a926d1aea9c22c0
+Author: James Le Cuirot <chewi@aura-online.co.uk>
+Date:  2012-01-22
+
+    New text vertical alignment feature.
+
+    Adds vertical alignment feature for text objects.
+    Added appropriate icons (evins@snaught.com).
+
+M      data/icons/22x22/Makefile.am
+A      data/icons/22x22/actions/glabels-align-text-bottom.png
+A      data/icons/22x22/actions/glabels-align-text-middle.png
+A      data/icons/22x22/actions/glabels-align-text-top.png
+M      data/icons/24x24/Makefile.am
+A      data/icons/24x24/actions/glabels-align-text-bottom.png
+A      data/icons/24x24/actions/glabels-align-text-middle.png
+A      data/icons/24x24/actions/glabels-align-text-top.png
+M      data/ui/object-editor.ui
+M      data/ui/property-bar.ui
+M      src/label-object.c
+M      src/label-object.h
+M      src/label-text.c
+M      src/label.c
+M      src/label.h
+M      src/object-editor-private.h
+M      src/object-editor-text-page.c
+M      src/object-editor.c
+M      src/str-util.c
+M      src/ui-property-bar.c
+M      src/xml-label.c
+M      templates/glabels-3.0.dtd
+
+commit 7734f6d7687226eec5b8a475d8c3519e276c24b7
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-20
+
+    Fixed Czech translation
+
+M      po/cs.po
+
+commit 087096d9b5af32da26e09295d715033f9ebb700d
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-20
+
+    Fixed Czech translation
+
+M      help/cs/cs.po
+
+commit 98c1a064c999c8df492495a3b0ab58822f2c92de
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-20
+
+    Fixed Czech translation
+
+M      help/cs/cs.po
+
+commit 907418a0fc402afff06945f116486f06a7a46617
+Author: Jim Evins <evins@snaught.com>
+Date:  2012-01-07
+
+    Fixed Avery 5160 template.
+
+    Fixes bug 667239.  Fixed incorrect horizontal pitch and left edge
+    measurements
+    for the built-in Avery 5160 template.
+
+M      templates/avery-us-templates.xml
+
+commit d2abdcd5f0f635091b70d85e58ed814959399f8d
+Author: Marek Černocký <marek@manet.cz>
+Date:  2012-01-07
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 53e301fb7807be198532340335ca66c4cd335717
+Author: Yuri Myasoedov <omerta13@yandex.ru>
+Date:  2012-01-04
+
+    Updated Russian translation
+
+M      help/Makefile.am
+A      help/ru/ru.po
+
+commit 3e9c5f5d8cbeff6e12ba18bc1705fbf822ca2ce5
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-12-28
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit 0a0b2202aa9f849fe41951e9481ab67233cd6478
+Author: Schlomo Schapiro <schlomoschapiro@users.sf.net>
+Date:  2011-12-19
+
+    Added new Avery template
+
+M      AUTHORS
+M      templates/avery-iso-templates.xml
+
+commit 17e378b63644677ed7881cb30c864af051759329
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-11-27
+
+    Added more Sheetlabels templates
+
+M      templates/sheetlabels-us-templates.xml
+
+commit a0261738f608c7b98281e0738e50ac67ed061900
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-11-27
+
+    Moved Sheetlabels template to its own file
+
+M      po/POTFILES.in
+M      templates/misc-us-templates.xml
+A      templates/sheetlabels-us-templates.xml
+
+commit ae8c1d4bfaed6619ca8449cfc41a5b0f8aa9b8a6
+Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
+Date:  2011-11-10
+
+    Updated Esperanto translation
+
+M      po/eo.po
+
+commit bc995f4694d9b4196172ab17b60eaacdb78d89b1
+Author: Yuri Myasoedov <omerta13@yandex.ru>
+Date:  2011-10-31
+
+    Updated Russian translation
+
+M      po/ru.po
+
+commit 7e7ecc846195095e0d3fa095e6f7622e3655705c
+Author: Jim Evins <evins@snaught.com>
+Date:  2011-10-23
+
+    Fixed incorrect clip region for rectangular templates.
+
+M      src/cairo-label-path.c
+
+commit 395cf5ad4720a50a4c50022b0589e3d2785da116
+Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
+Date:  2011-10-16
+
+    Updated Russian translation
+
+M      po/ru.po
+
+commit 47d4822c631f154f7d92d024ade753381fcbc286
+Author: Bruno Brouard <annoa.b@gmail.com>
+Date:  2011-10-08
+
+    Updated French doc translation
+
+A      help/fr/figures/glabels-template-cd-label.png
+A      help/fr/figures/glabels-template-circle-label.png
+A      help/fr/figures/glabels-template-ellipse-label.png
+A      help/fr/figures/glabels-template-rect-label.png
+A      help/fr/figures/introduction-glabels-main-window.png
+A      help/fr/figures/merge-ex1-1.png
+A      help/fr/figures/merge-ex1-2.png
+A      help/fr/figures/merge-ex1-3.png
+A      help/fr/figures/merge-ex1-4.png
+A      help/fr/figures/merge-ex2-1.png
+A      help/fr/figures/merge-ex2-2.png
+A      help/fr/figures/merge-ex2-3.png
+A      help/fr/figures/merge-ex2-4.png
+A      help/fr/figures/merge-ex3-1.png
+A      help/fr/figures/merge-ex3-2.png
+A      help/fr/figures/merge-ex3-3.png
+A      help/fr/figures/merge-ex3-4.png
+A      help/fr/figures/object-editor-sidebar.png
+A      help/fr/figures/print-copies.png
+A      help/fr/figures/print-merge.png
+A      help/fr/figures/skip-fields-output.png
+A      help/fr/figures/skip-fields-screenshot.png
+M      help/fr/fr.po
+
+commit 4dfef01ff7629e7acf70d1eb1f5be228456100ee
+Author: Bruce Dagel <bdagel@machlink.com>
+Date:  2011-09-09
+
+    Added SheetLabels label
+
+M      AUTHORS
+M      templates/misc-us-templates.xml
+M      templates/vendors.xml
+
+commit bc183301da0e6eca83d1e3d62635ead009e5c4ef
+Author: Arnaud van Cortenbosch <arnaud.van.cortenbosch@ens.fr>
+Date:  2011-09-09
+
+    Added Agipa label
+
+M      AUTHORS
+M      templates/misc-iso-templates.xml
+
+commit 9b724a1296adf22f2c38eaf5fff1ed5ca575178d
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date:  2011-08-26
+
+    Updated Norwegian bokmål translation
+
+M      po/nb.po
+
+commit b49ec7326fbb1c56f9c587452f79ac73ae15bda4
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-08-19
+
+    [l10n] Updated German translation
+
+M      po/de.po
+
+commit a4e2886f44832c8f58f35313489da20fc1073b29
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-08-13
+
+    Updated Spanish translation
+
+M      po/es.po
+
+commit 5166fd6aa4533de486d74937107025436a401ba0
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-08-09
+
+    Updated Czech translation
+
+M      po/cs.po
+
+commit 9087da6d083e7dd9ad495a417958fcb7d66c39a1
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-08-04
+
+    Added missing filename to POTFILES.in
+
+M      po/POTFILES.in
+
+commit 7d9129105d2599a87a4b49936940c2c9248bddfe
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-07-29
+
+    Added Microapp template
+
+A      templates/microapp-templates.xml
+M      templates/vendors.xml
+
+commit b613b24bc2fd8aceb6a9a391529691527a33d36f
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-07-23
+
+    Updated filenamein man page
+
+M      data/man/glabels-3.1
+
+commit 35071c2addc324f51169de2d2b132d4f0afbdcf0
+Author: Kjartan Maraas <kmaraas@gnome.org>
+Date:  2011-07-18
+
+    Updated Norwegian bokmål translation
+
+M      po/nb.po
+
+commit ae0f82fd1ac14890a6e3a928d66f289117eef5a0
+Author: Marek Černocký <marek@manet.cz>
+Date:  2011-07-04
+
+    Updated Czech translation
+
+M      help/cs/cs.po
+
+commit fd3c17c7f04daa66d21624d3fcc759cb78f3c280
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date:  2011-06-23
+
+    Updated Spanish translation
+
+M      help/es/es.po
+
+commit 0540ee1ee8fb1b6ea4afbc6bc0d7b70585fe7c97
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-06-20
+
+    [l10n] Updated German doc translation
+
+M      help/de/de.po
+
+commit 379225ae22948f662ae7b4e49bf5685e3a4c5197
+Author: Mario Blättermann <mariobl@gnome.org>
+Date:  2011-06-20
+
+    [l10n] Added note about multiple layout including example
+
+A      help/C/figures/layouts-cdlabel.png
+M      help/C/mancreate.page
+
+commit fdfa831e34fd57b8b4f288f69e7deb6377fccbb9
+Author: du baodao <centerpoint@139.com>
+Date:  2011-05-23
+
+    update zh_CN translation
+
+M      po/zh_CN.po
+
+commit ba95e14aecc5748b934c268c3c40eacaac2adf45
+Author: Claude Paroz <claude@2xlibre.net>
+Date:  2011-05-05
+
+    Updated French translation
+
+    Reapplied this commit.  I accidentally undid it when I merged the
+    3.0 branch
+    back onto master.
+
+M      po/fr.po
+
+commit 86c9519cd2ef47aeb8959f93871861c6f130818f
+Author: Takeshi AIHANA <takeshi.aihana@gmail.com>
+Date:  2011-05-21
+
+    Updated Japanese translation.
+
+M      po/ja.po
+
+commit 9fa49670448efc62cc3546b2c0ec25ab780f05b2
+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
+commit 2870c062a7b8dd81da439abda69509a91398d3ac
 Author: Jim Evins <evins@snaught.com>
 Date:  2011-05-16
 
@@ -26,15 +2556,15 @@ M templates/jac-iso-templates.xml
 M      templates/misc-iso-templates.xml
 M      templates/pearl-iso-templates.xml
 
-commit 4c07f4f573f171a64bbe7119d3c97a043123f8b6
+commit ed1bd711911a456e552297967754072345ebbda2
 Author: Jim Evins <evins@snaught.com>
-Date:  2011-05-15
+Date:  2011-05-21
 
     Preparation for 3.0 release.
 
-D      MESSAGE-OF-DOOM
 M      Makefile.am
 M      configure.ac
+M      po/fr.po
 
 commit 29073d4b56183bcb43dc859d17e7c079482e5a63
 Author: Claude Paroz <claude@2xlibre.net>
@@ -4516,11 +7046,11 @@ M       .gitignore
 M      docs/libglabels/Makefile.am
 R094   docs/libglabels/libglabels-docs.sgml
 docs/libglabels/libglabels-3.0-docs.sgml
-R100   docs/libglabels/libglabels-overrides.txt
+R100   docs/libglabels/libglabels.types
 docs/libglabels/libglabels-3.0-overrides.txt
 R099   docs/libglabels/libglabels-sections.txt
 docs/libglabels/libglabels-3.0-sections.txt
-R100   docs/libglabels/libglabels.types
+R100   docs/libglabels/libglabels-overrides.txt
 docs/libglabels/libglabels-3.0.types
 R100   docs/libglabels/tmpl/libglabels-unused.sgml
 docs/libglabels/tmpl/libglabels-3.0-unused.sgml
@@ -6661,63 +9191,63 @@ R100    glabels2/NEWS   NEWS
 R100   glabels2/README README
 R100   glabels2/TODO   TODO
 R100   glabels2/autogen.sh     autogen.sh
-R100   glabels1/barcode-0.98/COPYING   barcode-0.98/COPYING
-R100   glabels1/barcode-0.98/ChangeLog barcode-0.98/ChangeLog
-R100   glabels1/barcode-0.98/INSTALL   barcode-0.98/INSTALL
+R100   glabels2/barcode-0.98/COPYING   barcode-0.98/COPYING
+R100   glabels2/barcode-0.98/ChangeLog barcode-0.98/ChangeLog
+R100   glabels2/barcode-0.98/INSTALL   barcode-0.98/INSTALL
 R100   glabels2/barcode-0.98/Makefile.am       barcode-0.98/Makefile.am
 R100   glabels2/barcode-0.98/Makefile.in.dist
 barcode-0.98/Makefile.in.dist
-R100   glabels1/barcode-0.98/README    barcode-0.98/README
+R100   glabels2/barcode-0.98/README    barcode-0.98/README
 R100   glabels2/barcode-0.98/README.glabels
 barcode-0.98/README.glabels
-R100   glabels1/barcode-0.98/TODO      barcode-0.98/TODO
-R100   glabels1/barcode-0.98/barcode.h barcode-0.98/barcode.h
-R100   glabels1/barcode-0.98/barcode.spec      barcode-0.98/barcode.spec
-R100   glabels1/barcode-0.98/bookland/bookland.py
+R100   glabels2/barcode-0.98/TODO      barcode-0.98/TODO
+R100   glabels2/barcode-0.98/barcode.h barcode-0.98/barcode.h
+R100   glabels2/barcode-0.98/barcode.spec      barcode-0.98/barcode.spec
+R100   glabels2/barcode-0.98/bookland/bookland.py
 barcode-0.98/bookland/bookland.py
-R100   glabels1/barcode-0.98/cmdline.c barcode-0.98/cmdline.c
-R100   glabels1/barcode-0.98/cmdline.h barcode-0.98/cmdline.h
-R100   glabels1/barcode-0.98/codabar.c barcode-0.98/codabar.c
-R100   glabels1/barcode-0.98/code128.c barcode-0.98/code128.c
-R100   glabels1/barcode-0.98/code39.c  barcode-0.98/code39.c
-R100   glabels1/barcode-0.98/code93.c  barcode-0.98/code93.c
-R100   glabels1/barcode-0.98/compat/getopt.c
+R100   glabels2/barcode-0.98/cmdline.c barcode-0.98/cmdline.c
+R100   glabels2/barcode-0.98/cmdline.h barcode-0.98/cmdline.h
+R100   glabels2/barcode-0.98/codabar.c barcode-0.98/codabar.c
+R100   glabels2/barcode-0.98/code128.c barcode-0.98/code128.c
+R100   glabels2/barcode-0.98/code39.c  barcode-0.98/code39.c
+R100   glabels2/barcode-0.98/code93.c  barcode-0.98/code93.c
+R100   glabels2/barcode-0.98/compat/getopt.c
 barcode-0.98/compat/getopt.c
-R100   glabels1/barcode-0.98/compat/getopt.h
+R100   glabels2/barcode-0.98/compat/getopt.h
 barcode-0.98/compat/getopt.h
 R100   glabels2/barcode-0.98/configure barcode-0.98/configure
 R100   glabels2/barcode-0.98/configure.in.dist
 barcode-0.98/configure.in.dist
-R100   glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
+R100   glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
 barcode-0.98/contrib/barcode-SVG.tar.gz
-R100   glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+R100   glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
 barcode-0.98/contrib/barcode-SVG.tar.gz.README
-R100   glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+R100   glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
 barcode-0.98/contrib/barcode-for-delphi.tar.gz
-R100   glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+R100   glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
 barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
-R100   glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
+R100   glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
 barcode-0.98/contrib/barcodeps-0.1.tgz
-R100   glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+R100   glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
 barcode-0.98/contrib/barcodeps-0.1.tgz.README
-R100   glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
+R100   glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
 barcode-0.98/contrib/grab-0.0.4.tar.gz
-R100   glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+R100   glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
 barcode-0.98/contrib/grab-0.0.4.tar.gz.README
-R100   glabels1/barcode-0.98/debian/README.debian
+R100   glabels2/barcode-0.98/debian/README.debian
 barcode-0.98/debian/README.debian
-R100   glabels1/barcode-0.98/debian/changelog
+R100   glabels2/barcode-0.98/debian/changelog
 barcode-0.98/debian/changelog
-R100   glabels1/barcode-0.98/debian/control
+R100   glabels2/barcode-0.98/debian/control
 barcode-0.98/debian/control
-R100   glabels1/barcode-0.98/debian/copyright
+R100   glabels2/barcode-0.98/debian/copyright
 barcode-0.98/debian/copyright
-R100   glabels1/barcode-0.98/debian/dirs       barcode-0.98/debian/dirs
-R100   glabels1/barcode-0.98/debian/info       barcode-0.98/debian/info
-R100   glabels1/barcode-0.98/debian/rules      barcode-0.98/debian/rules
-R100   glabels1/barcode-0.98/doc/Makefile.in
+R100   glabels2/barcode-0.98/debian/dirs       barcode-0.98/debian/dirs
+R100   glabels2/barcode-0.98/debian/info       barcode-0.98/debian/info
+R100   glabels2/barcode-0.98/debian/rules      barcode-0.98/debian/rules
+R100   glabels2/barcode-0.98/doc/Makefile.in
 barcode-0.98/doc/Makefile.in
-R100   glabels1/barcode-0.98/doc/README        barcode-0.98/doc/README
+R100   glabels2/barcode-0.98/doc/README        barcode-0.98/doc/README
 R100   glabels2/barcode-0.98/doc/barcode.info
 barcode-0.98/doc/barcode.info
 R100   glabels2/barcode-0.98/doc/barcode.pdf
@@ -6726,25 +9256,25 @@ R100    glabels2/barcode-0.98/doc/barcode.ps
 barcode-0.98/doc/barcode.ps
 R100   glabels2/barcode-0.98/doc/barcodedoc.txt
 barcode-0.98/doc/barcodedoc.txt
-R100   glabels1/barcode-0.98/doc/doc.barcode
+R100   glabels2/barcode-0.98/doc/doc.barcode
 barcode-0.98/doc/doc.barcode
-R100   glabels1/barcode-0.98/doc/infofilter
+R100   glabels2/barcode-0.98/doc/infofilter
 barcode-0.98/doc/infofilter
-R100   glabels1/barcode-0.98/doc/manpager      barcode-0.98/doc/manpager
-R100   glabels1/barcode-0.98/doc/mktxt barcode-0.98/doc/mktxt
-R100   glabels1/barcode-0.98/doc/texi2html     barcode-0.98/doc/texi2html
-R100   glabels1/barcode-0.98/ean.c     barcode-0.98/ean.c
-R100   glabels1/barcode-0.98/i25.c     barcode-0.98/i25.c
-R100   glabels1/barcode-0.98/install-sh        barcode-0.98/install-sh
-R100   glabels1/barcode-0.98/library.c barcode-0.98/library.c
-R100   glabels1/barcode-0.98/main.c    barcode-0.98/main.c
+R100   glabels2/barcode-0.98/doc/manpager      barcode-0.98/doc/manpager
+R100   glabels2/barcode-0.98/doc/mktxt barcode-0.98/doc/mktxt
+R100   glabels2/barcode-0.98/doc/texi2html     barcode-0.98/doc/texi2html
+R100   glabels2/barcode-0.98/ean.c     barcode-0.98/ean.c
+R100   glabels2/barcode-0.98/i25.c     barcode-0.98/i25.c
+R100   glabels2/barcode-0.98/install-sh        barcode-0.98/install-sh
+R100   glabels2/barcode-0.98/library.c barcode-0.98/library.c
+R100   glabels2/barcode-0.98/main.c    barcode-0.98/main.c
 R100   glabels2/barcode-0.98/missing   barcode-0.98/missing
-R100   glabels1/mkinstalldirs  barcode-0.98/mkinstalldirs
-R100   glabels1/barcode-0.98/msi.c     barcode-0.98/msi.c
-R100   glabels1/barcode-0.98/pcl.c     barcode-0.98/pcl.c
-R100   glabels1/barcode-0.98/plessey.c barcode-0.98/plessey.c
-R100   glabels1/barcode-0.98/ps.c      barcode-0.98/ps.c
-R100   glabels1/barcode-0.98/sample.c  barcode-0.98/sample.c
+R100   glabels2/barcode-0.98/mkinstalldirs     barcode-0.98/mkinstalldirs
+R100   glabels2/barcode-0.98/msi.c     barcode-0.98/msi.c
+R100   glabels2/barcode-0.98/pcl.c     barcode-0.98/pcl.c
+R100   glabels2/barcode-0.98/plessey.c barcode-0.98/plessey.c
+R100   glabels2/barcode-0.98/ps.c      barcode-0.98/ps.c
+R100   glabels2/barcode-0.98/sample.c  barcode-0.98/sample.c
 R100   glabels2/configure.in   configure.in
 R100   glabels2/data/Makefile.am       data/Makefile.am
 R100   glabels2/data/builder/Makefile.am       data/builder/Makefile.am
@@ -6843,13 +9373,61 @@ D       glabels1/TODO
 D      glabels1/acconfig.h
 D      glabels1/aclocal.m4
 D      glabels1/autogen.sh
+D      glabels1/barcode-0.98/COPYING
+D      glabels1/barcode-0.98/ChangeLog
+D      glabels1/barcode-0.98/INSTALL
 D      glabels1/barcode-0.98/Makefile.in
+D      glabels1/barcode-0.98/README
+D      glabels1/barcode-0.98/TODO
+D      glabels1/barcode-0.98/barcode.h
+D      glabels1/barcode-0.98/barcode.spec
+D      glabels1/barcode-0.98/bookland/bookland.py
+D      glabels1/barcode-0.98/cmdline.c
+D      glabels1/barcode-0.98/cmdline.h
+D      glabels1/barcode-0.98/codabar.c
+D      glabels1/barcode-0.98/code128.c
+D      glabels1/barcode-0.98/code39.c
+D      glabels1/barcode-0.98/code93.c
+D      glabels1/barcode-0.98/compat/getopt.c
+D      glabels1/barcode-0.98/compat/getopt.h
 D      glabels1/barcode-0.98/configure
 D      glabels1/barcode-0.98/configure.in
+D      glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz
+D      glabels1/barcode-0.98/contrib/barcode-SVG.tar.gz.README
+D      glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz
+D      glabels1/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
+D      glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz
+D      glabels1/barcode-0.98/contrib/barcodeps-0.1.tgz.README
+D      glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz
+D      glabels1/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
+D      glabels1/barcode-0.98/debian/README.debian
+D      glabels1/barcode-0.98/debian/changelog
+D      glabels1/barcode-0.98/debian/control
+D      glabels1/barcode-0.98/debian/copyright
+D      glabels1/barcode-0.98/debian/dirs
+D      glabels1/barcode-0.98/debian/info
+D      glabels1/barcode-0.98/debian/rules
+D      glabels1/barcode-0.98/doc/Makefile.in
+D      glabels1/barcode-0.98/doc/README
 D      glabels1/barcode-0.98/doc/barcode.info
 D      glabels1/barcode-0.98/doc/barcode.pdf
 D      glabels1/barcode-0.98/doc/barcode.ps
 D      glabels1/barcode-0.98/doc/barcodedoc.txt
+D      glabels1/barcode-0.98/doc/doc.barcode
+D      glabels1/barcode-0.98/doc/infofilter
+D      glabels1/barcode-0.98/doc/manpager
+D      glabels1/barcode-0.98/doc/mktxt
+D      glabels1/barcode-0.98/doc/texi2html
+D      glabels1/barcode-0.98/ean.c
+D      glabels1/barcode-0.98/i25.c
+D      glabels1/barcode-0.98/install-sh
+D      glabels1/barcode-0.98/library.c
+D      glabels1/barcode-0.98/main.c
+D      glabels1/barcode-0.98/msi.c
+D      glabels1/barcode-0.98/pcl.c
+D      glabels1/barcode-0.98/plessey.c
+D      glabels1/barcode-0.98/ps.c
+D      glabels1/barcode-0.98/sample.c
 D      glabels1/config.h.in
 D      glabels1/configure.in
 D      glabels1/data/predefined-labels.template
@@ -6914,6 +9492,7 @@ D glabels1/macros/gnome.m4
 D      glabels1/macros/linger.m4
 D      glabels1/macros/need-declaration.m4
 D      glabels1/missing
+D      glabels1/mkinstalldirs
 D      glabels1/pixmaps/glabels-about-logo.png
 D      glabels1/pixmaps/glabels-icon.png
 D      glabels1/pixmaps/glabels-logo.png
@@ -6990,6 +9569,20 @@ D        glabels1/src/pixmaps/Makefile.am
 D      glabels1/src/pixmaps/arrow.xpm
 D      glabels1/src/pixmaps/barcode.xpm
 D      glabels1/src/pixmaps/box.xpm
+D      glabels1/src/pixmaps/checkerboard.xpm
+D      glabels1/src/pixmaps/collate.xpm
+D      glabels1/src/pixmaps/cursor_barcode.xbm
+D      glabels1/src/pixmaps/cursor_barcode_mask.xbm
+D      glabels1/src/pixmaps/cursor_box.xbm
+D      glabels1/src/pixmaps/cursor_box_mask.xbm
+D      glabels1/src/pixmaps/cursor_ellipse.xbm
+D      glabels1/src/pixmaps/cursor_ellipse_mask.xbm
+D      glabels1/src/pixmaps/cursor_image.xbm
+D      glabels1/src/pixmaps/cursor_image_mask.xbm
+D      glabels1/src/pixmaps/cursor_line.xbm
+D      glabels1/src/pixmaps/cursor_line_mask.xbm
+D      glabels1/src/pixmaps/cursor_text.xbm
+D      glabels1/src/pixmaps/cursor_text_mask.xbm
 D      glabels1/src/pixmaps/cursor_zoomin.xbm
 D      glabels1/src/pixmaps/cursor_zoomin_mask.xbm
 D      glabels1/src/pixmaps/cursor_zoomout.xbm
@@ -6998,6 +9591,7 @@ D glabels1/src/pixmaps/ellipse.xpm
 D      glabels1/src/pixmaps/image.xpm
 D      glabels1/src/pixmaps/line.xpm
 D      glabels1/src/pixmaps/merge.xpm
+D      glabels1/src/pixmaps/nocollate.xpm
 D      glabels1/src/pixmaps/text.xpm
 D      glabels1/src/pixmaps/zoom1to1.xpm
 D      glabels1/src/pixmaps/zoomin.xpm
@@ -7049,76 +9643,15 @@ D       glabels1/src/tools.h
 D      glabels1/src/util.c
 D      glabels1/src/util.h
 D      glabels1/stamp-h.in
-D      glabels2/barcode-0.98/COPYING
-D      glabels2/barcode-0.98/ChangeLog
-D      glabels2/barcode-0.98/INSTALL
-D      glabels2/barcode-0.98/README
-D      glabels2/barcode-0.98/TODO
-D      glabels2/barcode-0.98/barcode.h
-D      glabels2/barcode-0.98/barcode.spec
-D      glabels2/barcode-0.98/bookland/bookland.py
-D      glabels2/barcode-0.98/cmdline.c
-D      glabels2/barcode-0.98/cmdline.h
-D      glabels2/barcode-0.98/codabar.c
-D      glabels2/barcode-0.98/code128.c
-D      glabels2/barcode-0.98/code39.c
-D      glabels2/barcode-0.98/code93.c
-D      glabels2/barcode-0.98/compat/getopt.c
-D      glabels2/barcode-0.98/compat/getopt.h
-D      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz
-D      glabels2/barcode-0.98/contrib/barcode-SVG.tar.gz.README
-D      glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz
-D      glabels2/barcode-0.98/contrib/barcode-for-delphi.tar.gz.README
-D      glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz
-D      glabels2/barcode-0.98/contrib/barcodeps-0.1.tgz.README
-D      glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz
-D      glabels2/barcode-0.98/contrib/grab-0.0.4.tar.gz.README
-D      glabels2/barcode-0.98/debian/README.debian
-D      glabels2/barcode-0.98/debian/changelog
-D      glabels2/barcode-0.98/debian/control
-D      glabels2/barcode-0.98/debian/copyright
-D      glabels2/barcode-0.98/debian/dirs
-D      glabels2/barcode-0.98/debian/info
-D      glabels2/barcode-0.98/debian/rules
-D      glabels2/barcode-0.98/doc/Makefile.in
-D      glabels2/barcode-0.98/doc/README
-D      glabels2/barcode-0.98/doc/doc.barcode
-D      glabels2/barcode-0.98/doc/infofilter
-D      glabels2/barcode-0.98/doc/manpager
-D      glabels2/barcode-0.98/doc/mktxt
-D      glabels2/barcode-0.98/doc/texi2html
-D      glabels2/barcode-0.98/ean.c
-D      glabels2/barcode-0.98/i25.c
-D      glabels2/barcode-0.98/install-sh
-D      glabels2/barcode-0.98/library.c
-D      glabels2/barcode-0.98/main.c
-D      glabels2/barcode-0.98/mkinstalldirs
-D      glabels2/barcode-0.98/msi.c
-D      glabels2/barcode-0.98/pcl.c
-D      glabels2/barcode-0.98/plessey.c
-D      glabels2/barcode-0.98/ps.c
-D      glabels2/barcode-0.98/sample.c
-D      glabels2/src/pixmaps/checkerboard.xpm
-D      glabels2/src/pixmaps/collate.xpm
-D      glabels2/src/pixmaps/cursor_barcode.xbm
-D      glabels2/src/pixmaps/cursor_barcode_mask.xbm
-D      glabels2/src/pixmaps/cursor_box.xbm
-D      glabels2/src/pixmaps/cursor_box_mask.xbm
-D      glabels2/src/pixmaps/cursor_ellipse.xbm
-D      glabels2/src/pixmaps/cursor_ellipse_mask.xbm
-D      glabels2/src/pixmaps/cursor_image.xbm
-D      glabels2/src/pixmaps/cursor_image_mask.xbm
-D      glabels2/src/pixmaps/cursor_line.xbm
-D      glabels2/src/pixmaps/cursor_line_mask.xbm
-D      glabels2/src/pixmaps/cursor_text.xbm
-D      glabels2/src/pixmaps/cursor_text_mask.xbm
-D      glabels2/src/pixmaps/nocollate.xpm
+D      glabels2/help/C/figures/glabels-template-cd.png
+D      glabels2/help/C/figures/glabels-template-label.png
+D      glabels2/help/C/figures/glabels-template-layout.png
 R100   glabels2/gtk-doc.make   gtk-doc.make
-R100   glabels2/help/C/figures/glabels-template-cd.png
+R100   web/doc/templates-2.2/glabels-template-cd.png
 help/C/figures/glabels-template-cd.png
-R100   glabels2/help/C/figures/glabels-template-label.png
+R100   web/doc/templates-2.2/glabels-template-label.png
 help/C/figures/glabels-template-label.png
-R100   glabels2/help/C/figures/glabels-template-layout.png
+R100   web/doc/templates-2.2/glabels-template-layout.png
 help/C/figures/glabels-template-layout.png
 R100   glabels2/help/C/figures/main-window-empty.png
 help/C/figures/main-window-empty.png
@@ -7468,33 +10001,33 @@ R100   glabels2/src/object-editor.h    src/object-editor.h
 R100   glabels2/src/pixbuf-cache.c     src/pixbuf-cache.c
 R100   glabels2/src/pixbuf-cache.h     src/pixbuf-cache.h
 R100   glabels2/src/pixmaps/Makefile.am        src/pixmaps/Makefile.am
-R100   glabels1/src/pixmaps/checkerboard.xpm
+R100   glabels2/src/pixmaps/checkerboard.xpm
 src/pixmaps/checkerboard.xpm
-R100   glabels1/src/pixmaps/collate.xpm        src/pixmaps/collate.xpm
-R100   glabels1/src/pixmaps/cursor_barcode.xbm
+R100   glabels2/src/pixmaps/collate.xpm        src/pixmaps/collate.xpm
+R100   glabels2/src/pixmaps/cursor_barcode.xbm
 src/pixmaps/cursor_barcode.xbm
-R100   glabels1/src/pixmaps/cursor_barcode_mask.xbm
+R100   glabels2/src/pixmaps/cursor_barcode_mask.xbm
 src/pixmaps/cursor_barcode_mask.xbm
-R100   glabels1/src/pixmaps/cursor_box.xbm     src/pixmaps/cursor_box.xbm
-R100   glabels1/src/pixmaps/cursor_box_mask.xbm
+R100   glabels2/src/pixmaps/cursor_box.xbm     src/pixmaps/cursor_box.xbm
+R100   glabels2/src/pixmaps/cursor_box_mask.xbm
 src/pixmaps/cursor_box_mask.xbm
-R100   glabels1/src/pixmaps/cursor_ellipse.xbm
+R100   glabels2/src/pixmaps/cursor_ellipse.xbm
 src/pixmaps/cursor_ellipse.xbm
-R100   glabels1/src/pixmaps/cursor_ellipse_mask.xbm
+R100   glabels2/src/pixmaps/cursor_ellipse_mask.xbm
 src/pixmaps/cursor_ellipse_mask.xbm
-R100   glabels1/src/pixmaps/cursor_image.xbm
+R100   glabels2/src/pixmaps/cursor_image.xbm
 src/pixmaps/cursor_image.xbm
-R100   glabels1/src/pixmaps/cursor_image_mask.xbm
+R100   glabels2/src/pixmaps/cursor_image_mask.xbm
 src/pixmaps/cursor_image_mask.xbm
-R100   glabels1/src/pixmaps/cursor_line.xbm
+R100   glabels2/src/pixmaps/cursor_line.xbm
 src/pixmaps/cursor_line.xbm
-R100   glabels1/src/pixmaps/cursor_line_mask.xbm
+R100   glabels2/src/pixmaps/cursor_line_mask.xbm
 src/pixmaps/cursor_line_mask.xbm
-R100   glabels1/src/pixmaps/cursor_text.xbm
+R100   glabels2/src/pixmaps/cursor_text.xbm
 src/pixmaps/cursor_text.xbm
-R100   glabels1/src/pixmaps/cursor_text_mask.xbm
+R100   glabels2/src/pixmaps/cursor_text_mask.xbm
 src/pixmaps/cursor_text_mask.xbm
-R100   glabels1/src/pixmaps/nocollate.xpm      src/pixmaps/nocollate.xpm
+R100   glabels2/src/pixmaps/nocollate.xpm      src/pixmaps/nocollate.xpm
 R100   glabels2/src/prefs-dialog.c     src/prefs-dialog.c
 R100   glabels2/src/prefs-dialog.h     src/prefs-dialog.h
 R100   glabels2/src/prefs-model.c      src/prefs-model.c
@@ -7674,9 +10207,6 @@ D        web/doc/templates-2.0/glabels-template-cd.png
 D      web/doc/templates-2.0/glabels-template-label.png
 D      web/doc/templates-2.0/glabels-template-layout.png
 D      web/doc/templates-2.0/index.php
-D      web/doc/templates-2.2/glabels-template-cd.png
-D      web/doc/templates-2.2/glabels-template-label.png
-D      web/doc/templates-2.2/glabels-template-layout.png
 D      web/doc/templates-2.2/index.php
 D      web/download/index.php
 D      web/faq/index.php