Update to 3.1.0

part of digikam 3.1.0

3 files changed, 164 insertions, 94 deletions

diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 06ee9110e58..5c30fe9dbd1 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2013/02/16 11:22:13 wiz Exp $
+# $NetBSD: Makefile,v 1.84 2013/04/06 09:46:09 markd Exp $
 #
 
-PKGNAME=	kipi-plugins-2.5.0
-DISTNAME=	digikam-2.5.0
-PKGREVISION=	13
+PKGNAME=	kipi-plugins-3.1.0
+DISTNAME=	digikam-3.1.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=digikam/}
 EXTRACT_SUFX=	.tar.bz2
@@ -28,7 +27,7 @@ post-patch:
 	echo "FIND_PACKAGE(Gettext REQUIRED)" >> ${WRKSRC}/CMakeLists.txt
 	echo "ADD_SUBDIRECTORY(po)" >> ${WRKSRC}/CMakeLists.txt
 	ln -s ../../po ${WRKSRC}/po
-	rm ${WRKSRC}/po/*/digikam.po ${WRKSRC}/po/*/libkgeomap.po
+	rm ${WRKSRC}/po/*/digikam.po ${WRKSRC}/po/*/libkgeomap.po ${WRKSRC}/po/*/libkipi.po
 
 SUBST_CLASSES+=		xdg
 SUBST_SED.xdg=		-e "s,/usr/bin/env xdg-open,${PREFIX}/bin/xdg-open,"
diff --git a/graphics/kipi-plugins/PLIST b/graphics/kipi-plugins/PLIST
index dc03aa872c9..a013b50d549 100644
--- a/graphics/kipi-plugins/PLIST
+++ b/graphics/kipi-plugins/PLIST
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.20 2012/03/21 21:03:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.21 2013/04/06 09:46:09 markd Exp $
+bin/avtest
 bin/dngconverter
 bin/dnginfo
 bin/expoblending
-bin/multithread
 bin/panoramagui
 bin/photolayoutseditor
 bin/scangui
@@ -11,6 +11,7 @@ lib/kde4/kipiplugin_advancedslideshow.so
 lib/kde4/kipiplugin_batchprocessimages.so
 lib/kde4/kipiplugin_calendar.so
 lib/kde4/kipiplugin_debianscreenshots.so
+lib/kde4/kipiplugin_dlnaexport.so
 lib/kde4/kipiplugin_dngconverter.so
 lib/kde4/kipiplugin_expoblending.so
 lib/kde4/kipiplugin_facebook.so
@@ -18,8 +19,9 @@ lib/kde4/kipiplugin_flashexport.so
 lib/kde4/kipiplugin_flickrexport.so
 lib/kde4/kipiplugin_galleryexport.so
 lib/kde4/kipiplugin_gpssync.so
-lib/kde4/kipiplugin_htmlexport.so
+lib/kde4/kipiplugin_imageshackexport.so
 lib/kde4/kipiplugin_imageviewer.so
+lib/kde4/kipiplugin_imgurexport.so
 lib/kde4/kipiplugin_ipodexport.so
 lib/kde4/kipiplugin_jpeglossless.so
 lib/kde4/kipiplugin_kioexportimport.so
@@ -39,11 +41,12 @@ lib/kde4/kipiplugin_shwup.so
 lib/kde4/kipiplugin_smug.so
 lib/kde4/kipiplugin_timeadjust.so
 lib/kde4/kipiplugin_vkontakte.so
+lib/kde4/kipiplugin_wikimedia.so
 lib/kde4/kipiplugin_yandexfotki.so
 lib/libPropertyBrowser.a
 lib/libkipiplugins.so
-lib/libkipiplugins.so.2
-lib/libkipiplugins.so.2.0.0
+lib/libkipiplugins.so.3
+lib/libkipiplugins.so.3.0.0
 share/applications/kde4/dngconverter.desktop
 share/applications/kde4/expoblending.desktop
 share/applications/kde4/kipiplugins.desktop
@@ -51,8 +54,10 @@ share/applications/kde4/panoramagui.desktop
 share/applications/kde4/photolayoutseditor.desktop
 share/applications/kde4/scangui.desktop
 share/icons/hicolor/128x128/actions/flash.png
+share/icons/hicolor/128x128/apps/dngconverter.png
 share/icons/hicolor/128x128/apps/photolayoutseditor.png
 share/icons/hicolor/16x16/actions/debianscreenshots.png
+share/icons/hicolor/16x16/actions/dlna.png
 share/icons/hicolor/16x16/actions/expoblending.png
 share/icons/hicolor/16x16/actions/facebook.png
 share/icons/hicolor/16x16/actions/flash.png
@@ -60,13 +65,17 @@ share/icons/hicolor/16x16/actions/flickr.png
 share/icons/hicolor/16x16/actions/gallery.png
 share/icons/hicolor/16x16/actions/gpsimagetag.png
 share/icons/hicolor/16x16/actions/hq.png
+share/icons/hicolor/16x16/actions/imgur.png
 share/icons/hicolor/16x16/actions/ogl.png
+share/icons/hicolor/16x16/actions/panorama.png
 share/icons/hicolor/16x16/actions/picasa.png
 share/icons/hicolor/16x16/actions/piwigo.png
 share/icons/hicolor/16x16/actions/rajce.png
 share/icons/hicolor/16x16/actions/shwup.png
 share/icons/hicolor/16x16/actions/smugmug.png
+share/icons/hicolor/16x16/actions/wikimedia.png
 share/icons/hicolor/16x16/actions/zooomr.png
+share/icons/hicolor/16x16/apps/dngconverter.png
 share/icons/hicolor/16x16/apps/photolayoutseditor.png
 share/icons/hicolor/22x22/actions/debianscreenshots.png
 share/icons/hicolor/22x22/actions/expoblending.png
@@ -75,17 +84,22 @@ share/icons/hicolor/22x22/actions/flash.png
 share/icons/hicolor/22x22/actions/flickr.png
 share/icons/hicolor/22x22/actions/gallery.png
 share/icons/hicolor/22x22/actions/hq.png
+share/icons/hicolor/22x22/actions/imgur.png
+share/icons/hicolor/22x22/actions/panorama.png
 share/icons/hicolor/22x22/actions/picasa.png
 share/icons/hicolor/22x22/actions/piwigo.png
 share/icons/hicolor/22x22/actions/shwup.png
 share/icons/hicolor/22x22/actions/slideshow.png
 share/icons/hicolor/22x22/actions/smugmug.png
+share/icons/hicolor/22x22/actions/wikimedia.png
 share/icons/hicolor/22x22/actions/zooomr.png
+share/icons/hicolor/22x22/apps/dngconverter.png
 share/icons/hicolor/22x22/apps/photolayoutseditor.png
 share/icons/hicolor/32x32/actions/borderimages.png
 share/icons/hicolor/32x32/actions/colorimages.png
 share/icons/hicolor/32x32/actions/convertimages.png
 share/icons/hicolor/32x32/actions/debianscreenshots.png
+share/icons/hicolor/32x32/actions/dlna.png
 share/icons/hicolor/32x32/actions/effectimages.png
 share/icons/hicolor/32x32/actions/expoblending.png
 share/icons/hicolor/32x32/actions/facebook.png
@@ -97,7 +111,10 @@ share/icons/hicolor/32x32/actions/gallery.png
 share/icons/hicolor/32x32/actions/gpsimagetag.png
 share/icons/hicolor/32x32/actions/grayscaleconvert.png
 share/icons/hicolor/32x32/actions/hq.png
+share/icons/hicolor/32x32/actions/imageshack.png
+share/icons/hicolor/32x32/actions/imgur.png
 share/icons/hicolor/32x32/actions/ogl.png
+share/icons/hicolor/32x32/actions/panorama.png
 share/icons/hicolor/32x32/actions/picasa.png
 share/icons/hicolor/32x32/actions/piwigo.png
 share/icons/hicolor/32x32/actions/rajce.png
@@ -107,24 +124,35 @@ share/icons/hicolor/32x32/actions/resizeimages.png
 share/icons/hicolor/32x32/actions/shwup.png
 share/icons/hicolor/32x32/actions/smugmug.png
 share/icons/hicolor/32x32/actions/timeadjust.png
+share/icons/hicolor/32x32/actions/wikimedia.png
 share/icons/hicolor/32x32/actions/zooomr.png
+share/icons/hicolor/32x32/apps/dngconverter.png
 share/icons/hicolor/32x32/apps/photolayoutseditor.png
 share/icons/hicolor/48x48/actions/debianscreenshots.png
+share/icons/hicolor/48x48/actions/dlna.png
 share/icons/hicolor/48x48/actions/expoblending.png
 share/icons/hicolor/48x48/actions/facebook.png
 share/icons/hicolor/48x48/actions/flash.png
 share/icons/hicolor/48x48/actions/flickr.png
 share/icons/hicolor/48x48/actions/gallery.png
 share/icons/hicolor/48x48/actions/hq.png
+share/icons/hicolor/48x48/actions/imageshack.png
+share/icons/hicolor/48x48/actions/imgur.png
+share/icons/hicolor/48x48/actions/panorama.png
 share/icons/hicolor/48x48/actions/picasa.png
 share/icons/hicolor/48x48/actions/piwigo.png
 share/icons/hicolor/48x48/actions/rajce.png
 share/icons/hicolor/48x48/actions/shwup.png
 share/icons/hicolor/48x48/actions/smugmug.png
+share/icons/hicolor/48x48/actions/wikimedia.png
 share/icons/hicolor/48x48/actions/zooomr.png
+share/icons/hicolor/48x48/apps/dngconverter.png
 share/icons/hicolor/48x48/apps/photolayoutseditor.png
+share/icons/hicolor/64x64/actions/dlna.png
+share/icons/hicolor/64x64/actions/imageshack.png
 share/icons/hicolor/64x64/actions/metadataedit.png
 share/icons/hicolor/64x64/actions/rajce.png
+share/icons/hicolor/64x64/apps/dngconverter.png
 share/icons/hicolor/64x64/apps/photolayoutseditor.png
 share/icons/hicolor/scalable/actions/debianscreenshots.svgz
 share/icons/hicolor/scalable/actions/facebook.svgz
@@ -132,27 +160,72 @@ share/icons/hicolor/scalable/actions/flash.svgz
 share/icons/hicolor/scalable/actions/flickr.svgz
 share/icons/hicolor/scalable/actions/gallery.svgz
 share/icons/hicolor/scalable/actions/hq.svgz
+share/icons/hicolor/scalable/actions/imgur.svgz
+share/icons/hicolor/scalable/actions/panorama.svgz
 share/icons/hicolor/scalable/actions/picasa.svgz
 share/icons/hicolor/scalable/actions/piwigo.svgz
 share/icons/hicolor/scalable/actions/smugmug.svgz
+share/icons/hicolor/scalable/actions/wikimedia.svgz
 share/icons/hicolor/scalable/actions/zooomr.svgz
-share/icons/oxygen/128x128/apps/dngconverter.png
+share/icons/hicolor/scalable/apps/dngconverter.svgz
 share/icons/oxygen/128x128/apps/rawconverter.png
-share/icons/oxygen/16x16/apps/dngconverter.png
 share/icons/oxygen/16x16/apps/rawconverter.png
-share/icons/oxygen/22x22/apps/dngconverter.png
 share/icons/oxygen/22x22/apps/rawconverter.png
-share/icons/oxygen/32x32/apps/dngconverter.png
 share/icons/oxygen/32x32/apps/rawconverter.png
-share/icons/oxygen/48x48/apps/dngconverter.png
 share/icons/oxygen/48x48/apps/rawconverter.png
-share/icons/oxygen/64x64/apps/dngconverter.png
 share/icons/oxygen/64x64/apps/rawconverter.png
-share/icons/oxygen/scalable/apps/dngconverter.svgz
 share/icons/oxygen/scalable/apps/rawconverter.svgz
 share/kde/apps/gpssync/bookmarks-marker.png
 share/kde/apps/gpssync/searchmarker-normal.png
 share/kde/apps/gpssync/searchmarker-selected.png
+share/kde/apps/kipi/kipiplugin_acquireimagesui.rc
+share/kde/apps/kipi/kipiplugin_advancedslideshowui.rc
+share/kde/apps/kipi/kipiplugin_batchprocessimagesui.rc
+share/kde/apps/kipi/kipiplugin_calendarui.rc
+share/kde/apps/kipi/kipiplugin_debianscreenshotsui.rc
+share/kde/apps/kipi/kipiplugin_dlnaexportui.rc
+share/kde/apps/kipi/kipiplugin_dngconverterui.rc
+share/kde/apps/kipi/kipiplugin_expoblendingui.rc
+share/kde/apps/kipi/kipiplugin_facebookui.rc
+share/kde/apps/kipi/kipiplugin_flashexportui.rc
+share/kde/apps/kipi/kipiplugin_flickrexportui.rc
+share/kde/apps/kipi/kipiplugin_galleryexportui.rc
+share/kde/apps/kipi/kipiplugin_gpssyncui.rc
+share/kde/apps/kipi/kipiplugin_imageshackexportui.rc
+share/kde/apps/kipi/kipiplugin_imageviewerui.rc
+share/kde/apps/kipi/kipiplugin_imgurexportui.rc
+share/kde/apps/kipi/kipiplugin_ipodexportui.rc
+share/kde/apps/kipi/kipiplugin_jpeglosslessui.rc
+share/kde/apps/kipi/kipiplugin_kioexportimportui.rc
+share/kde/apps/kipi/kipiplugin_kmlexportui.rc
+share/kde/apps/kipi/kipiplugin_kopeteui.rc
+share/kde/apps/kipi/kipiplugin_metadataeditui.rc
+share/kde/apps/kipi/kipiplugin_panoramaui.rc
+share/kde/apps/kipi/kipiplugin_photolayoutseditorui.rc
+share/kde/apps/kipi/kipiplugin_picasawebexportui.rc
+share/kde/apps/kipi/kipiplugin_piwigoexportui.rc
+share/kde/apps/kipi/kipiplugin_printimagesui.rc
+share/kde/apps/kipi/kipiplugin_rajceexportui.rc
+share/kde/apps/kipi/kipiplugin_rawconverterui.rc
+share/kde/apps/kipi/kipiplugin_removeredeyesui.rc
+share/kde/apps/kipi/kipiplugin_sendimagesui.rc
+share/kde/apps/kipi/kipiplugin_shwupui.rc
+share/kde/apps/kipi/kipiplugin_smugui.rc
+share/kde/apps/kipi/kipiplugin_timeadjustui.rc
+share/kde/apps/kipi/kipiplugin_vkontakteui.rc
+share/kde/apps/kipi/kipiplugin_wikimediaui.rc
+share/kde/apps/kipi/kipiplugin_yandexfotkiui.rc
+share/kde/apps/kipi/tips
+share/kde/apps/kipiplugin_dlnaexport/xml/dlnaexport_connectionmanager_source_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/dlnaexport_contentdirectory_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/dlnaexport_mediaserver_description.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_avtransport_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_connectionmanager_sink_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_connectionmanager_source_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_contentdirectory_scpd.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_mediarenderer_description.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_mediaserver_description.xml
+share/kde/apps/kipiplugin_dlnaexport/xml/herqq_renderingcontrol_scpd.xml
 share/kde/apps/kipiplugin_expoblending/pics/assistant-enfuse.png
 share/kde/apps/kipiplugin_expoblending/pics/assistant-preprocessing.png
 share/kde/apps/kipiplugin_expoblending/pics/assistant-stack.png
@@ -163,78 +236,6 @@ share/kde/apps/kipiplugin_flashexport/index3.template
 share/kde/apps/kipiplugin_flashexport/index4.template
 share/kde/apps/kipiplugin_flashexport/simpleviewer_html/space.png
 share/kde/apps/kipiplugin_galleryexport/pics/gallery_logo.png
-share/kde/apps/kipiplugin_htmlexport/THEME_HOWTO
-share/kde/apps/kipiplugin_htmlexport/themes/classic/classic.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/classic/gohome.png
-share/kde/apps/kipiplugin_htmlexport/themes/classic/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/classic/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/classic/up.png
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/black.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/blue.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/brown.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/cleanframes.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/green.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/lavender.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/pink.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/red.css
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/star.png
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/cleanframes/yellow.css
-share/kde/apps/kipiplugin_htmlexport/themes/dateframes/dateframes.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/dateframes/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/dateframes/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/details/details.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/details/next.png
-share/kde/apps/kipiplugin_htmlexport/themes/details/next_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/details/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/details/previous.png
-share/kde/apps/kipiplugin_htmlexport/themes/details/previous_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/details/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/details/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/details/up.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/back.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/floating_cards.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/forward.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/next.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/prev.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/floating_cards/up.png
-share/kde/apps/kipiplugin_htmlexport/themes/frames/frames.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/frames/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/frames/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/frames/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/matrix/bg.png
-share/kde/apps/kipiplugin_htmlexport/themes/matrix/matrix.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/matrix/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/matrix/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/matrix/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/s0/arrows_source.svg
-share/kde/apps/kipiplugin_htmlexport/themes/s0/next.png
-share/kde/apps/kipiplugin_htmlexport/themes/s0/next_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/s0/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/s0/previous.png
-share/kde/apps/kipiplugin_htmlexport/themes/s0/previous_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/s0/s0.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/s0/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/s0/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/s0/up.png
-share/kde/apps/kipiplugin_htmlexport/themes/simple/dark.css
-share/kde/apps/kipiplugin_htmlexport/themes/simple/natural.css
-share/kde/apps/kipiplugin_htmlexport/themes/simple/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/simple/simple.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/simple/template.xsl
-share/kde/apps/kipiplugin_htmlexport/themes/snow/next.png
-share/kde/apps/kipiplugin_htmlexport/themes/snow/next.svg
-share/kde/apps/kipiplugin_htmlexport/themes/snow/next_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/snow/preview.png
-share/kde/apps/kipiplugin_htmlexport/themes/snow/previous.png
-share/kde/apps/kipiplugin_htmlexport/themes/snow/previous_disabled.png
-share/kde/apps/kipiplugin_htmlexport/themes/snow/snow.desktop
-share/kde/apps/kipiplugin_htmlexport/themes/snow/style.css
-share/kde/apps/kipiplugin_htmlexport/themes/snow/template.xsl
 share/kde/apps/kipiplugin_imageviewer/pics/hand.png
 share/kde/apps/kipiplugin_imageviewer/pics/nullImage.png
 share/kde/apps/kipiplugin_imageviewer/pics/zoom.png
@@ -258,6 +259,7 @@ share/kde/apps/kipiplugin_printimages/templates/4_photos_3.5x5.desktop
 share/kde/apps/kipiplugin_printimages/templates/4_photos_4.5x5cm.desktop
 share/kde/apps/kipiplugin_printimages/templates/4_photos_9x13cm.desktop
 share/kde/apps/kipiplugin_printimages/templates/4x6Album.desktop
+share/kde/apps/kipiplugin_printimages/templates/6_photos_3.5x4.5cm.desktop
 share/kde/apps/kipiplugin_printimages/templates/6_photos_3.5x4cm.desktop
 share/kde/apps/kipiplugin_printimages/templates/8_photos_6x9cm.desktop
 share/kde/apps/kipiplugin_printimages/templates/Album-Collage.desktop
@@ -273,11 +275,19 @@ share/kde/apps/kipiplugin_removeredeyes/controlwidget.svg
 share/kde/apps/kipiplugin_removeredeyes/removeredeyes_classifier_eye_20_20.xml
 share/kde/apps/photolayoutseditor/photolayoutseditorui.rc
 share/kde/config.kcfg/PLEConfigSkeleton.kcfgc
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear boy.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear girl.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux Black.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux White.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a boy.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a girl.ple
+share/kde/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Tux Rider.ple
 share/kde4/services/kipiplugin_acquireimages.desktop
 share/kde4/services/kipiplugin_advancedslideshow.desktop
 share/kde4/services/kipiplugin_batchprocessimages.desktop
 share/kde4/services/kipiplugin_calendar.desktop
 share/kde4/services/kipiplugin_debianscreenshots.desktop
+share/kde4/services/kipiplugin_dlnaexport.desktop
 share/kde4/services/kipiplugin_dngconverter.desktop
 share/kde4/services/kipiplugin_expoblending.desktop
 share/kde4/services/kipiplugin_facebook.desktop
@@ -285,8 +295,9 @@ share/kde4/services/kipiplugin_flashexport.desktop
 share/kde4/services/kipiplugin_flickrexport.desktop
 share/kde4/services/kipiplugin_galleryexport.desktop
 share/kde4/services/kipiplugin_gpssync.desktop
-share/kde4/services/kipiplugin_htmlexport.desktop
+share/kde4/services/kipiplugin_imageshackexport.desktop
 share/kde4/services/kipiplugin_imageviewer.desktop
+share/kde4/services/kipiplugin_imgurexport.desktop
 share/kde4/services/kipiplugin_ipodexport.desktop
 share/kde4/services/kipiplugin_jpeglossless.desktop
 share/kde4/services/kipiplugin_kioexportimport.desktop
@@ -306,6 +317,7 @@ share/kde4/services/kipiplugin_shwup.desktop
 share/kde4/services/kipiplugin_smug.desktop
 share/kde4/services/kipiplugin_timeadjust.desktop
 share/kde4/services/kipiplugin_vkontakte.desktop
+share/kde4/services/kipiplugin_wikimedia.desktop
 share/kde4/services/kipiplugin_yandexfotki.desktop
 share/kde4/servicetypes/photolayoutseditorborderplugin.desktop
 share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop
@@ -543,6 +555,7 @@ share/locale/es/LC_MESSAGES/kipiplugin_advancedslideshow.mo
 share/locale/es/LC_MESSAGES/kipiplugin_batchprocessimages.mo
 share/locale/es/LC_MESSAGES/kipiplugin_calendar.mo
 share/locale/es/LC_MESSAGES/kipiplugin_dngconverter.mo
+share/locale/es/LC_MESSAGES/kipiplugin_expoblending.mo
 share/locale/es/LC_MESSAGES/kipiplugin_facebook.mo
 share/locale/es/LC_MESSAGES/kipiplugin_flashexport.mo
 share/locale/es/LC_MESSAGES/kipiplugin_flickrexport.mo
@@ -552,12 +565,15 @@ share/locale/es/LC_MESSAGES/kipiplugin_htmlexport.mo
 share/locale/es/LC_MESSAGES/kipiplugin_imageviewer.mo
 share/locale/es/LC_MESSAGES/kipiplugin_ipodexport.mo
 share/locale/es/LC_MESSAGES/kipiplugin_jpeglossless.mo
+share/locale/es/LC_MESSAGES/kipiplugin_kioexportimport.mo
 share/locale/es/LC_MESSAGES/kipiplugin_metadataedit.mo
 share/locale/es/LC_MESSAGES/kipiplugin_picasawebexport.mo
+share/locale/es/LC_MESSAGES/kipiplugin_piwigoexport.mo
 share/locale/es/LC_MESSAGES/kipiplugin_printimages.mo
 share/locale/es/LC_MESSAGES/kipiplugin_rawconverter.mo
 share/locale/es/LC_MESSAGES/kipiplugin_removeredeyes.mo
 share/locale/es/LC_MESSAGES/kipiplugin_sendimages.mo
+share/locale/es/LC_MESSAGES/kipiplugin_shwup.mo
 share/locale/es/LC_MESSAGES/kipiplugin_smug.mo
 share/locale/es/LC_MESSAGES/kipiplugin_timeadjust.mo
 share/locale/es/LC_MESSAGES/kipiplugins.mo
@@ -612,14 +628,32 @@ share/locale/eu/LC_MESSAGES/kipiplugin_shwup.mo
 share/locale/eu/LC_MESSAGES/kipiplugin_smug.mo
 share/locale/eu/LC_MESSAGES/kipiplugin_timeadjust.mo
 share/locale/eu/LC_MESSAGES/kipiplugins.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_acquireimages.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_advancedslideshow.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_batchprocessimages.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_calendar.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_dngconverter.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_expoblending.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_facebook.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_flashexport.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_flickrexport.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_galleryexport.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_gpssync.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_htmlexport.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_imageviewer.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_ipodexport.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_jpeglossless.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_kioexportimport.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_metadataedit.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_picasawebexport.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_piwigoexport.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_printimages.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_rawconverter.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_removeredeyes.mo
 share/locale/fi/LC_MESSAGES/kipiplugin_sendimages.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_shwup.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_smug.mo
+share/locale/fi/LC_MESSAGES/kipiplugin_timeadjust.mo
 share/locale/fi/LC_MESSAGES/kipiplugins.mo
 share/locale/fr/LC_MESSAGES/kipiplugin_acquireimages.mo
 share/locale/fr/LC_MESSAGES/kipiplugin_advancedslideshow.mo
@@ -739,6 +773,18 @@ share/locale/hr/LC_MESSAGES/kipiplugin_shwup.mo
 share/locale/hr/LC_MESSAGES/kipiplugin_smug.mo
 share/locale/hr/LC_MESSAGES/kipiplugin_timeadjust.mo
 share/locale/hr/LC_MESSAGES/kipiplugins.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_acquireimages.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_advancedslideshow.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_batchprocessimages.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_calendar.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_facebook.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_htmlexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_imageviewer.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_ipodexport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_jpeglossless.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_kioexportimport.mo
+share/locale/hu/LC_MESSAGES/kipiplugin_timeadjust.mo
+share/locale/hu/LC_MESSAGES/kipiplugins.mo
 share/locale/is/LC_MESSAGES/kipiplugin_acquireimages.mo
 share/locale/is/LC_MESSAGES/kipiplugin_advancedslideshow.mo
 share/locale/is/LC_MESSAGES/kipiplugin_batchprocessimages.mo
@@ -1182,6 +1228,31 @@ share/locale/sk/LC_MESSAGES/kipiplugin_shwup.mo
 share/locale/sk/LC_MESSAGES/kipiplugin_smug.mo
 share/locale/sk/LC_MESSAGES/kipiplugin_timeadjust.mo
 share/locale/sk/LC_MESSAGES/kipiplugins.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_acquireimages.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_advancedslideshow.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_batchprocessimages.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_calendar.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_dngconverter.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_facebook.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_flashexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_flickrexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_galleryexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_gpssync.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_htmlexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_imageviewer.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_ipodexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_jpeglossless.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_kioexportimport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_picasawebexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_piwigoexport.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_printimages.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_rawconverter.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_removeredeyes.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_sendimages.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_shwup.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_smug.mo
+share/locale/sl/LC_MESSAGES/kipiplugin_timeadjust.mo
+share/locale/sl/LC_MESSAGES/kipiplugins.mo
 share/locale/sq/LC_MESSAGES/kipiplugin_acquireimages.mo
 share/locale/sq/LC_MESSAGES/kipiplugin_batchprocessimages.mo
 share/locale/sq/LC_MESSAGES/kipiplugin_calendar.mo
diff --git a/graphics/kipi-plugins/distinfo b/graphics/kipi-plugins/distinfo
index f3acabe276a..3969e09d8c8 100644
--- a/graphics/kipi-plugins/distinfo
+++ b/graphics/kipi-plugins/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.28 2013/03/02 18:08:48 joerg Exp $
+$NetBSD: distinfo,v 1.29 2013/04/06 09:46:09 markd Exp $
 
-SHA1 (digikam-2.5.0.tar.bz2) = 6cadb838669d1bdcbd6abb677889f7d68d696383
-RMD160 (digikam-2.5.0.tar.bz2) = 4ff1b5fbc2cc4a8cb9994f7c7796086418dd43fb
-Size (digikam-2.5.0.tar.bz2) = 54976375 bytes
+SHA1 (digikam-3.1.0.tar.bz2) = f4ce304acdf10e859ab8f70ce9d53a05d92d4fbd
+RMD160 (digikam-3.1.0.tar.bz2) = 511550a7ee37aac958a0d2e5afaa0a07aa1eab0e
+Size (digikam-3.1.0.tar.bz2) = 58559707 bytes
 SHA1 (patch-htmlexport_wizard.cpp) = 0fa8c9a6fe315bc228e016aba2cd49f502a403c9
 SHA1 (patch-printimages_wizard_cropframe.cpp) = fc3cd2ec0175539d5d6013a2994a8b9bde0ecc57
 SHA1 (patch-printimages_wizard_wizard.cpp) = 18cae2452cab382923f2dbc5254a4ee6e27ad96b