Merge from area51 repository:

- Update to 4.3 (not part of KDE extragear anymore)
- Make NLS optional
- Build documentation
- Trip Makefile header
- Convert to new options framework

7 files changed, 343 insertions, 117 deletions

diff --git a/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile
index ffd72fc73306..76d686b62e90 100644
--- a/graphics/kphotoalbum-kde4/Makefile
+++ b/graphics/kphotoalbum-kde4/Makefile
@@ -1,44 +1,47 @@
-# New ports collection makefile for:	kimdaba
-# Date created:			Sat Dec 13 16:09:29 CET 2003
-# Whom:				Markus Brueffer <brueffer@phoenix-systems.de>
-#
+# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
 # $FreeBSD$
 
 PORTNAME=	kphotoalbum
-PORTVERSION=	${APP_VER}.${EXTRA_VER}
-PORTREVISION=	10
+PORTVERSION=	4.3
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/extragear
-DISTNAME=	${PORTNAME}-${APP_VER}-kde${EXTRA_VER}
-DIST_SUBDIR=	KDE/extragear
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Image viewer and organizer for KDE
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
-		exiv2.12:${PORTSDIR}/graphics/exiv2 \
-		kipi.8:${PORTSDIR}/graphics/libkipi-kde4
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
+		exiv2:${PORTSDIR}/graphics/exiv2
 
+USE_KDE4=	kdehier kdelibs kdeprefix libkdcraw libkipi automoc4
+USE_QT4=	corelib qt3support \
+		qmake_build moc_build rcc_build uic_build
 USE_BZIP2=	yes
-USE_KDE4=	kdelibs kdeprefix kdehier automoc4
-USE_QT4=	qmake_build moc_build rcc_build uic_build
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
 
 LATEST_LINK=	${PORTNAME}-kde4
 
-APP_VER=	4.1.1
-EXTRA_VER=	4.4.0
+OPTIONS_DEFINE=	MARBLE
+OPTIONS_DEFAULT=MARBLE
 
-OPTIONS=	MARBLE "Geolocation support" on
+MARBLE_DESC=	Geolocation support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_MARBLE)
+.if ${PORT_OPTIONS:MMARBLE}
 USE_KDE4+=	marble
 .else
 CMAKE_ARGS+=	-DWITH_Marble:BOOL=Off
 .endif
 
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+CMAKE_ARGS+=	-DBUILD_po:BOOL=Off
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 .include <bsd.port.mk>
diff --git a/graphics/kphotoalbum-kde4/distinfo b/graphics/kphotoalbum-kde4/distinfo
index c84eff7c786e..9a6b30da4a2f 100644
--- a/graphics/kphotoalbum-kde4/distinfo
+++ b/graphics/kphotoalbum-kde4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/extragear/kphotoalbum-4.1.1-kde4.4.0.tar.bz2) = 66367cce22694ea287bf397ad552b9a2142c4ae55145a44242813e37a9a4cd4b
-SIZE (KDE/extragear/kphotoalbum-4.1.1-kde4.4.0.tar.bz2) = 8242544
+SHA256 (KDE/kphotoalbum-4.3.tar.bz2) = a26e5c97febde7712a790b67c2093b595295081cc82c049950a598f76e0bd971
+SIZE (KDE/kphotoalbum-4.3.tar.bz2) = 10558262
diff --git a/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt b/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt
deleted file mode 100644
index 7ca6f1cb4174..000000000000
--- a/graphics/kphotoalbum-kde4/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./CMakeLists.txt.orig	2010-02-12 00:53:08.000000000 +0300
-+++ ./CMakeLists.txt	2010-08-21 11:54:14.712632655 +0400
-@@ -339,5 +339,3 @@
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
- add_subdirectory( po )
--add_subdirectory( doc-translations )
--add_subdirectory( doc )
diff --git a/graphics/kphotoalbum-kde4/files/patch-Exif__Info.cpp b/graphics/kphotoalbum-kde4/files/patch-Exif__Info.cpp
deleted file mode 100644
index 9cdb6baecdb3..000000000000
--- a/graphics/kphotoalbum-kde4/files/patch-Exif__Info.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./Exif/Info.cpp.orig	2010-02-11 22:44:01.000000000 +0100
-+++ ./Exif/Info.cpp	2011-04-19 10:47:27.975620628 +0200
-@@ -106,6 +106,28 @@
-         return res;
- 
-     QList<const Exiv2::TagInfo*> tags;
-+    std::ostringstream s;
-+
-+#if (EXIV2_TEST_VERSION(0,21,0))
-+    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
-+    while (gi->tagList_ != 0) {
-+	    Exiv2::TagListFct tl     = gi->tagList_;
-+	    const Exiv2::TagInfo* ti = tl();
-+
-+	    while (ti->tag_ != 0xFFFF) {
-+		    tags << ti;
-+		    ++ti;
-+	    }
-+        ++gi;
-+    }
-+
-+    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
-+        while ( (*it)->tag_ != 0xffff ) {
-+            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
-+            ++(*it);
-+        }
-+    }
-+#else
-     tags <<
-         Exiv2::ExifTags::ifdTagList() <<
-         Exiv2::ExifTags::exifTagList() <<
-@@ -121,7 +143,6 @@
-     // Now the ugly part -- exiv2 doesn't have any way to get a list of
-     // MakerNote tags in a reasonable form, so we have to parse it from strings
- 
--    std::ostringstream s;
-     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
-             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
- #if EXIV2_TEST_VERSION(0,17,0)
-@@ -130,6 +151,7 @@
-         Exiv2::ExifTags::makerTaglist( s, kind );
- #endif
-     }
-+#endif
- 
-     // IPTC tags use yet another format...
-     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/graphics/kphotoalbum-kde4/files/patch-ImageManager__VideoLengthExtractor.cpp b/graphics/kphotoalbum-kde4/files/patch-ImageManager__VideoLengthExtractor.cpp
new file mode 100644
index 000000000000..7b2daa09f092
--- /dev/null
+++ b/graphics/kphotoalbum-kde4/files/patch-ImageManager__VideoLengthExtractor.cpp
@@ -0,0 +1,21 @@
+--- ./ImageManager/VideoLengthExtractor.cpp.orig	2012-09-25 17:40:43.000000000 +0200
++++ ./ImageManager/VideoLengthExtractor.cpp	2013-01-06 03:18:46.827523021 +0100
+@@ -32,6 +32,18 @@
+ #  define Debug if(0) qDebug
+ #endif
+ 
++/*
++ * As in Utilities/Process.cpp, <KDebug> pulls in <stdio.h> which defines 
++ * stdout/stderr to __stdoutp/__stderrp which is obviously not what is
++ * intended here.
++ */
++#ifdef stdout
++#  undef stdout
++#endif
++#ifdef stderr
++#  undef stderr
++#endif
++
+ ImageManager::VideoLengthExtractor::VideoLengthExtractor(QObject *parent) :
+     QObject(parent), m_process(0)
+ {
diff --git a/graphics/kphotoalbum-kde4/files/patch-Utilities__Process.cpp b/graphics/kphotoalbum-kde4/files/patch-Utilities__Process.cpp
new file mode 100644
index 000000000000..c437700b4bec
--- /dev/null
+++ b/graphics/kphotoalbum-kde4/files/patch-Utilities__Process.cpp
@@ -0,0 +1,20 @@
+--- ./Utilities/Process.cpp.orig	2012-09-25 17:40:43.000000000 +0200
++++ ./Utilities/Process.cpp	2013-01-06 03:18:46.827523021 +0100
+@@ -20,6 +20,17 @@
+ #include "Process.h"
+ #include <KDebug>
+ 
++/*
++ * <KDebug> pulls in <stdio.h> which defines stdout/stderr to
++ *__stdoutp/__stderrp which is obviously not what is intended here.
++ */
++#ifdef stdout
++#  undef stdout
++#endif
++#ifdef stderr
++#  undef stderr
++#endif
++
+ /**
+   \class Utilities::Process
+   \brief QProcess subclass which collects stdout and print stderr
diff --git a/graphics/kphotoalbum-kde4/pkg-plist b/graphics/kphotoalbum-kde4/pkg-plist
index 2065d55aace7..82683b1aa4c1 100644
--- a/graphics/kphotoalbum-kde4/pkg-plist
+++ b/graphics/kphotoalbum-kde4/pkg-plist
@@ -1,6 +1,9 @@
+bin/kpa-backup.sh
 bin/kphotoalbum
+bin/open-raw.pl
 share/applications/kde4/kphotoalbum-import.desktop
 share/applications/kde4/kphotoalbum.desktop
+share/applications/kde4/open-raw.desktop
 share/apps/kphotoalbum/default-layout.xml
 share/apps/kphotoalbum/default-setup
 share/apps/kphotoalbum/demo/CategoryImages/Keywords-scenic.jpg
@@ -72,6 +75,11 @@ share/apps/kphotoalbum/themes/grey/imagepage.html
 share/apps/kphotoalbum/themes/grey/kphotoalbum.theme
 share/apps/kphotoalbum/themes/grey/mainpage.css
 share/apps/kphotoalbum/themes/grey/mainpage.html
+share/apps/kphotoalbum/themes/picBelow/imagepage.html
+share/apps/kphotoalbum/themes/picBelow/kphotoalbum.theme
+share/apps/kphotoalbum/themes/picBelow/mainpage.html
+share/apps/kphotoalbum/themes/picBelow/navigation.js
+share/apps/kphotoalbum/themes/picBelow/style.css
 share/apps/kphotoalbum/themes/rounded/downbar.png
 share/apps/kphotoalbum/themes/rounded/downleft.png
 share/apps/kphotoalbum/themes/rounded/download.png
@@ -87,6 +95,218 @@ share/apps/kphotoalbum/themes/rounded/upleft.png
 share/apps/kphotoalbum/themes/rounded/upright.png
 share/apps/kphotoalbum/tips
 share/config/kphotoalbumrc
+share/doc/HTML/de/kphotoalbum/browsing.docbook
+share/doc/HTML/de/kphotoalbum/common
+share/doc/HTML/de/kphotoalbum/datebar.docbook
+share/doc/HTML/de/kphotoalbum/generating-html.docbook
+share/doc/HTML/de/kphotoalbum/importexport.docbook
+share/doc/HTML/de/kphotoalbum/index.cache.bz2
+share/doc/HTML/de/kphotoalbum/index.docbook
+share/doc/HTML/de/kphotoalbum/introduction.docbook
+share/doc/HTML/de/kphotoalbum/options.docbook
+share/doc/HTML/de/kphotoalbum/plugins.docbook
+share/doc/HTML/de/kphotoalbum/setting-properties.docbook
+share/doc/HTML/de/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/de/kphotoalbum/viewer.docbook
+share/doc/HTML/de/kphotoalbum/workflows.docbook
+share/doc/HTML/en/kphotoalbum/browser-for-jesper.png
+share/doc/HTML/en/kphotoalbum/browser-for-persons.png
+share/doc/HTML/en/kphotoalbum/browser-with-images.png
+share/doc/HTML/en/kphotoalbum/browsing.docbook
+share/doc/HTML/en/kphotoalbum/category-selectors.png
+share/doc/HTML/en/kphotoalbum/categoryEditor.png
+share/doc/HTML/en/kphotoalbum/common
+share/doc/HTML/en/kphotoalbum/datebar-for-minutes.png
+share/doc/HTML/en/kphotoalbum/datebar.docbook
+share/doc/HTML/en/kphotoalbum/datebar.png
+share/doc/HTML/en/kphotoalbum/delete-images.png
+share/doc/HTML/en/kphotoalbum/draw-on-image.png
+share/doc/HTML/en/kphotoalbum/edit-properies-menu.png
+share/doc/HTML/en/kphotoalbum/empty-browser-window.png
+share/doc/HTML/en/kphotoalbum/generating-html.docbook
+share/doc/HTML/en/kphotoalbum/html-content.png
+share/doc/HTML/en/kphotoalbum/html-destination.png
+share/doc/HTML/en/kphotoalbum/html-layout.png
+share/doc/HTML/en/kphotoalbum/image-config-window.png
+share/doc/HTML/en/kphotoalbum/images-with-tokens.png
+share/doc/HTML/en/kphotoalbum/imagesForPersons.png
+share/doc/HTML/en/kphotoalbum/import-dialog.png
+share/doc/HTML/en/kphotoalbum/importexport.docbook
+share/doc/HTML/en/kphotoalbum/index.cache.bz2
+share/doc/HTML/en/kphotoalbum/index.docbook
+share/doc/HTML/en/kphotoalbum/introduction.docbook
+share/doc/HTML/en/kphotoalbum/keyword-exact.png
+share/doc/HTML/en/kphotoalbum/marking-zoom-rectangle.png
+share/doc/HTML/en/kphotoalbum/member-group-setting.png
+share/doc/HTML/en/kphotoalbum/offline-mode.png
+share/doc/HTML/en/kphotoalbum/options-backend.png
+share/doc/HTML/en/kphotoalbum/options-file-versions.png
+share/doc/HTML/en/kphotoalbum/options-general.png
+share/doc/HTML/en/kphotoalbum/options-groups.png
+share/doc/HTML/en/kphotoalbum/options-member.png
+share/doc/HTML/en/kphotoalbum/options-thumbnailview.png
+share/doc/HTML/en/kphotoalbum/options-viewer.png
+share/doc/HTML/en/kphotoalbum/options.docbook
+share/doc/HTML/en/kphotoalbum/plugins.docbook
+share/doc/HTML/en/kphotoalbum/raw-external.png
+share/doc/HTML/en/kphotoalbum/redisplay-frames.png
+share/doc/HTML/en/kphotoalbum/search.png
+share/doc/HTML/en/kphotoalbum/setting-properties.docbook
+share/doc/HTML/en/kphotoalbum/splash-large.png
+share/doc/HTML/en/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/en/kphotoalbum/thumbnailview.png
+share/doc/HTML/en/kphotoalbum/tokens-in-browser.png
+share/doc/HTML/en/kphotoalbum/tokens-in-thumbnail-viewer.png
+share/doc/HTML/en/kphotoalbum/usa-as-a-member.png
+share/doc/HTML/en/kphotoalbum/viewer-contextmenu.png
+share/doc/HTML/en/kphotoalbum/viewer.docbook
+share/doc/HTML/en/kphotoalbum/viewer.png
+share/doc/HTML/en/kphotoalbum/workflows.docbook
+share/doc/HTML/en/kphotoalbum/zoomed-view.png
+share/doc/HTML/et/kphotoalbum/browsing.docbook
+share/doc/HTML/et/kphotoalbum/common
+share/doc/HTML/et/kphotoalbum/datebar.docbook
+share/doc/HTML/et/kphotoalbum/generating-html.docbook
+share/doc/HTML/et/kphotoalbum/importexport.docbook
+share/doc/HTML/et/kphotoalbum/index.cache.bz2
+share/doc/HTML/et/kphotoalbum/index.docbook
+share/doc/HTML/et/kphotoalbum/introduction.docbook
+share/doc/HTML/et/kphotoalbum/options.docbook
+share/doc/HTML/et/kphotoalbum/plugins.docbook
+share/doc/HTML/et/kphotoalbum/setting-properties.docbook
+share/doc/HTML/et/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/et/kphotoalbum/viewer.docbook
+share/doc/HTML/fr/kphotoalbum/browsing.docbook
+share/doc/HTML/fr/kphotoalbum/common
+share/doc/HTML/fr/kphotoalbum/datebar.docbook
+share/doc/HTML/fr/kphotoalbum/generating-html.docbook
+share/doc/HTML/fr/kphotoalbum/importexport.docbook
+share/doc/HTML/fr/kphotoalbum/index.cache.bz2
+share/doc/HTML/fr/kphotoalbum/index.docbook
+share/doc/HTML/fr/kphotoalbum/introduction.docbook
+share/doc/HTML/fr/kphotoalbum/options.docbook
+share/doc/HTML/fr/kphotoalbum/plugins.docbook
+share/doc/HTML/fr/kphotoalbum/setting-properties.docbook
+share/doc/HTML/fr/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/fr/kphotoalbum/viewer.docbook
+share/doc/HTML/it/kphotoalbum/browsing.docbook
+share/doc/HTML/it/kphotoalbum/common
+share/doc/HTML/it/kphotoalbum/datebar.docbook
+share/doc/HTML/it/kphotoalbum/generating-html.docbook
+share/doc/HTML/it/kphotoalbum/importexport.docbook
+share/doc/HTML/it/kphotoalbum/index.cache.bz2
+share/doc/HTML/it/kphotoalbum/index.docbook
+share/doc/HTML/it/kphotoalbum/introduction.docbook
+share/doc/HTML/it/kphotoalbum/options.docbook
+share/doc/HTML/it/kphotoalbum/plugins.docbook
+share/doc/HTML/it/kphotoalbum/setting-properties.docbook
+share/doc/HTML/it/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/it/kphotoalbum/viewer.docbook
+share/doc/HTML/it/kphotoalbum/workflows.docbook
+share/doc/HTML/nl/kphotoalbum/browsing.docbook
+share/doc/HTML/nl/kphotoalbum/common
+share/doc/HTML/nl/kphotoalbum/datebar.docbook
+share/doc/HTML/nl/kphotoalbum/generating-html.docbook
+share/doc/HTML/nl/kphotoalbum/importexport.docbook
+share/doc/HTML/nl/kphotoalbum/index.cache.bz2
+share/doc/HTML/nl/kphotoalbum/index.docbook
+share/doc/HTML/nl/kphotoalbum/introduction.docbook
+share/doc/HTML/nl/kphotoalbum/options.docbook
+share/doc/HTML/nl/kphotoalbum/plugins.docbook
+share/doc/HTML/nl/kphotoalbum/setting-properties.docbook
+share/doc/HTML/nl/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/nl/kphotoalbum/viewer.docbook
+share/doc/HTML/nl/kphotoalbum/workflows.docbook
+share/doc/HTML/pt/kphotoalbum/browsing.docbook
+share/doc/HTML/pt/kphotoalbum/common
+share/doc/HTML/pt/kphotoalbum/datebar.docbook
+share/doc/HTML/pt/kphotoalbum/generating-html.docbook
+share/doc/HTML/pt/kphotoalbum/importexport.docbook
+share/doc/HTML/pt/kphotoalbum/index.cache.bz2
+share/doc/HTML/pt/kphotoalbum/index.docbook
+share/doc/HTML/pt/kphotoalbum/introduction.docbook
+share/doc/HTML/pt/kphotoalbum/options.docbook
+share/doc/HTML/pt/kphotoalbum/plugins.docbook
+share/doc/HTML/pt/kphotoalbum/setting-properties.docbook
+share/doc/HTML/pt/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/pt/kphotoalbum/viewer.docbook
+share/doc/HTML/pt_BR/kphotoalbum/browsing.docbook
+share/doc/HTML/pt_BR/kphotoalbum/common
+share/doc/HTML/pt_BR/kphotoalbum/datebar.docbook
+share/doc/HTML/pt_BR/kphotoalbum/generating-html.docbook
+share/doc/HTML/pt_BR/kphotoalbum/importexport.docbook
+share/doc/HTML/pt_BR/kphotoalbum/index.cache.bz2
+share/doc/HTML/pt_BR/kphotoalbum/index.docbook
+share/doc/HTML/pt_BR/kphotoalbum/introduction.docbook
+share/doc/HTML/pt_BR/kphotoalbum/options.docbook
+share/doc/HTML/pt_BR/kphotoalbum/plugins.docbook
+share/doc/HTML/pt_BR/kphotoalbum/setting-properties.docbook
+share/doc/HTML/pt_BR/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/pt_BR/kphotoalbum/viewer.docbook
+share/doc/HTML/pt_BR/kphotoalbum/workflows.docbook
+share/doc/HTML/sv/kphotoalbum/browsing.docbook
+share/doc/HTML/sv/kphotoalbum/common
+share/doc/HTML/sv/kphotoalbum/datebar.docbook
+share/doc/HTML/sv/kphotoalbum/generating-html.docbook
+share/doc/HTML/sv/kphotoalbum/importexport.docbook
+share/doc/HTML/sv/kphotoalbum/index.cache.bz2
+share/doc/HTML/sv/kphotoalbum/index.docbook
+share/doc/HTML/sv/kphotoalbum/introduction.docbook
+share/doc/HTML/sv/kphotoalbum/options.docbook
+share/doc/HTML/sv/kphotoalbum/plugins.docbook
+share/doc/HTML/sv/kphotoalbum/setting-properties.docbook
+share/doc/HTML/sv/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/sv/kphotoalbum/viewer.docbook
+share/doc/HTML/sv/kphotoalbum/workflows.docbook
+share/doc/HTML/uk/kphotoalbum/browser-for-jesper.png
+share/doc/HTML/uk/kphotoalbum/browser-for-persons.png
+share/doc/HTML/uk/kphotoalbum/browsing.docbook
+share/doc/HTML/uk/kphotoalbum/category-selectors.png
+share/doc/HTML/uk/kphotoalbum/categoryEditor.png
+share/doc/HTML/uk/kphotoalbum/common
+share/doc/HTML/uk/kphotoalbum/datebar-for-minutes.png
+share/doc/HTML/uk/kphotoalbum/datebar.docbook
+share/doc/HTML/uk/kphotoalbum/datebar.png
+share/doc/HTML/uk/kphotoalbum/delete-images.png
+share/doc/HTML/uk/kphotoalbum/edit-properies-menu.png
+share/doc/HTML/uk/kphotoalbum/empty-browser-window.png
+share/doc/HTML/uk/kphotoalbum/generating-html.docbook
+share/doc/HTML/uk/kphotoalbum/html-content.png
+share/doc/HTML/uk/kphotoalbum/html-destination.png
+share/doc/HTML/uk/kphotoalbum/html-layout.png
+share/doc/HTML/uk/kphotoalbum/image-config-window.png
+share/doc/HTML/uk/kphotoalbum/images-with-tokens.png
+share/doc/HTML/uk/kphotoalbum/imagesForPersons.png
+share/doc/HTML/uk/kphotoalbum/importexport.docbook
+share/doc/HTML/uk/kphotoalbum/index.cache.bz2
+share/doc/HTML/uk/kphotoalbum/index.docbook
+share/doc/HTML/uk/kphotoalbum/introduction.docbook
+share/doc/HTML/uk/kphotoalbum/keyword-exact.png
+share/doc/HTML/uk/kphotoalbum/marking-zoom-rectangle.png
+share/doc/HTML/uk/kphotoalbum/member-group-setting.png
+share/doc/HTML/uk/kphotoalbum/options-backend.png
+share/doc/HTML/uk/kphotoalbum/options-file-versions.png
+share/doc/HTML/uk/kphotoalbum/options-general.png
+share/doc/HTML/uk/kphotoalbum/options-groups.png
+share/doc/HTML/uk/kphotoalbum/options-member.png
+share/doc/HTML/uk/kphotoalbum/options-thumbnailview.png
+share/doc/HTML/uk/kphotoalbum/options-viewer.png
+share/doc/HTML/uk/kphotoalbum/options.docbook
+share/doc/HTML/uk/kphotoalbum/plugins.docbook
+share/doc/HTML/uk/kphotoalbum/raw-external.png
+share/doc/HTML/uk/kphotoalbum/redisplay-frames.png
+share/doc/HTML/uk/kphotoalbum/search.png
+share/doc/HTML/uk/kphotoalbum/setting-properties.docbook
+share/doc/HTML/uk/kphotoalbum/thumbnail-view.docbook
+share/doc/HTML/uk/kphotoalbum/thumbnailview.png
+share/doc/HTML/uk/kphotoalbum/tokens-in-browser.png
+share/doc/HTML/uk/kphotoalbum/tokens-in-thumbnail-viewer.png
+share/doc/HTML/uk/kphotoalbum/usa-as-a-member.png
+share/doc/HTML/uk/kphotoalbum/viewer-contextmenu.png
+share/doc/HTML/uk/kphotoalbum/viewer.docbook
+share/doc/HTML/uk/kphotoalbum/viewer.png
+share/doc/HTML/uk/kphotoalbum/workflows.docbook
+share/doc/HTML/uk/kphotoalbum/zoomed-view.png
 share/icons/hicolor/128x128/apps/kphotoalbum.png
 share/icons/hicolor/16x16/actions/ellipsetool.png
 share/icons/hicolor/16x16/actions/linetool.png
@@ -100,49 +320,66 @@ share/icons/hicolor/22x22/apps/kphotoalbum.png
 share/icons/hicolor/32x32/apps/kphotoalbum.png
 share/icons/hicolor/48x48/apps/kphotoalbum.png
 share/icons/hicolor/64x64/apps/kphotoalbum.png
-share/locale/ar/LC_MESSAGES/kphotoalbum.mo
-share/locale/be/LC_MESSAGES/kphotoalbum.mo
-share/locale/bg/LC_MESSAGES/kphotoalbum.mo
-share/locale/ca/LC_MESSAGES/kphotoalbum.mo
-share/locale/ca@valencia/LC_MESSAGES/kphotoalbum.mo
-share/locale/cs/LC_MESSAGES/kphotoalbum.mo
-share/locale/da/LC_MESSAGES/kphotoalbum.mo
-share/locale/de/LC_MESSAGES/kphotoalbum.mo
-share/locale/el/LC_MESSAGES/kphotoalbum.mo
-share/locale/en_GB/LC_MESSAGES/kphotoalbum.mo
-share/locale/eo/LC_MESSAGES/kphotoalbum.mo
-share/locale/es/LC_MESSAGES/kphotoalbum.mo
-share/locale/et/LC_MESSAGES/kphotoalbum.mo
-share/locale/fi/LC_MESSAGES/kphotoalbum.mo
-share/locale/fr/LC_MESSAGES/kphotoalbum.mo
-share/locale/ga/LC_MESSAGES/kphotoalbum.mo
-share/locale/gl/LC_MESSAGES/kphotoalbum.mo
-share/locale/hi/LC_MESSAGES/kphotoalbum.mo
-share/locale/hne/LC_MESSAGES/kphotoalbum.mo
-share/locale/hr/LC_MESSAGES/kphotoalbum.mo
-share/locale/is/LC_MESSAGES/kphotoalbum.mo
-share/locale/it/LC_MESSAGES/kphotoalbum.mo
-share/locale/ja/LC_MESSAGES/kphotoalbum.mo
-share/locale/km/LC_MESSAGES/kphotoalbum.mo
-share/locale/lt/LC_MESSAGES/kphotoalbum.mo
-share/locale/nb/LC_MESSAGES/kphotoalbum.mo
-share/locale/nds/LC_MESSAGES/kphotoalbum.mo
-share/locale/nl/LC_MESSAGES/kphotoalbum.mo
-share/locale/nn/LC_MESSAGES/kphotoalbum.mo
-share/locale/pa/LC_MESSAGES/kphotoalbum.mo
-share/locale/pl/LC_MESSAGES/kphotoalbum.mo
-share/locale/pt/LC_MESSAGES/kphotoalbum.mo
-share/locale/pt_BR/LC_MESSAGES/kphotoalbum.mo
-share/locale/ro/LC_MESSAGES/kphotoalbum.mo
-share/locale/se/LC_MESSAGES/kphotoalbum.mo
-share/locale/sk/LC_MESSAGES/kphotoalbum.mo
-share/locale/sv/LC_MESSAGES/kphotoalbum.mo
-share/locale/tr/LC_MESSAGES/kphotoalbum.mo
-share/locale/uk/LC_MESSAGES/kphotoalbum.mo
-share/locale/vi/LC_MESSAGES/kphotoalbum.mo
-share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
-share/locale/zh_TW/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/be/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/bs/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/da/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/de/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/el/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/eo/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/es/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/et/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/hi/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/hne/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/is/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/it/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/km/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/mai/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/nb/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/nds/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/nn/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/se/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/kphotoalbum.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/kphotoalbum.mo
+@dirrm share/doc/HTML/uk/kphotoalbum
+@dirrm share/doc/HTML/sv/kphotoalbum
+@dirrm share/doc/HTML/pt_BR/kphotoalbum
+@dirrm share/doc/HTML/pt/kphotoalbum
+@dirrm share/doc/HTML/nl/kphotoalbum
+@dirrm share/doc/HTML/it/kphotoalbum
+@dirrm share/doc/HTML/fr/kphotoalbum
+@dirrm share/doc/HTML/et/kphotoalbum
+@dirrm share/doc/HTML/en/kphotoalbum
+@dirrm share/doc/HTML/de/kphotoalbum
 @dirrm share/apps/kphotoalbum/themes/rounded
+@dirrm share/apps/kphotoalbum/themes/picBelow
 @dirrm share/apps/kphotoalbum/themes/grey
 @dirrm share/apps/kphotoalbum/themes/darkJS
 @dirrm share/apps/kphotoalbum/themes/dark