3 files changed, 86 insertions, 11 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index c8de047c5378..b23179fdc871 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.5.1
+PORTVERSION=	1.5.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/www/gallery/distinfo b/www/gallery/distinfo
index 736a43ffa732..4d9137553673 100644
--- a/www/gallery/distinfo
+++ b/www/gallery/distinfo
@@ -1,66 +1,99 @@
-MD5 (gallery/gallery-1.5.1.tar.gz) = 18a5115456406b6c56726242aadd45cc
-SIZE (gallery/gallery-1.5.1.tar.gz) = 2237335
+MD5 (gallery/gallery-1.5.2.tar.gz) = 6156b335a712d5515c3cc84c6bcd77da
+SHA256 (gallery/gallery-1.5.2.tar.gz) = 839488e3e4cb0aa527d46181bd8417914a725abbfd65ceef0e19c516e9f6ef2e
+SIZE (gallery/gallery-1.5.2.tar.gz) = 2339587
 MD5 (gallery/af_ZA-1.5.1.tar.gz) = 1ed3ffcacca09f9e54ab216ff01935e4
+SHA256 (gallery/af_ZA-1.5.1.tar.gz) = 64d39bfa1d79895dfc13b9612bc13f316231784b3af900d53e1f232c180d4d40
 SIZE (gallery/af_ZA-1.5.1.tar.gz) = 136045
 MD5 (gallery/bg_BG-1.5.1.tar.gz) = f64cad7574ba826e7b1510872ccb6b75
+SHA256 (gallery/bg_BG-1.5.1.tar.gz) = 2340ecb8621d8e9dc6687922b0c1c91d85ba7c37745760fa85b8abf5ab72deaf
 SIZE (gallery/bg_BG-1.5.1.tar.gz) = 167891
 MD5 (gallery/ca_ES-1.5.tar.gz) = 73e6749610281faa724c5b885d4e740c
+SHA256 (gallery/ca_ES-1.5.tar.gz) = 60349f4c4d0c54fefa5d30e295c1b105d07d997f412587a257ab389b65928b3e
 SIZE (gallery/ca_ES-1.5.tar.gz) = 81227
 MD5 (gallery/cs_CZ.iso-8859-2-1.5.1.tar.gz) = 4aac4b150f6f42c03d3c3ef4885d7d64
+SHA256 (gallery/cs_CZ.iso-8859-2-1.5.1.tar.gz) = 317ddcb953743b99baacd413e4fd6fc9e346f38181bcb6d200f6d339d8d2464f
 SIZE (gallery/cs_CZ.iso-8859-2-1.5.1.tar.gz) = 130755
 MD5 (gallery/da_DK-1.5.1.tar.gz) = 0348f6bafae263e1f5dfa0055da89569
+SHA256 (gallery/da_DK-1.5.1.tar.gz) = f421de1ea932817c48b7e51fc6cf909c87f0c47ec6154452599a94ef1aef9f49
 SIZE (gallery/da_DK-1.5.1.tar.gz) = 135955
 MD5 (gallery/de_DE-1.5.1.tar.gz) = 7bfaafe64754ec15aa86576bb09306d4
+SHA256 (gallery/de_DE-1.5.1.tar.gz) = 1a36e747eee43b28b9a396eddc0f78fd70a5b21da8857d5c7b8f49ad433de17d
 SIZE (gallery/de_DE-1.5.1.tar.gz) = 175334
 MD5 (gallery/en_GB-1.5-RC2.tar.gz) = 7a10ab65955d2bb27d11472626be7c93
+SHA256 (gallery/en_GB-1.5-RC2.tar.gz) = f58ced82bae61ade1e722fd8e314a229631c414e749853294179a9ddfc6ec58c
 SIZE (gallery/en_GB-1.5-RC2.tar.gz) = 46646
 MD5 (gallery/es_ES-1.5.1.tar.gz) = cc5ac56070652f82f5ef25e8f948859f
+SHA256 (gallery/es_ES-1.5.1.tar.gz) = 05556083b0cba94e92aeb477399670129b2b570c867a4032aeae3109a86c4881
 SIZE (gallery/es_ES-1.5.1.tar.gz) = 158098
 MD5 (gallery/fi_FI-1.5.1.tar.gz) = 939a2921c9667ffc272f77d244383698
+SHA256 (gallery/fi_FI-1.5.1.tar.gz) = e6ab44793049b82f43abf7083f29c5ddaedeab44747991dd80421674ebc003da
 SIZE (gallery/fi_FI-1.5.1.tar.gz) = 147624
 MD5 (gallery/fr_FR-1.5.1.tar.gz) = 6bf298753c80a31a5e7acb072accdc71
+SHA256 (gallery/fr_FR-1.5.1.tar.gz) = ac4a99d8c3bcbcd0df7a5e4ce341698c8b3eb09165bc71eb200f362abe36739a
 SIZE (gallery/fr_FR-1.5.1.tar.gz) = 156312
 MD5 (gallery/gl_ES-1.5.1.tar.gz) = c04c4a71cc0dd68c48e3c8a12e38b0e2
+SHA256 (gallery/gl_ES-1.5.1.tar.gz) = 770c619eab399e6ef3cc4e43ea7de6c1ad8aab31fe61c3750d19e589bcade06a
 SIZE (gallery/gl_ES-1.5.1.tar.gz) = 135208
 MD5 (gallery/hu_HU-1.5.1.tar.gz) = 0de803fdc3ce39b5507afbc9d5c286cf
+SHA256 (gallery/hu_HU-1.5.1.tar.gz) = 429a05b0d41b7d6de03cdab8d045fc78d134c95c9fd9b4dd6bad05f758358b59
 SIZE (gallery/hu_HU-1.5.1.tar.gz) = 97253
 MD5 (gallery/is_IS-1.5.1.tar.gz) = 810c4cc8237981d9e19300cc9ed85c65
+SHA256 (gallery/is_IS-1.5.1.tar.gz) = af2c8a15e7426f88aee3e40194d660054ca17f444def00a82e2dcdb3dd05b1a7
 SIZE (gallery/is_IS-1.5.1.tar.gz) = 164147
 MD5 (gallery/it_IT-1.5.1.tar.gz) = 58f6ce42fb2773c9b3e7fcdeaf96f492
+SHA256 (gallery/it_IT-1.5.1.tar.gz) = 04974fd4a6c9631d1f9529496f710797e83419a2cfad2c2f3586800633f9730e
 SIZE (gallery/it_IT-1.5.1.tar.gz) = 174665
 MD5 (gallery/ja_JP-1.5.1.tar.gz) = 04737ad15a72afdc10167a236a96d3ac
+SHA256 (gallery/ja_JP-1.5.1.tar.gz) = 5361bdb565214512dd93347f3787e275aba40f793fb24ca734cad34ca2c54ba7
 SIZE (gallery/ja_JP-1.5.1.tar.gz) = 155303
 MD5 (gallery/ko_KR-1.5.1.tar.gz) = 8d5b2e12846fda56051f9858c5a0453c
+SHA256 (gallery/ko_KR-1.5.1.tar.gz) = 76d719c632e4f1e543c6816f20066c35d2a7f2072fcae5df3204892dbe90655f
 SIZE (gallery/ko_KR-1.5.1.tar.gz) = 155572
 MD5 (gallery/lt_LT-1.5.1.tar.gz) = 2f2c57b0086d736dd420c37ba718b6be
+SHA256 (gallery/lt_LT-1.5.1.tar.gz) = 491dead156bcb77d61fad0d1f2555b9aea3a5e8b021948a2553c2a5cdd53caa4
 SIZE (gallery/lt_LT-1.5.1.tar.gz) = 148186
 MD5 (gallery/nl_NL-1.5.1.tar.gz) = 7ea5d32d2414994833cd17b5348af4a9
+SHA256 (gallery/nl_NL-1.5.1.tar.gz) = 1307a4b479c52ce474e3e113d2b72796d1db508549cc15ef8018c5166ae6f776
 SIZE (gallery/nl_NL-1.5.1.tar.gz) = 159137
 MD5 (gallery/no_NO-1.5.1.tar.gz) = ad6406a078628bba2e75b3cae758bb78
+SHA256 (gallery/no_NO-1.5.1.tar.gz) = 978f663f48e764e28eefdbe9ac89de2fcb101983c9d7c0e947d26226fbaf10ac
 SIZE (gallery/no_NO-1.5.1.tar.gz) = 159475
 MD5 (gallery/pl_PL-1.5.1.tar.gz) = efe8e359041c2c07463132ad0f7a8bea
+SHA256 (gallery/pl_PL-1.5.1.tar.gz) = 83542934b513fd015de447440ff24b4fc0bb234bfc2c74737df76c4b32ba8391
 SIZE (gallery/pl_PL-1.5.1.tar.gz) = 167968
 MD5 (gallery/pt_BR-1.5.1.tar.gz) = a99af24a1ecbd3d91150577ba3ba50ad
+SHA256 (gallery/pt_BR-1.5.1.tar.gz) = 88da434078d974a180b7be26bd1cdf6e9cdf9256dd1af85f8651ddb22cf1d497
 SIZE (gallery/pt_BR-1.5.1.tar.gz) = 162450
 MD5 (gallery/pt_PT-1.5.1.tar.gz) = 4d2ea0d79c8a0c6980344b49c743f5c0
+SHA256 (gallery/pt_PT-1.5.1.tar.gz) = 0dae3980d42d773139d45dfcdf898004ef5b3140850356ef62830f878b1d269c
 SIZE (gallery/pt_PT-1.5.1.tar.gz) = 131256
 MD5 (gallery/ru_RU.cp1251-1.5.1.tar.gz) = a4c29cc3f1f7bd91bf5ff92eaff489bf
+SHA256 (gallery/ru_RU.cp1251-1.5.1.tar.gz) = 18de61542a7b3c6753259b9197cb749a027026e665061523fdce92155ed282f3
 SIZE (gallery/ru_RU.cp1251-1.5.1.tar.gz) = 145763
 MD5 (gallery/ru_RU.koi8r-1.5.1.tar.gz) = f4bbd33218f15f573120672220f0c652
+SHA256 (gallery/ru_RU.koi8r-1.5.1.tar.gz) = 2a684568157b2ab712b4b5de182980244d350aa421cef89de07e04755602ba2b
 SIZE (gallery/ru_RU.koi8r-1.5.1.tar.gz) = 145383
 MD5 (gallery/sk_SK-1.5.1.tar.gz) = c732626f473457a2affd38ce92419403
+SHA256 (gallery/sk_SK-1.5.1.tar.gz) = 415ed1855b64aab2f0a77fb1ea10c02d2a0b849404009df3a1a73ed0a279f230
 SIZE (gallery/sk_SK-1.5.1.tar.gz) = 93249
 MD5 (gallery/sl_SI-1.5.1.tar.gz) = a03b0f47d013b4a7509a373229b8c22a
+SHA256 (gallery/sl_SI-1.5.1.tar.gz) = 2d6c3e7f2f4503dce87c6e3423c1c93a87baeb01ffde2f3b953103b954af06d0
 SIZE (gallery/sl_SI-1.5.1.tar.gz) = 92910
 MD5 (gallery/sv_SE-1.5.1.tar.gz) = e1e0e828759b07a5000860a43d174fb0
+SHA256 (gallery/sv_SE-1.5.1.tar.gz) = afb393121c47219735fd0dd82001cd76b369a5578b3d788ebfb24a92a512c518
 SIZE (gallery/sv_SE-1.5.1.tar.gz) = 172679
 MD5 (gallery/tr_TR-1.5.1.tar.gz) = 2548bd03c7c6e8355c5aa5b807a9995c
+SHA256 (gallery/tr_TR-1.5.1.tar.gz) = 562d69526fe5a2d8abecac5dca4ac1dc00fcc7a3f11c1771f3b309c1e6b61122
 SIZE (gallery/tr_TR-1.5.1.tar.gz) = 107366
 MD5 (gallery/vi_VN-1.5.1.tar.gz) = a09a4cf8f2816b16af19054fd16d4db7
+SHA256 (gallery/vi_VN-1.5.1.tar.gz) = a80c0a119384971e8070a32a643ab543efd98b3f4403e0742c0d720ce0cb8ebf
 SIZE (gallery/vi_VN-1.5.1.tar.gz) = 160647
 MD5 (gallery/zh_HK-1.5.1.tar.gz) = 35e84007e5fd39ff75a0d0722b0fef5f
+SHA256 (gallery/zh_HK-1.5.1.tar.gz) = 3ee3bd6fdafb69383664754c7985aa83841a5b41f6c1ab9105d498e8b4fd7034
 SIZE (gallery/zh_HK-1.5.1.tar.gz) = 138144
 MD5 (gallery/zh_HK.utf8-1.5.1.tar.gz) = 66161a8db375d4f8c9ca0c37fab4a900
+SHA256 (gallery/zh_HK.utf8-1.5.1.tar.gz) = d7116cf830cdeaeee47d5d00a7715e8dd6f28dcb92b56fd91a8c6ad7aef8fc33
 SIZE (gallery/zh_HK.utf8-1.5.1.tar.gz) = 144251
 MD5 (gallery/zh_TW-1.5.1.tar.gz) = e93292569b4c4e464fdbd989289dfd85
+SHA256 (gallery/zh_TW-1.5.1.tar.gz) = d71318429d5368ea006af99bf35d6162c42744cc8e797bfd3f8baa2d1de2aeff
 SIZE (gallery/zh_TW-1.5.1.tar.gz) = 152113
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index 6a5ee307f431..8bc77c96ccb6 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -5,6 +5,7 @@
 %%GALLERYDIR%%/add_photos_frame.php
 %%GALLERYDIR%%/add_photos_refresh.php
 %%GALLERYDIR%%/admin-page.php
+%%GALLERYDIR%%/administer_startpage.php
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
 %%GALLERYDIR%%/block-random.php
@@ -47,6 +48,15 @@
 %%GALLERYDIR%%/classes/remote/GalleryRemoteProperties.php
 %%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/contrib/GeekLog/CREDITS
+%%GALLERYDIR%%/contrib/joomla/HowTo.txt
+%%GALLERYDIR%%/contrib/joomla/admin.gallery.html.php
+%%GALLERYDIR%%/contrib/joomla/admin.gallery.php
+%%GALLERYDIR%%/contrib/joomla/classes/mambo.php
+%%GALLERYDIR%%/contrib/joomla/gallery.php
+%%GALLERYDIR%%/contrib/joomla/gallery.xml
+%%GALLERYDIR%%/contrib/joomla/images/logo-228x67.png
+%%GALLERYDIR%%/contrib/joomla/includes/frontend.php
+%%GALLERYDIR%%/contrib/joomla/toolbar.gallery.php
 %%GALLERYDIR%%/contrib/mambo/HowTo.txt
 %%GALLERYDIR%%/contrib/mambo/admin.gallery.html.php
 %%GALLERYDIR%%/contrib/mambo/admin.gallery.php
@@ -60,7 +70,6 @@
 %%GALLERYDIR%%/contrib/phpBB2/HowTo.txt
 %%GALLERYDIR%%/contrib/phpBB2/modules.php
 %%GALLERYDIR%%/contrib/phpBB2/phpBB2-manual_changes.txt
-%%GALLERYDIR%%/contrib/phpBB2/phpBB2.patch
 %%GALLERYDIR%%/contrib/phpnuke/block-Random_Image.php.sample
 %%GALLERYDIR%%/contrib/phpnuke/modules.php.MOD
 %%GALLERYDIR%%/contrib/phpnuke/modules.php.patch
@@ -163,6 +172,7 @@
 %%GALLERYDIR%%/docs/index.html
 %%GALLERYDIR%%/docs/preface.html
 %%GALLERYDIR%%/docs/pretty-html.css
+%%GALLERYDIR%%/download.php
 %%GALLERYDIR%%/ecard_form.php
 %%GALLERYDIR%%/ecard_preview.php
 %%GALLERYDIR%%/edit_appearance.php
@@ -173,7 +183,8 @@
 %%GALLERYDIR%%/extra_fields.php
 %%GALLERYDIR%%/gallery_remote.php
 %%GALLERYDIR%%/gallery_remote2.php
-%%GALLERYDIR%%/html/errorRow.inc
+%%GALLERYDIR%%/help/imagemap.php
+%%GALLERYDIR%%/help/metadataOnUpload.php
 %%GALLERYDIR%%/html/userData.inc
 %%GALLERYDIR%%/html_wrap/album.footer.default
 %%GALLERYDIR%%/html_wrap/album.header.default
@@ -272,6 +283,7 @@
 %%GALLERYDIR%%/html_wrap/stats.header.default
 %%GALLERYDIR%%/html_wrap/wrapper.footer.default
 %%GALLERYDIR%%/html_wrap/wrapper.header.default
+%%GALLERYDIR%%/imagemap.php
 %%GALLERYDIR%%/images/BB1.gif
 %%GALLERYDIR%%/images/BL1.gif
 %%GALLERYDIR%%/images/BR1.gif
@@ -292,6 +304,7 @@
 %%GALLERYDIR%%/images/albumthumb_RR.gif
 %%GALLERYDIR%%/images/albumthumb_TR.gif
 %%GALLERYDIR%%/images/bar.gif
+%%GALLERYDIR%%/images/collapse.gif
 %%GALLERYDIR%%/images/colorpicker.png
 %%GALLERYDIR%%/images/colorscale.png
 %%GALLERYDIR%%/images/computer.gif
@@ -330,13 +343,17 @@
 %%GALLERYDIR%%/images/ecard_images/icon_square.gif
 %%GALLERYDIR%%/images/ecard_images/leer.gif
 %%GALLERYDIR%%/images/ecard_images/postcard.gif
+%%GALLERYDIR%%/images/expand.gif
 %%GALLERYDIR%%/images/favicon.ico
 %%GALLERYDIR%%/images/g1-phpBB2-icon.png
 %%GALLERYDIR%%/images/gallery-tag.png
+%%GALLERYDIR%%/images/green_trafficlight.gif
 %%GALLERYDIR%%/images/icons/1leftarrow.gif
 %%GALLERYDIR%%/images/icons/1rightarrow.gif
 %%GALLERYDIR%%/images/icons/2downarrow.gif
+%%GALLERYDIR%%/images/icons/behavior-capplet.gif
 %%GALLERYDIR%%/images/icons/camera.gif
+%%GALLERYDIR%%/images/icons/compressed.png
 %%GALLERYDIR%%/images/icons/decrypted.gif
 %%GALLERYDIR%%/images/icons/delete.gif
 %%GALLERYDIR%%/images/icons/display.gif
@@ -345,17 +362,27 @@
 %%GALLERYDIR%%/images/icons/exit.gif
 %%GALLERYDIR%%/images/icons/folder_new.gif
 %%GALLERYDIR%%/images/icons/frame_query.gif
+%%GALLERYDIR%%/images/icons/help.gif
 %%GALLERYDIR%%/images/icons/history.gif
 %%GALLERYDIR%%/images/icons/idea.gif
 %%GALLERYDIR%%/images/icons/identity.gif
 %%GALLERYDIR%%/images/icons/info.gif
 %%GALLERYDIR%%/images/icons/kcmfontinst.gif
 %%GALLERYDIR%%/images/icons/kdf.gif
+%%GALLERYDIR%%/images/icons/nav_first.gif
+%%GALLERYDIR%%/images/icons/nav_last.gif
+%%GALLERYDIR%%/images/icons/nav_next.gif
+%%GALLERYDIR%%/images/icons/nav_prev.gif
 %%GALLERYDIR%%/images/icons/no_idea.gif
 %%GALLERYDIR%%/images/icons/reload.gif
 %%GALLERYDIR%%/images/icons/showcomment.gif
 %%GALLERYDIR%%/images/icons/tab_duplicate.gif
 %%GALLERYDIR%%/images/icons/thumbnail.gif
+%%GALLERYDIR%%/images/icons/tree/join-left.gif
+%%GALLERYDIR%%/images/icons/tree/join-right.gif
+%%GALLERYDIR%%/images/icons/tree/joinbottom-left.gif
+%%GALLERYDIR%%/images/icons/tree/joinbottom-right.gif
+%%GALLERYDIR%%/images/icons/unsortedList.gif
 %%GALLERYDIR%%/images/icons/viewmag1.gif
 %%GALLERYDIR%%/images/icons/window_fullscreen.gif
 %%GALLERYDIR%%/images/icons/window_nofullscreen.gif
@@ -366,17 +393,15 @@
 %%GALLERYDIR%%/images/nav_dot.gif
 %%GALLERYDIR%%/images/nav_dot_left.gif
 %%GALLERYDIR%%/images/nav_dot_right.gif
-%%GALLERYDIR%%/images/nav_first.gif
 %%GALLERYDIR%%/images/nav_home.gif
-%%GALLERYDIR%%/images/nav_last.gif
-%%GALLERYDIR%%/images/nav_next.gif
 %%GALLERYDIR%%/images/nav_page.gif
-%%GALLERYDIR%%/images/nav_prev.gif
 %%GALLERYDIR%%/images/pixel_trans.gif
+%%GALLERYDIR%%/images/red_trafficlight.gif
 %%GALLERYDIR%%/images/simplex-bkg.gif
 %%GALLERYDIR%%/images/tab_bottom.gif
 %%GALLERYDIR%%/images/uploading.gif
-%%GALLERYDIR%%/includes/add_photos/add_admin.inc
+%%GALLERYDIR%%/images/yellow_red_trafficlight.gif
+%%GALLERYDIR%%/images/yellow_trafficlight.gif
 %%GALLERYDIR%%/includes/add_photos/add_applet.cfg
 %%GALLERYDIR%%/includes/add_photos/add_applet.inc
 %%GALLERYDIR%%/includes/add_photos/add_applet_mini.cfg
@@ -386,6 +411,8 @@
 %%GALLERYDIR%%/includes/add_photos/add_url.inc
 %%GALLERYDIR%%/includes/add_photos/captionOptions.inc.php
 %%GALLERYDIR%%/includes/definitions/albumProperties.php
+%%GALLERYDIR%%/includes/definitions/mime.mapping.php
+%%GALLERYDIR%%/includes/definitions/navIcons.php
 %%GALLERYDIR%%/includes/definitions/services.php
 %%GALLERYDIR%%/includes/ecard/templates/ecard_1.tpl
 %%GALLERYDIR%%/includes/ecard/templates/error.htm
@@ -408,7 +435,12 @@
 %%GALLERYDIR%%/java/metadata-extractor-2.1.jar
 %%GALLERYDIR%%/js/client_sniff.js
 %%GALLERYDIR%%/js/fitToWindow.js.php
+%%GALLERYDIR%%/js/imagemap.js
+%%GALLERYDIR%%/js/multifile.js.php
 %%GALLERYDIR%%/js/sectionTabs.js.php
+%%GALLERYDIR%%/js/toggle.js
+%%GALLERYDIR%%/js/wz_jsgraphics.js
+%%GALLERYDIR%%/js/wz_tooltip.js
 %%GALLERYDIR%%/layout/adminAlbumCommands.inc
 %%GALLERYDIR%%/layout/adminbox.inc
 %%GALLERYDIR%%/layout/breadcrumb.inc
@@ -425,8 +457,11 @@
 %%GALLERYDIR%%/layout/searchdraw.inc
 %%GALLERYDIR%%/layout/watermarkform.inc
 %%GALLERYDIR%%/lib/Form.php
+%%GALLERYDIR%%/lib/album.php
 %%GALLERYDIR%%/lib/albumItem.php
 %%GALLERYDIR%%/lib/colorpicker.php
+%%GALLERYDIR%%/lib/content.php
+%%GALLERYDIR%%/lib/imageManipulation.php
 %%GALLERYDIR%%/lib/lang.php
 %%GALLERYDIR%%/lib/mail.php
 %%GALLERYDIR%%/lib/messages.php
@@ -645,8 +680,10 @@
 %%GALLERYDIR%%/po/copyright-header.txt
 %%GALLERYDIR%%/po/create_po_template.sh
 %%GALLERYDIR%%/po/edit_changelog.sh
+%%GALLERYDIR%%/po/filelist-common
 %%GALLERYDIR%%/po/filelist-config
 %%GALLERYDIR%%/po/filelist-core
+%%GALLERYDIR%%/po/gallery-common.pot
 %%GALLERYDIR%%/po/gallery-config.pot
 %%GALLERYDIR%%/po/gallery-core.pot
 %%GALLERYDIR%%/po/make_mo_files.sh
@@ -1089,6 +1126,7 @@
 @dirrm %%GALLERYDIR%%/includes/definitions
 @dirrm %%GALLERYDIR%%/includes/add_photos
 @dirrm %%GALLERYDIR%%/includes
+@dirrm %%GALLERYDIR%%/images/icons/tree
 @dirrm %%GALLERYDIR%%/images/icons
 @dirrm %%GALLERYDIR%%/images/ecard_images
 @dirrm %%GALLERYDIR%%/images
@@ -1103,6 +1141,7 @@
 @dirrm %%GALLERYDIR%%/html_wrap/frames
 @dirrm %%GALLERYDIR%%/html_wrap
 @dirrm %%GALLERYDIR%%/html
+@dirrm %%GALLERYDIR%%/help
 @dirrm %%GALLERYDIR%%/docs/images
 @dirrm %%GALLERYDIR%%/docs/g1package/images
 @dirrm %%GALLERYDIR%%/docs/g1package
@@ -1116,6 +1155,10 @@
 @dirrm %%GALLERYDIR%%/contrib/mambo/images
 @dirrm %%GALLERYDIR%%/contrib/mambo/classes
 @dirrm %%GALLERYDIR%%/contrib/mambo
+@dirrm %%GALLERYDIR%%/contrib/joomla/includes
+@dirrm %%GALLERYDIR%%/contrib/joomla/images
+@dirrm %%GALLERYDIR%%/contrib/joomla/classes
+@dirrm %%GALLERYDIR%%/contrib/joomla
 @dirrm %%GALLERYDIR%%/contrib/GeekLog
 @dirrm %%GALLERYDIR%%/contrib
 @dirrm %%GALLERYDIR%%/classes/remote
@@ -1132,5 +1175,4 @@
 @dirrm %%GALLERYDIR%%/classes/Mail
 @dirrm %%GALLERYDIR%%/classes/HTML
 @dirrm %%GALLERYDIR%%/classes
-@dirrm %%GALLERYDIR%%/RCS
 @unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true