-commit dbacd9e1737776a65701be50f7eb4d010abba940
-Author: Hatim Ali <dr.hatim@hotmail.com>
-Date: 2012-09-17
+commit 37829049642492bdf38dc07f5e5cfe2058251583
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-10-28
- Added Arabic translation.
+ Preparation for 3.2.0.
+
+M NEWS
+
+commit f83a7be3ae49998ae7707753689f3fb6d02f5f95
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: 2013-10-15
+
+ Updated Spanish translation
+
+M help/es/es.po
+
+commit be522c6a8644dd93ce09d682e28d27f4639234fd
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: 2013-10-15
+
+ Updated Spanish translation
+
+M po/es.po
+
+commit 8e199f487e6389d9b09c5b2cc08c788dc755a0d3
+Author: Matej Urbančič <mateju@svn.gnome.org>
+Date: 2013-10-13
+
+ Updated Slovenian translation
+
+M po/sl.po
+
+commit cf13c952d484d553c68bc87d6c9064f22dc17427
+Author: Marek Černocký <marek@manet.cz>
+Date: 2013-10-13
+
+ Updated Czech translation
+
+M po/cs.po
+
+commit 78123e5af3fa9a3e1c7a7e23012dd960535b53db
+Author: Rūdolfs Mazurs <rudolfsm@src.gnome.org>
+Date: 2013-10-13
+
+ Updated Latvian translation
+
+M po/lv.po
+
+commit 7581fcf2509fc7f73f81482a0ee6fa96efdd0d8e
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date: 2013-10-12
+
+ Updated Brazilian Portuguese translation
+
+M po/pt_BR.po
+
+commit 0498e6ca94e28d39f9498bc433fb3d5ce262224e
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2013-10-12
+
+ [l10n] Updated German translation
+
+M po/de.po
+
+commit 94a070900b814f500f3da45e372e18c968a33825
+Author: Claude Paroz <claude@2xlibre.net>
+Date: 2013-10-12
+
+ Updated French manual translation
+
+M help/fr/fr.po
+
+commit a430c9937118bff27a7c24eb9d9c7b8eab723231
+Author: Claude Paroz <claude@2xlibre.net>
+Date: 2013-10-12
+
+ Updated French translation
+
+M po/fr.po
+
+commit cfeb47947d11c45271bbb86ca357231c3a610778
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-10-10
+
+ Bump version to 3.2.0.
+
+M configure.ac
+
+commit 81bfea5ad77360d2d8f26b61b17ddc4c207ca7d5
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-10-09
+
+ Generated new app and mimetype bitmaps from scalable icons.
+
+M .gitignore
+M data/icons/16x16/apps/glabels-3.0.png
+M data/icons/22x22/apps/glabels-3.0.png
+M data/icons/24x24/apps/glabels-3.0.png
+M data/icons/32x32/apps/glabels-3.0.png
+M data/icons/48x48/apps/glabels-3.0.png
+M data/icons/48x48/mimetypes/application-x-glabels.png
+
+commit 63ad6763093d0ff95b2233bbc54a14029f0217da
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-10-09
+
+ Added scalable app and mimetype icons.
+
+M configure.ac
+M data/icons/Makefile.am
+A data/icons/scalable/Makefile.am
+A data/icons/scalable/apps/glabels-3.0.svg
+A data/icons/scalable/mimetypes/application-x-glabels.svg
+
+commit 11e93788cf275580c27c13eec376f2f9dba56bad
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-10-05
+
+ Added appdata file
+
+M configure.ac
+M data/Makefile.am
+A data/appdata/Makefile.am
+A data/appdata/glabels-3.appdata.xml.in
+M po/POTFILES.in
+
+commit 3e730864d88a9dd9af9fe8ece3a9539ad15d764c
+Author: Timo Jyrinki <timo@debian.org>
+Date: 2013-09-23
+
+ Finnish translation update
+
+M po/fi.po
+
+commit f54e34afe43a049754cd992149eb6fd192bef228
+Author: Enrico Nicoletto <liverig@gmail.com>
+Date: 2013-09-20
+
+ Updated Brazilian Portuguese translation
+
+M help/Makefile.am
+A help/pt_BR/pt_BR.po
+
+commit 065065c183fe3121f76a55a82657e000836bde8d
+Author: Piotr Drąg <piotrdrag@gmail.com>
+Date: 2013-09-15
+
+ Fix a broken tag in German help translation
+
+M help/de/de.po
+
+commit 67bf47d1c529ad76f874d649f232ecd4f8e6f2c0
+Author: Marek Černocký <marek@manet.cz>
+Date: 2013-07-21
+
+ Updated Czech translation
+
+M help/cs/cs.po
+
+commit 450e436800ed173f4300a66009556149a02dad32
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2013-06-26
+
+ [l10n] Updated German doc translation
+
+M help/de/de.po
+
+commit 02617415fef9b490f44fc8aa54998e91a274e41c
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2013-06-26
+
+ [l10n] Updated German translation
+
+M po/de.po
+
+commit 36de4c460e0106357bf34919e4c085fbb00047f6
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-06-23
+
+ Emit selection_changed after delete_selection
+
+ Emit selection_changed signal after a delete_selection. Fixes bug
+ where object
+ editor remained active after an object was deleted.
+
+M src/label.c
+
+commit 063afbdeece38750044f2462837246bb1c8346c6
+Author: James Cloos <cloos@jhcloos.com>
+Date: 2013-06-22
+
+ Embed the text in the printstream as text rather that as an outline
+
+ Fixes bug #702783. Render text directly using pango-cairo API
+ instead of
+ filling text outline path. Original patch modified to still use
+ path to test
+ for selection.
+
+M src/label-text.c
+
+commit 48bdf0059de924880e20fc7641b7b5e6e33476dd
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-06-20
+
+ Add decoration to new label dialog.
+
+ Manually added decorations back to new label dialog that have been
+ deprecated
+ in recent versions of Gtk. Still need to look for proper way to
+ use theming
+ information to select text and background colors.
+
+M data/ui/new-label-dialog.ui
+M src/new-label-dialog.c
+
+commit acb8a0c8e4ee4131b059aeb4544c4ef108dd183c
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-06-16
+
+ Workaround for pango kerning bug.
+
+ Fixes bug #698777. This is a workaround for pango-cairo bug #700592,
+ which is
+ a regression of bug #341481 which was originally fixed back in 2009.
+ This
+ workaround works by rendering the font at device scale rather than
+ world scale.
+ To make this work the actual font size is manually scaled
+ appropriately to
+ compensate for this.
+
+M src/label-text.c
+
+commit e3a8b073f0f914b71279f28630f79f0cfec736e2
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-06-15
+
+ Reconcile object-editor glade file with 3.0.
+
+ Reconciled object-editor glade file with 3.0 version to correct
+ vertical
+ packing of widgets.
+
+ This file should probably be rebuilt to remove gtk+-2 deprecations.
+
+M data/ui/object-editor.ui
+
+commit d3701e7eccee70258b7092848c5009dd1ab0a839
+Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
+Date: 2013-05-31
+
+ l10n: Update Japanese translation
+
+M po/ja.po
+
+commit 748c4120718803a54040400e074db7fd250fc813
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-05-19
+
+ Fixed low hanging deprecations and warnings.
+
+M src/color-combo-button.c
+M src/color-combo.c
+M src/field-button.c
+M src/font-combo-menu-item.c
+M src/font-combo.c
+M src/font-util.c
+M src/label-image.c
+M src/label-object.c
+M src/label-text.c
+M src/label.h
+M src/merge-text.c
+M src/mini-preview.c
+M src/str-util.h
+M src/ui-property-bar.c
+M src/view.c
+M src/window.c
+M src/xml-label.c
+
+commit 329d5bb8abd2962e51fa76655a53357061f100bd
+Author: Jim Evins <evins@snaught.com>
+Date: 2013-05-14
+
+ Fix autogen.sh that was mistakenly broken in previous commit.
+
+M autogen.sh
+
+commit b78e6f1d6ef50cca053ba671dc02826e5dbba91b
+Author: OKANO Takayoshi <kano@na.rim.or.jp>
+Date: 2013-04-27
+
+ l10n: Update Japanese translation
+
+M po/ja.po
+
+commit ce86b981a8a04f8d7ef26c3406a3f8d810c2361f
+Author: Marek Černocký <marek@manet.cz>
+Date: 2013-04-26
+
+ Updated Czech translation
+
+M help/cs/cs.po
+
+commit 090ba2cab4666137839e03b2488cbc40f0851039
+Author: Dimitris Spingos <dmtrs32@gmail.com>
+Date: 2013-04-18
+
+ Updated Greek translation
+
+M help/el/el.po
+
+commit d7daf5a802fdfb252d63995515ae4e930d6665a0
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2013-04-17
+
+ [doc] Notes about creating CSV from kaddressbook and Thunderbird
+
+M help/C/mergefeatures.page
+
+commit 6d5918ace1f8d47b2a0e462d7eeaf6ad4d0220aa
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2013-04-16
+
+ Added more SheetLabels templates
+
+M templates/sheetlabels-us-templates.xml
+
+commit 6b7d7e831e5542b6ea3c15802fa882a42399fc15
+Author: Jasper Lievisse Adriaanse <jasper@humppa.nl>
+Date: 2013-04-01
+
+ unbreak with evolution-data-server >= 3.6.0
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=685130
+
+M src/merge-evolution.c
+M src/merge-vcard.c
+
+commit e4d56c40e66a1bc53974800d8fe48dd5da432878
+Author: Yusuf Bolu <yusufbolu@gmail.com>
+Date: 2013-03-28
+
+ [l10n] Added Turkish translation
M po/LINGUAS
-A po/ar.po
+A po/tr.po
-commit 685a1cbe8bdfb62741ebc04240a8e4e3be513c13
-Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
-Date: 2012-09-09
+commit 41ce4d95a8f4ae1f071f0fd2cb3b00e8d09cb17f
+Author: Marek Černocký <marek@manet.cz>
+Date: 2013-03-21
- Updated Serbian translation
+ Fixed XML
-M po/sr.po
-M po/sr@latin.po
+M help/cs/cs.po
-commit fe92aa394a0affb83ce07b0481bd0df6cc10600a
-Author: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
-Date: 2012-09-04
+commit b13952d2c74cef740f18f9a790471ade2b2b5ae9
+Author: Marek Černocký <marek@manet.cz>
+Date: 2013-02-19
- Updated copyright years
+ 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 9e853cf05c6fd883f4023b436b06b1195b7c6c2f
+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
M src/print-op-dialog.c
-commit d751152ccfcf46bde7c0c167a15dcb3b06038f40
+commit f07b8360fd82befbd06642b0f646325c291d5597
Author: Timo Jyrinki <timo@debian.org>
Date: 2012-09-06
M po/LINGUAS
A po/fi.po
-commit 5c83a2d8550e62ae4af7d0a6b23536a6ffe045e0
+commit 1e8097a4df10a4ac802efe6fd457013c6a9f55dd
Author: Bruce Cowan <bruce@bcowan.me.uk>
Date: 2012-09-04
M po/LINGUAS
A po/en_GB.po
-commit 35528ef1442647c622c0ff2131cc152172c49071
+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
M help/fr/fr.po
-commit cdefaf69dd84b63bd860900b7e10adee8c848d57
+commit d86f08b2278658e273558beb281643ccf0e7c8d0
Author: Claude Paroz <claude@2xlibre.net>
Date: 2012-09-04
M po/fr.po
-commit 032b5380f92f4cd8b60174313805efd137eb8e27
+commit 671bbb8ef104f1fb99de25cc88002dfdc7c69278
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-09-03
M templates/misc-iso-templates.xml
-commit f57f6c3a32b56249f5de5248c41627cfa0f65ad3
-Author: Kjartan Maraas <kmaraas@gnome.org>
-Date: 2012-08-23
+commit c1885eefcdfa29126dbe814d3f0cdcfc08015469
+Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
+Date: 2012-08-12
- Updated Norwegian bokmål translation
+ [l10n] Update Japanese translation
-M po/nb.po
+ Modify the About label
+
+M po/ja.po
-commit 0122161e0b967a4ed883ad1c8209017e227967c6
+commit d9594a085ffa6f17ea116aecbd24aa9d349c4b72
Author: Jiro Matsuzawa <jmatsuzawa@gnome.org>
Date: 2012-08-12
[l10n] Update Japanese translation
- Modify the About label
+ 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 51018e5473dd40f1053ee8498faf298413d85e49
+commit 7c80dbc86607edd5835419a4b6404bd0e70db1c6
Author: Andika Triwidada <andika@gmail.com>
Date: 2012-07-24
M po/LINGUAS
A po/id.po
-commit aebe524714beaafb2d5a5cc9378a9b31c6bd7cac
+commit 0a48ec82bbe12a289c7e467af122dbe39d54e9e0
Author: Jim Evins <evins@snaught.com>
Date: 2012-07-22
M src/label-text.c
-commit d8db9b1cb2d23e6d1903ac8f7f24b819aed78b0d
+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
M help/el/el.po
-commit 7ea3e026cd5a9968b9bd161f2786dbd360723562
+commit 875974e0832c9a11d046d276e32dc02d8c4a9194
Author: Konstantinos Chortis <cograss@yahoo.com>
Date: 2012-07-12
M help/Makefile.am
A help/el/el.po
-commit 7ca2284d602c610a979a26a31a7b9b74099a88c5
+commit 1f4a9a4d6e256a708581e37a77a3edd5d5c327d2
Author: Efstathios Iosifidis <diamond_gr@freemail.gr>
Date: 2012-07-12
M po/LINGUAS
A po/el.po
-commit bbeb91c70c6177a3045191fd350d59aa3f703e1d
+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
M src/label-text.c
-commit 78a1ca0aaec6eb29dcfcae5c1d2fca23b10374b8
-Author: Martin Srebotnjak <miles@filmsi.net>
-Date: 2012-05-23
-
- Updated Slovenian translation
-
-M help/sl/sl.po
-
-commit 5df60ad44c554ee787b846327100835784ee27d5
+commit 61788fad790e275ba45005302341c2f5d890d7ca
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-05-01
M templates/misc-iso-templates.xml
-commit c19e310f9107478bde95d5e14d538fab24e20b7b
+commit 840201bf140c77b6594485d478b6ee130c9c72e8
Author: Jim Evins <evins@snaught.com>
Date: 2012-04-21
M help/Makefile.am
-commit 861f3351f4f28d588b50ad650021a780e7c45c83
+commit f208a3c2bbb3075c13970c6795a528481ba3d506
Author: Jim Evins <evins@snaught.com>
Date: 2012-04-21
M libglabels/libglabels-3.0.pc.in
M libglbarcode/libglbarcode-3.0.pc.in
-commit fff2caad1a72c0a5b090e55415a5c1fc79bf1564
+commit 78a98cda1a6e2673bffdf0278fc0be9dc9926a10
Author: Joe Hansen <joedalton2@yahoo.dk>
Date: 2012-04-21
M po/da.po
-commit 1f91ab0b5795c80b497a67da48d902f75608809f
-Author: Daniel Mustieles <daniel.mustieles@gmail.com>
-Date: 2012-04-09
+commit 4b6db420d7d21d8777c1d10738d89de16c520490
+Author: Martin Srebotnjak <miles@filmsi.net>
+Date: 2012-04-08
- Updated Spanish translation
+ Updated Slovenian translation
-M po/es.po
+M help/sl/sl.po
-commit c5310abd4ffaf837d09eec6867392816441a05dd
-Author: Martin Srebotnjak <miles@filmsi.net>
+commit 2d8b64f7c2eb5ac29d1eedd1510960e0dc70ad8a
+Author: Matej Urbančič <mateju@svn.gnome.org>
Date: 2012-04-08
- Updated Slovenian translation
+ Added Slovenian translation
M help/sl/sl.po
-commit 713386a222aa4cd493fa448da00da90557b3870b
+commit 05b0564b40ca1cea67f6cd14459914b39ca2c69c
Author: Marek Černocký <marek@manet.cz>
Date: 2012-03-25
M po/cs.po
-commit c43c88ddb85162f32503e27ed01ffc888e35d1c8
-Author: Matej Urbančič <mateju@svn.gnome.org>
-Date: 2012-03-18
+commit c06983885014c9cbac39796e51637a27f2f4adfc
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: 2012-03-22
- Updated Slovenian translation
+ Updated Spanish translation
-M po/sl.po
+M po/es.po
-commit adf7645ebc4040c1c343464c29612abd2df3fb96
+commit 95bbe61fee30d144129f11ca842c87207f011b8a
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-03-18
- [l10n] Updated German translation
+ Hint about the migration from gnome-doc-utils to itstool
-M po/de.po
+M TODO
-commit d35d0b59444c5a85887017e783698e9b353d31dd
+commit d8504adf1ab5e18e31ec0093e72f72993fd78452
Author: Mario Blättermann <mario.blaettermann@gmail.com>
-Date: 2012-03-18
-
- Added missing xml files to POTFILES.in
-
-M po/POTFILES.in
-
-commit 451def260b33e7bceaffcef41ba0cf5d173374be
-Author: Marek černocký <marek@manet.cz>
Date: 2012-03-18
Added missing xml files to Makefile.am
M templates/Makefile.am
-commit 21add8379ec3fedffb7358b6ec996468d941f95f
-Author: Marek černocký <marek@manet.cz>
+commit c3f389ba22c86ca1faaaa53342c9bc43bb000a8c
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-03-18
- Added new vendor definitions
+ [l10n] Updated German translation
-M templates/vendors.xml
+M po/de.po
-commit 57ad3eb68ba78ea4ebbaadccbabb1651bc8060c6
+commit 21278df5bdb4af4c7cc6f1a56110d7c4e3bcc8a9
Author: Marek černocký <marek@manet.cz>
Date: 2012-03-18
A templates/igepa-templates.xml
A templates/rayfilm-templates.xml
+M templates/vendors.xml
-commit 67e92688b05ca4e58858e093703317262ef858ff
-Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
-Date: 2012-03-08
+commit 0a70f1cea96245c5b80edd6a65506178ac2f86bd
+Author: Mario Blättermann <mario.blaettermann@gmail.com>
+Date: 2012-03-18
- Updated Serbian translation
+ Added missing xml files to POTFILES.in
-M po/sr.po
-M po/sr@latin.po
+M po/POTFILES.in
-commit 5e135f378a09a32cf3d564da26cd0037d691dce9
+commit e20ef8e3fe1bd88f6eb1dfb0ca2da3691b10d648
Author: Мирослав Николић <miroslavnikolic@rocketmail.com>
-Date: 2012-03-08
+Date: 2012-03-04
Added Serbian translation
A po/sr.po
A po/sr@latin.po
-commit 425db423416e3ebc8d1e4206bc05d8ccdcb727ba
+commit 094183af76ff377062bcaa213b4aeee41c23f2ec
Author: Jim Evins <evins@snaught.com>
Date: 2012-02-26
M data/schemas/org.gnome.glabels-3.gschema.xml.in.in
-commit 3268a6e76539d4923cc4dfc6c6e9305f4c7dd825
+commit 8bb6ba804d0d9f91e31731451e258bb29cd6c025
Author: Jim Evins <evins@snaught.com>
Date: 2012-02-26
M configure.ac
-commit 3bfd5c12443659a2901734a99cf9b18327514951
+commit 9ebb9e62a91639b34878275a7d627ff39309326f
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-02-25
Added Desmat template
-A AUTHORS
+M AUTHORS
M po/POTFILES.in
A templates/desmat-templates.xml
M templates/vendors.xml
-commit b2a38a7de49dead6ee2075299b1dbba535a77264
+commit 3893ab23a9e7210740d5a7ccf0e3d763e11048bf
Author: Marek Černocký <marek@manet.cz>
Date: 2012-02-17
M po/cs.po
-commit d484bb5f98c1ef8435074c7241f157cb9bd7db1b
-Author: Matej Urbančič <mateju@svn.gnome.org>
-Date: 2012-02-08
+commit 181df0f23155c19818b250b0c970b5f16bb51e0c
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: 2012-01-29
- Updated Slovenian translation
+ Updated Spanish translation
-M po/sl.po
+M help/es/es.po
-commit 8cc4f522e4d29c2343e9a0358a47f9b31c958064
+commit a8d81b84d87266d5e2513068f7f8f316352b68ac
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: 2012-01-29
M po/es.po
-commit 6349090ab4431f080fd40e3995c1912357c36e42
+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
M help/es/es.po
-commit 8e599be69bff194016ddf06876d04edb17d3fe1f
+commit 76079b979a047260c5a1e58887d51a27c8c2a9d5
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-29
M help/C/figures/merge-ex3-2.png
M help/C/figures/print-copies.png
-commit 1845876946e955fdefd1771a0c2bf57e755c7e97
+commit ae661707369f6cd111c5f3bb3c36d464638fc6af
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-29
M help/C/figures/print-merge.png
-commit 59fc5c868fdd454abdc271d451bc65cb632936bf
+commit 91c30c10aa65b0b42e67019628837c8f851592e1
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-29
- Added new screnshots to match the Adwaita style
+ 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-ex3-4.png
M help/C/figures/object-editor-sidebar.png
-commit d1f5d3957abe00591e67fa4bc56cc7ea1c21eb72
+commit 360168e7d2887b87895abcd2d58746be605bc054
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-29
M po/de.po
-commit cf085f7402d05cd4db45cfed8288f0b0875d91ec
+commit 3b5cfb6eef8bca1c48497f28729e8f08b3ccfbeb
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-28
M po/POTFILES.in
-commit e2d438bfe8211ac63d6df90c3c94280f458f83a9
+commit 98d8954fffe00c2f48dc30d9191c0c9c27e7dba9
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-28
M po/de.po
-commit 2f5170b6bab7b753375bdb7cedb76e545038799b
+commit 994c8afc198c67532661c0f89f0715dd74aaddbf
Author: Gaz Davidson <gaz@bitplane.net>
Date: 2012-01-28
Added Q-CONNECT template
-D AUTHORS
+M AUTHORS
M templates/misc-iso-templates.xml
M templates/vendors.xml
-commit 062107e78530d04503eb09eddc64888d44d5cd2b
+commit 5637571945adbadaaa8861364c751ec3045b0bee
Author: Mario Blättermann <mario.blaettermann@gmail.com>
Date: 2012-01-28
M AUTHORS
-commit ddc68bb9658d396fd9ac104aa8cea6a01f48ef31
+commit c14f227ddafe1f623a1f9c0978b11750a6aa3ede
Author: Marek Černocký <marek@manet.cz>
Date: 2012-01-28
A templates/endisch-templates.xml
M templates/vendors.xml
-commit 8021e503f6433bdab046e2fd176ca63c6a418387
+commit 6b7da2b054019e900df0bd248a518a5f5a3f99cf
Author: Marek Černocký <marek@manet.cz>
Date: 2012-01-28
M templates/paper-sizes.xml
-commit fdb9a89e4ef71d00826bdec075e1750d52ff9708
-Author: Matej Urbančič <mateju@svn.gnome.org>
-Date: 2012-01-24
+commit c821271c41201e099f1f1d491a926d1aea9c22c0
+Author: James Le Cuirot <chewi@aura-online.co.uk>
+Date: 2012-01-22
- Updated Slovenian translation
+ New text vertical alignment feature.
-M po/sl.po
+ Adds vertical alignment feature for text objects.
+ Added appropriate icons (evins@snaught.com).
-commit 3c8a290a8e6b02a9051f89aad59a9c75d3075581
-Author: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>
-Date: 2012-01-08
+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
- Updated Japanese translation
+commit 7734f6d7687226eec5b8a475d8c3519e276c24b7
+Author: Marek Černocký <marek@manet.cz>
+Date: 2012-01-20
-M po/ja.po
+ 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
-commit 388696289d950861a97786f79207459d6f653df3
+M help/cs/cs.po
+
+commit 907418a0fc402afff06945f116486f06a7a46617
Author: Jim Evins <evins@snaught.com>
Date: 2012-01-07
M templates/avery-us-templates.xml
-commit 204fed24fe97f6247ad08194b3bde90015186614
+commit d2abdcd5f0f635091b70d85e58ed814959399f8d
Author: Marek Černocký <marek@manet.cz>
Date: 2012-01-07
M po/cs.po
-commit ab44617703ee73e2203c581eb51697a560ad9c70
+commit 53e301fb7807be198532340335ca66c4cd335717
Author: Yuri Myasoedov <omerta13@yandex.ru>
Date: 2012-01-04
M help/Makefile.am
A help/ru/ru.po
-commit ceef9a19d44eab8d84c7f2e57df4f9afc74b9bdb
+commit 3e9c5f5d8cbeff6e12ba18bc1705fbf822ca2ce5
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-12-28
M po/de.po
-commit 83ee6cb3635e3ad9ca802bb4fd85dea6f3d8c556
+commit 0a0b2202aa9f849fe41951e9481ab67233cd6478
Author: Schlomo Schapiro <schlomoschapiro@users.sf.net>
Date: 2011-12-19
M AUTHORS
M templates/avery-iso-templates.xml
-commit 99eafbe69f4d6fefec2d1b2197a9ddd6ce47285c
+commit 17e378b63644677ed7881cb30c864af051759329
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-11-27
M templates/sheetlabels-us-templates.xml
-commit fc30fc3b7e8347053296ee71a9e76581f83d51a4
-Author: Александр Прокудин
-<alexandre.prokoudine@gmail.com>
-Date: 2011-11-27
-
- Reused the Russian translation from master
-
-M po/ru.po
-
-commit b821e7adcaeedd6ce0f22b14288f5770ac407a1e
+commit a0261738f608c7b98281e0738e50ac67ed061900
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-11-27
M templates/misc-us-templates.xml
A templates/sheetlabels-us-templates.xml
-commit 6dd535e24be16abd7291c26118bac92f89648524
+commit ae8c1d4bfaed6619ca8449cfc41a5b0f8aa9b8a6
Author: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>
Date: 2011-11-10
M po/eo.po
-commit 7d9b1744bce35ed788dfac176e995b81127999c0
+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
M src/cairo-label-path.c
-commit 8bbca4e1aa15f233e70ac29f11b0d215e6742e45
+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
A help/fr/figures/skip-fields-screenshot.png
M help/fr/fr.po
-commit 76ca499b8f12ed4e3645249e3b508ac4dae55df9
-Author: Martin Srebotnjak <miles@filmsi.net>
-Date: 2011-09-17
-
- Updated Slovenian translation
-
-M po/sl.po
-
-commit 6ee5b3a10b92915ac2dca6a09f695cafe4021f0e
+commit 4dfef01ff7629e7acf70d1eb1f5be228456100ee
Author: Bruce Dagel <bdagel@machlink.com>
Date: 2011-09-09
M templates/misc-us-templates.xml
M templates/vendors.xml
-commit 969d598adc0a2cac9a69da4897dd58f0d76222bf
+commit bc183301da0e6eca83d1e3d62635ead009e5c4ef
Author: Arnaud van Cortenbosch <arnaud.van.cortenbosch@ens.fr>
Date: 2011-09-09
M AUTHORS
M templates/misc-iso-templates.xml
-commit d30bcacebab2f54bdcb63d6e02c26b1354bba19d
+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
M po/de.po
-commit 1306073c0da29ab608c0cc93858fa0c3fe46b210
-Author: Jorge González <aloriel@gmail.com>
-Date: 2011-08-12
+commit a4e2886f44832c8f58f35313489da20fc1073b29
+Author: Daniel Mustieles <daniel.mustieles@gmail.com>
+Date: 2011-08-13
Updated Spanish translation
M po/es.po
-commit 0dc0465256d9c907e821001c1c4a5c88b08327c4
+commit 5166fd6aa4533de486d74937107025436a401ba0
Author: Marek Černocký <marek@manet.cz>
Date: 2011-08-09
M po/cs.po
-commit 0b3ca9ed7e4705e0aff2eba871108abb057a280d
+commit 9087da6d083e7dd9ad495a417958fcb7d66c39a1
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-08-04
M po/POTFILES.in
-commit c810a2e2d8116325a3820bb692c6cd7717eb12e5
+commit 7d9129105d2599a87a4b49936940c2c9248bddfe
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-07-29
A templates/microapp-templates.xml
M templates/vendors.xml
-commit de04717b9daaad1c196e38fcdd260c35950f9ff0
+commit b613b24bc2fd8aceb6a9a391529691527a33d36f
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-07-23
- Updated filename in man page
+ Updated filenamein man page
M data/man/glabels-3.1
-commit ae8be2a78b93a4dd340ede69766738c608e77da5
+commit 35071c2addc324f51169de2d2b132d4f0afbdcf0
Author: Kjartan Maraas <kmaraas@gnome.org>
Date: 2011-07-18
M po/nb.po
-commit f5670df8644d817ea187510f7f3ce4dbad7d67a0
+commit ae0f82fd1ac14890a6e3a928d66f289117eef5a0
Author: Marek Černocký <marek@manet.cz>
Date: 2011-07-04
M help/cs/cs.po
-commit d5ef3e2a2e33a8faade0abd39306f45f05b12f1c
+commit fd3c17c7f04daa66d21624d3fcc759cb78f3c280
Author: Daniel Mustieles <daniel.mustieles@gmail.com>
Date: 2011-06-23
M help/es/es.po
-commit 1d77595634814aa2b15dfa8c2c53241dddd5bbea
+commit 0540ee1ee8fb1b6ea4afbc6bc0d7b70585fe7c97
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-06-20
M help/de/de.po
-commit 49005cce964906785c60143fdca7c422740830c3
+commit 379225ae22948f662ae7b4e49bf5685e3a4c5197
Author: Mario Blättermann <mariobl@gnome.org>
Date: 2011-06-20
A help/C/figures/layouts-cdlabel.png
M help/C/mancreate.page
-commit 00353e8c806abe5001a01a7c22cebab1a0d80af5
+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
M po/ja.po
-commit d01a448a3e9c0719a2adfb6d51591e78148cfee3
+commit 9fa49670448efc62cc3546b2c0ec25ab780f05b2
Author: Jim Evins <evins@snaught.com>
Date: 2011-05-16
M README
M configure.ac
-commit 12e55e8a835df758b00cdf65532978b6bd508ee7
+commit 2870c062a7b8dd81da439abda69509a91398d3ac
Author: Jim Evins <evins@snaught.com>
Date: 2011-05-16
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>