update to 2.2.8

changes:
-New templates
-bugfixes
-translation updates

3 files changed, 69 insertions, 8 deletions

diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 6c4a69472af..7dc7f13ee1f 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2010/01/18 09:59:22 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2010/04/28 18:40:55 drochner Exp $
 #
 
-DISTNAME=		glabels-2.2.6
-PKGREVISION=		1
+DISTNAME=		glabels-2.2.8
 CATEGORIES=		print
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=glabels/}
 
diff --git a/print/glabels/PLIST b/print/glabels/PLIST
index a41aa76ab07..52f6ef36444 100644
--- a/print/glabels/PLIST
+++ b/print/glabels/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/11/15 20:13:42 drochner Exp $
+@comment $NetBSD: PLIST,v 1.12 2010/04/28 18:40:55 drochner Exp $
 bin/glabels
 bin/glabels-batch
 include/libglabels/category.h
@@ -37,6 +37,7 @@ share/glabels/templates/misc-iso-templates.xml
 share/glabels/templates/misc-other-templates.xml
 share/glabels/templates/misc-us-templates.xml
 share/glabels/templates/paper-sizes.xml
+share/glabels/templates/pearl-templates.xml
 share/glabels/templates/zweckform-iso-templates.xml
 share/gnome/help/glabels/C/figures/glabels-template-cd.png
 share/gnome/help/glabels/C/figures/glabels-template-label.png
@@ -57,6 +58,24 @@ share/gnome/help/glabels/C/figures/print-copies.png
 share/gnome/help/glabels/C/figures/print-merge.png
 share/gnome/help/glabels/C/glabels.xml
 share/gnome/help/glabels/C/legal.xml
+share/gnome/help/glabels/cs/figures/glabels-template-cd.png
+share/gnome/help/glabels/cs/figures/glabels-template-label.png
+share/gnome/help/glabels/cs/figures/glabels-template-layout.png
+share/gnome/help/glabels/cs/figures/main-window-empty.png
+share/gnome/help/glabels/cs/figures/merge-ex1-1.png
+share/gnome/help/glabels/cs/figures/merge-ex1-2.png
+share/gnome/help/glabels/cs/figures/merge-ex1-3.png
+share/gnome/help/glabels/cs/figures/merge-ex1-4.png
+share/gnome/help/glabels/cs/figures/merge-ex2-1.png
+share/gnome/help/glabels/cs/figures/merge-ex2-2.png
+share/gnome/help/glabels/cs/figures/merge-ex2-3.png
+share/gnome/help/glabels/cs/figures/merge-ex2-4.png
+share/gnome/help/glabels/cs/figures/merge-ex3-1.png
+share/gnome/help/glabels/cs/figures/merge-ex3-2.png
+share/gnome/help/glabels/cs/figures/object-editor-sidebar.png
+share/gnome/help/glabels/cs/figures/print-copies.png
+share/gnome/help/glabels/cs/figures/print-merge.png
+share/gnome/help/glabels/cs/glabels.xml
 share/gnome/help/glabels/de/figures/glabels-template-cd.png
 share/gnome/help/glabels/de/figures/glabels-template-label.png
 share/gnome/help/glabels/de/figures/glabels-template-layout.png
@@ -75,6 +94,42 @@ share/gnome/help/glabels/de/figures/object-editor-sidebar.png
 share/gnome/help/glabels/de/figures/print-copies.png
 share/gnome/help/glabels/de/figures/print-merge.png
 share/gnome/help/glabels/de/glabels.xml
+share/gnome/help/glabels/es/figures/glabels-template-cd.png
+share/gnome/help/glabels/es/figures/glabels-template-label.png
+share/gnome/help/glabels/es/figures/glabels-template-layout.png
+share/gnome/help/glabels/es/figures/main-window-empty.png
+share/gnome/help/glabels/es/figures/merge-ex1-1.png
+share/gnome/help/glabels/es/figures/merge-ex1-2.png
+share/gnome/help/glabels/es/figures/merge-ex1-3.png
+share/gnome/help/glabels/es/figures/merge-ex1-4.png
+share/gnome/help/glabels/es/figures/merge-ex2-1.png
+share/gnome/help/glabels/es/figures/merge-ex2-2.png
+share/gnome/help/glabels/es/figures/merge-ex2-3.png
+share/gnome/help/glabels/es/figures/merge-ex2-4.png
+share/gnome/help/glabels/es/figures/merge-ex3-1.png
+share/gnome/help/glabels/es/figures/merge-ex3-2.png
+share/gnome/help/glabels/es/figures/object-editor-sidebar.png
+share/gnome/help/glabels/es/figures/print-copies.png
+share/gnome/help/glabels/es/figures/print-merge.png
+share/gnome/help/glabels/es/glabels.xml
+share/gnome/help/glabels/fr/figures/glabels-template-cd.png
+share/gnome/help/glabels/fr/figures/glabels-template-label.png
+share/gnome/help/glabels/fr/figures/glabels-template-layout.png
+share/gnome/help/glabels/fr/figures/main-window-empty.png
+share/gnome/help/glabels/fr/figures/merge-ex1-1.png
+share/gnome/help/glabels/fr/figures/merge-ex1-2.png
+share/gnome/help/glabels/fr/figures/merge-ex1-3.png
+share/gnome/help/glabels/fr/figures/merge-ex1-4.png
+share/gnome/help/glabels/fr/figures/merge-ex2-1.png
+share/gnome/help/glabels/fr/figures/merge-ex2-2.png
+share/gnome/help/glabels/fr/figures/merge-ex2-3.png
+share/gnome/help/glabels/fr/figures/merge-ex2-4.png
+share/gnome/help/glabels/fr/figures/merge-ex3-1.png
+share/gnome/help/glabels/fr/figures/merge-ex3-2.png
+share/gnome/help/glabels/fr/figures/object-editor-sidebar.png
+share/gnome/help/glabels/fr/figures/print-copies.png
+share/gnome/help/glabels/fr/figures/print-merge.png
+share/gnome/help/glabels/fr/glabels.xml
 share/gtk-doc/html/libglabels/ch01.html
 share/gtk-doc/html/libglabels/ch02.html
 share/gtk-doc/html/libglabels/ch03.html
@@ -99,6 +154,7 @@ share/gtk-doc/html/libglabels/style.css
 share/gtk-doc/html/libglabels/up.png
 share/locale/ca/LC_MESSAGES/glabels.mo
 share/locale/cs/LC_MESSAGES/glabels.mo
+share/locale/da/LC_MESSAGES/glabels.mo
 share/locale/de/LC_MESSAGES/glabels.mo
 share/locale/eo/LC_MESSAGES/glabels.mo
 share/locale/es/LC_MESSAGES/glabels.mo
@@ -106,9 +162,12 @@ share/locale/fr/LC_MESSAGES/glabels.mo
 share/locale/it/LC_MESSAGES/glabels.mo
 share/locale/ja/LC_MESSAGES/glabels.mo
 share/locale/ko/LC_MESSAGES/glabels.mo
+share/locale/nb/LC_MESSAGES/glabels.mo
 share/locale/pl/LC_MESSAGES/glabels.mo
+share/locale/pt/LC_MESSAGES/glabels.mo
 share/locale/pt_BR/LC_MESSAGES/glabels.mo
 share/locale/ru/LC_MESSAGES/glabels.mo
+share/locale/sl/LC_MESSAGES/glabels.mo
 share/locale/sv/LC_MESSAGES/glabels.mo
 share/locale/zh_CN/LC_MESSAGES/glabels.mo
 share/locale/zh_TW/LC_MESSAGES/glabels.mo
@@ -116,7 +175,10 @@ share/mime-info/glabels.keys
 share/mime-info/glabels.mime
 share/mime/packages/glabels.xml
 share/omf/glabels/glabels-C.omf
+share/omf/glabels/glabels-cs.omf
 share/omf/glabels/glabels-de.omf
+share/omf/glabels/glabels-es.omf
+share/omf/glabels/glabels-fr.omf
 share/pixmaps/glabels-application-x-glabels.png
 share/pixmaps/glabels.png
 share/pixmaps/glabels/ex-1layout.png
diff --git a/print/glabels/distinfo b/print/glabels/distinfo
index c1aebb17685..5b4285f5098 100644
--- a/print/glabels/distinfo
+++ b/print/glabels/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2009/11/15 20:13:42 drochner Exp $
+$NetBSD: distinfo,v 1.11 2010/04/28 18:40:55 drochner Exp $
 
-SHA1 (glabels-2.2.6.tar.gz) = f51ee679072cd5e0e5bfe1e0a7d62265a78003d6
-RMD160 (glabels-2.2.6.tar.gz) = 33f66b3f27914e43d524ce56818ed96bd90e073b
-Size (glabels-2.2.6.tar.gz) = 2829526 bytes
+SHA1 (glabels-2.2.8.tar.gz) = 9b71da53ec3f27e886177a7c9089c8901fbf7fb2
+RMD160 (glabels-2.2.8.tar.gz) = 97506ca496fa35653462850ffd534384ee151733
+Size (glabels-2.2.8.tar.gz) = 3842721 bytes