- Update to 1.5

PR:		79919
Submitted by:	Alex Varju <freebsd-ports@varju.ca>

3 files changed, 391 insertions, 386 deletions

diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 5685dd51688b..d821989a0846 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.4.6
+PORTVERSION=	1.5
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
 DIST_SUBDIR=	gallery
 
@@ -26,7 +26,7 @@ WANT_PHP_WEB=	yes
 
 .if !defined(WITHOUT_NLS)
 USE_PHP+=	gettext
-LANGVERSION=	1.4.4-pl4
+LANGVERSION=	1.5-RC2
 
 LANGPACKS=	af_ZA-${LANGVERSION}${EXTRACT_SUFX} \
 		bg_BG-${LANGVERSION}${EXTRACT_SUFX} \
@@ -39,8 +39,6 @@ LANGPACKS=	af_ZA-${LANGVERSION}${EXTRACT_SUFX} \
 		fi_FI-${LANGVERSION}${EXTRACT_SUFX} \
 		fr_FR-${LANGVERSION}${EXTRACT_SUFX} \
 		gl_ES-${LANGVERSION}${EXTRACT_SUFX} \
-		he_IL-${LANGVERSION}${EXTRACT_SUFX} \
-		he_IL.utf8-${LANGVERSION}${EXTRACT_SUFX} \
 		hu_HU-${LANGVERSION}${EXTRACT_SUFX} \
 		is_IS-${LANGVERSION}${EXTRACT_SUFX} \
 		it_IT-${LANGVERSION}${EXTRACT_SUFX} \
@@ -58,13 +56,10 @@ LANGPACKS=	af_ZA-${LANGVERSION}${EXTRACT_SUFX} \
 		sl_SI-${LANGVERSION}${EXTRACT_SUFX} \
 		sv_SE-${LANGVERSION}${EXTRACT_SUFX} \
 		tr_TR-${LANGVERSION}${EXTRACT_SUFX} \
-		uk_UA-${LANGVERSION}${EXTRACT_SUFX} \
 		vi_VN-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_CN-${LANGVERSION}${EXTRACT_SUFX} \
 		zh_HK-${LANGVERSION}${EXTRACT_SUFX} \
 		zh_HK.utf8-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW.utf8-${LANGVERSION}${EXTRACT_SUFX}
+		zh_TW-${LANGVERSION}${EXTRACT_SUFX}
 PLIST_SUB=		NLS=""
 .else
 PLIST_SUB=		NLS="@comment "
diff --git a/www/gallery2/distinfo b/www/gallery2/distinfo
index 8cf8e63e0b58..89511a99f3ba 100644
--- a/www/gallery2/distinfo
+++ b/www/gallery2/distinfo
@@ -1,76 +1,66 @@
-MD5 (gallery/gallery-1.4.4-pl6.tar.gz) = 0e9ba8dedd57fe10d06b39ad047f14bd
-SIZE (gallery/gallery-1.4.4-pl6.tar.gz) = 1759019
-MD5 (gallery/af_ZA-1.4.4-pl4.tar.gz) = 1c1f984406ed6477bf930b75ecfb719b
-SIZE (gallery/af_ZA-1.4.4-pl4.tar.gz) = 120693
-MD5 (gallery/bg_BG-1.4.4-pl4.tar.gz) = 276bb336fd1697cb2b4cbd8a0886ba1c
-SIZE (gallery/bg_BG-1.4.4-pl4.tar.gz) = 127690
-MD5 (gallery/ca_ES-1.4.4-pl4.tar.gz) = 860a4a3574afa4e4f4710ce219fd9c9c
-SIZE (gallery/ca_ES-1.4.4-pl4.tar.gz) = 75506
-MD5 (gallery/cs_CZ.iso-8859-2-1.4.4-pl4.tar.gz) = 9a7e14dee9ee3fc764d50d81f5911a01
-SIZE (gallery/cs_CZ.iso-8859-2-1.4.4-pl4.tar.gz) = 88679
-MD5 (gallery/da_DK-1.4.4-pl4.tar.gz) = 04e73f06dc2a52846aae4c53358eac47
-SIZE (gallery/da_DK-1.4.4-pl4.tar.gz) = 93969
-MD5 (gallery/de_DE-1.4.4-pl4.tar.gz) = 9e5f4d92a3781d0f2badd414413e6010
-SIZE (gallery/de_DE-1.4.4-pl4.tar.gz) = 138673
-MD5 (gallery/en_GB-1.4.4-pl4.tar.gz) = 274315f18a6dc5b0aef712d38e16ae2d
-SIZE (gallery/en_GB-1.4.4-pl4.tar.gz) = 40388
-MD5 (gallery/es_ES-1.4.4-pl4.tar.gz) = f7d63a1d013b88dfcc655792e46811eb
-SIZE (gallery/es_ES-1.4.4-pl4.tar.gz) = 133530
-MD5 (gallery/fi_FI-1.4.4-pl4.tar.gz) = c06d4f37ac93bc9009be1a1de0babf58
-SIZE (gallery/fi_FI-1.4.4-pl4.tar.gz) = 128456
-MD5 (gallery/fr_FR-1.4.4-pl4.tar.gz) = 170391e1bacaee044823d4ecb7601ae2
-SIZE (gallery/fr_FR-1.4.4-pl4.tar.gz) = 122557
-MD5 (gallery/gl_ES-1.4.4-pl4.tar.gz) = e67da215da785af636052c74f3490a6c
-SIZE (gallery/gl_ES-1.4.4-pl4.tar.gz) = 125512
-MD5 (gallery/he_IL-1.4.4-pl4.tar.gz) = c414252d3312515f22a8c37cc0b5a88b
-SIZE (gallery/he_IL-1.4.4-pl4.tar.gz) = 27215
-MD5 (gallery/he_IL.utf8-1.4.4-pl4.tar.gz) = 6396f09e153e522fe38892dd372710a5
-SIZE (gallery/he_IL.utf8-1.4.4-pl4.tar.gz) = 80729
-MD5 (gallery/hu_HU-1.4.4-pl4.tar.gz) = 157df15ab1358ece96a858d90743c231
-SIZE (gallery/hu_HU-1.4.4-pl4.tar.gz) = 87780
-MD5 (gallery/is_IS-1.4.4-pl4.tar.gz) = c8ae88105047c0eedb8a1b66c698ae45
-SIZE (gallery/is_IS-1.4.4-pl4.tar.gz) = 122050
-MD5 (gallery/it_IT-1.4.4-pl4.tar.gz) = 9790d10b6e53a9235aae630490c2d19e
-SIZE (gallery/it_IT-1.4.4-pl4.tar.gz) = 136268
-MD5 (gallery/ja_JP-1.4.4-pl4.tar.gz) = e3d6d9ec7009519e58070c0833ea5b10
-SIZE (gallery/ja_JP-1.4.4-pl4.tar.gz) = 129728
-MD5 (gallery/ko_KR-1.4.4-pl4.tar.gz) = 371aea0dd6fcd1324fd89b7c474dbcb3
-SIZE (gallery/ko_KR-1.4.4-pl4.tar.gz) = 99644
-MD5 (gallery/lt_LT-1.4.4-pl4.tar.gz) = 68ac4d9366fa65333ed1aa1ef2080398
-SIZE (gallery/lt_LT-1.4.4-pl4.tar.gz) = 133990
-MD5 (gallery/nl_NL-1.4.4-pl4.tar.gz) = c3dd632e2860bdbe0903bb94dc9a0e1a
-SIZE (gallery/nl_NL-1.4.4-pl4.tar.gz) = 115662
-MD5 (gallery/no_NO-1.4.4-pl4.tar.gz) = 00598efc83430236ddc18ef4b07c6a69
-SIZE (gallery/no_NO-1.4.4-pl4.tar.gz) = 132320
-MD5 (gallery/pl_PL-1.4.4-pl4.tar.gz) = 704fd21e9207c38ae988f2b8ae1d71a7
-SIZE (gallery/pl_PL-1.4.4-pl4.tar.gz) = 126162
-MD5 (gallery/pt_BR-1.4.4-pl4.tar.gz) = 4a9f84577317198c3a7788342dda66eb
-SIZE (gallery/pt_BR-1.4.4-pl4.tar.gz) = 134881
-MD5 (gallery/pt_PT-1.4.4-pl4.tar.gz) = 23ba8bae0f1de697a6f3a7c7ee51e042
-SIZE (gallery/pt_PT-1.4.4-pl4.tar.gz) = 122184
-MD5 (gallery/ru_RU.cp1251-1.4.4-pl4.tar.gz) = 46121aa3a761b1cc27f5a0eae99d1f77
-SIZE (gallery/ru_RU.cp1251-1.4.4-pl4.tar.gz) = 136980
-MD5 (gallery/ru_RU.koi8r-1.4.4-pl4.tar.gz) = 28192fc710315d6b40904222ec8407c2
-SIZE (gallery/ru_RU.koi8r-1.4.4-pl4.tar.gz) = 136640
-MD5 (gallery/sk_SK-1.4.4-pl4.tar.gz) = 871c1a4a443ecbbb3ae6909037a8066d
-SIZE (gallery/sk_SK-1.4.4-pl4.tar.gz) = 85433
-MD5 (gallery/sl_SI-1.4.4-pl4.tar.gz) = f2424edbdab2436ca31eb5ab72a31bbb
-SIZE (gallery/sl_SI-1.4.4-pl4.tar.gz) = 78227
-MD5 (gallery/sv_SE-1.4.4-pl4.tar.gz) = 451117ea88110aef08e59f5cb1d8f659
-SIZE (gallery/sv_SE-1.4.4-pl4.tar.gz) = 132592
-MD5 (gallery/tr_TR-1.4.4-pl4.tar.gz) = db1d666414366a9acb55d886182a6f4e
-SIZE (gallery/tr_TR-1.4.4-pl4.tar.gz) = 87051
-MD5 (gallery/uk_UA-1.4.4-pl4.tar.gz) = 8d645328b4ad00ecffeb8ff74961aec9
-SIZE (gallery/uk_UA-1.4.4-pl4.tar.gz) = 69781
-MD5 (gallery/vi_VN-1.4.4-pl4.tar.gz) = fdfd1060c094e338d6f9b89135d38069
-SIZE (gallery/vi_VN-1.4.4-pl4.tar.gz) = 132958
-MD5 (gallery/zh_CN-1.4.4-pl4.tar.gz) = d9c87d1908f405b3e052d80c5d96dec9
-SIZE (gallery/zh_CN-1.4.4-pl4.tar.gz) = 75479
-MD5 (gallery/zh_HK-1.4.4-pl4.tar.gz) = c78b0156ddd39723064db9e7cb25dd3f
-SIZE (gallery/zh_HK-1.4.4-pl4.tar.gz) = 129951
-MD5 (gallery/zh_HK.utf8-1.4.4-pl4.tar.gz) = 775af874a1f1452908f9852df2dc0515
-SIZE (gallery/zh_HK.utf8-1.4.4-pl4.tar.gz) = 135546
-MD5 (gallery/zh_TW-1.4.4-pl4.tar.gz) = c67c221204a53fafdb0b80decfc04416
-SIZE (gallery/zh_TW-1.4.4-pl4.tar.gz) = 125912
-MD5 (gallery/zh_TW.utf8-1.4.4-pl4.tar.gz) = 0b322ca3b46d65ae957b0e23253eedb8
-SIZE (gallery/zh_TW.utf8-1.4.4-pl4.tar.gz) = 86620
+MD5 (gallery/gallery-1.5.tar.gz) = e86e429c703b48cd00ff6190ad6692b1
+SIZE (gallery/gallery-1.5.tar.gz) = 2341592
+MD5 (gallery/af_ZA-1.5-RC2.tar.gz) = fc90da68b36458589a1c53ccf0e756a5
+SIZE (gallery/af_ZA-1.5-RC2.tar.gz) = 125911
+MD5 (gallery/bg_BG-1.5-RC2.tar.gz) = c9b06ef8ccd8ddff7756d06b4f8399ac
+SIZE (gallery/bg_BG-1.5-RC2.tar.gz) = 133337
+MD5 (gallery/ca_ES-1.5-RC2.tar.gz) = b0ef39f663bcc83626d5cc72cd22a11f
+SIZE (gallery/ca_ES-1.5-RC2.tar.gz) = 81149
+MD5 (gallery/cs_CZ.iso-8859-2-1.5-RC2.tar.gz) = 4b662fb76e4daa630674707001fd0946
+SIZE (gallery/cs_CZ.iso-8859-2-1.5-RC2.tar.gz) = 126707
+MD5 (gallery/da_DK-1.5-RC2.tar.gz) = f4a0a91fc5261c0e06dcaef82466537b
+SIZE (gallery/da_DK-1.5-RC2.tar.gz) = 107777
+MD5 (gallery/de_DE-1.5-RC2.tar.gz) = f268a44ff46ab1823050303c30820556
+SIZE (gallery/de_DE-1.5-RC2.tar.gz) = 161417
+MD5 (gallery/en_GB-1.5-RC2.tar.gz) = 7a10ab65955d2bb27d11472626be7c93
+SIZE (gallery/en_GB-1.5-RC2.tar.gz) = 46646
+MD5 (gallery/es_ES-1.5-RC2.tar.gz) = 79c5129b83758a5dc476eb3f9719cbe5
+SIZE (gallery/es_ES-1.5-RC2.tar.gz) = 144973
+MD5 (gallery/fi_FI-1.5-RC2.tar.gz) = 63e2b805c88bd0fe24435b4920377bd3
+SIZE (gallery/fi_FI-1.5-RC2.tar.gz) = 134089
+MD5 (gallery/fr_FR-1.5-RC2.tar.gz) = 399487c7a747306bec7005af8d0d9283
+SIZE (gallery/fr_FR-1.5-RC2.tar.gz) = 142126
+MD5 (gallery/gl_ES-1.5-RC2.tar.gz) = 1fc53048f71d699735937da696f987ec
+SIZE (gallery/gl_ES-1.5-RC2.tar.gz) = 131172
+MD5 (gallery/hu_HU-1.5-RC2.tar.gz) = b15d0948df299e9485297255bd4d5eea
+SIZE (gallery/hu_HU-1.5-RC2.tar.gz) = 93145
+MD5 (gallery/is_IS-1.5-RC2.tar.gz) = 3e0b548dc93c4f65fec84b593f85bae6
+SIZE (gallery/is_IS-1.5-RC2.tar.gz) = 144215
+MD5 (gallery/it_IT-1.5-RC2.tar.gz) = e33aa76a105a30764a1b8e85babea44a
+SIZE (gallery/it_IT-1.5-RC2.tar.gz) = 155927
+MD5 (gallery/ja_JP-1.5-RC2.tar.gz) = fcc9fed5a685e3037cc826cd2fc81fe3
+SIZE (gallery/ja_JP-1.5-RC2.tar.gz) = 144142
+MD5 (gallery/ko_KR-1.5-RC2.tar.gz) = b42b469a8673b81ba355fc0c51debc47
+SIZE (gallery/ko_KR-1.5-RC2.tar.gz) = 144989
+MD5 (gallery/lt_LT-1.5-RC2.tar.gz) = 725fc2eed067e4bef59ae6c9a3916801
+SIZE (gallery/lt_LT-1.5-RC2.tar.gz) = 144585
+MD5 (gallery/nl_NL-1.5-RC2.tar.gz) = 4f29bb19ed888716cccde04a360fe490
+SIZE (gallery/nl_NL-1.5-RC2.tar.gz) = 119945
+MD5 (gallery/no_NO-1.5-RC2.tar.gz) = d621434d0d91e619a4b9fc077340e471
+SIZE (gallery/no_NO-1.5-RC2.tar.gz) = 150738
+MD5 (gallery/pl_PL-1.5-RC2.tar.gz) = 6110218ca482ece43d01c407b6442e3e
+SIZE (gallery/pl_PL-1.5-RC2.tar.gz) = 131523
+MD5 (gallery/pt_BR-1.5-RC2.tar.gz) = ee0b5b892dae2f0914ecc3d3f7bce4f9
+SIZE (gallery/pt_BR-1.5-RC2.tar.gz) = 139541
+MD5 (gallery/pt_PT-1.5-RC2.tar.gz) = 68acf721ec71ba9fa6a52c948a05c0ca
+SIZE (gallery/pt_PT-1.5-RC2.tar.gz) = 127244
+MD5 (gallery/ru_RU.cp1251-1.5-RC2.tar.gz) = 8ad5647431f43b8cefcac08fa154efeb
+SIZE (gallery/ru_RU.cp1251-1.5-RC2.tar.gz) = 142110
+MD5 (gallery/ru_RU.koi8r-1.5-RC2.tar.gz) = d7b5002235083796bf919c244152f380
+SIZE (gallery/ru_RU.koi8r-1.5-RC2.tar.gz) = 141462
+MD5 (gallery/sk_SK-1.5-RC2.tar.gz) = 31abfc242faab69d2dec74900bc674a0
+SIZE (gallery/sk_SK-1.5-RC2.tar.gz) = 90250
+MD5 (gallery/sl_SI-1.5-RC2.tar.gz) = 584c459d97e553b0a7b45d336c6b5b20
+SIZE (gallery/sl_SI-1.5-RC2.tar.gz) = 89788
+MD5 (gallery/sv_SE-1.5-RC2.tar.gz) = c477700e997cb00dca3d3faf5f29b1db
+SIZE (gallery/sv_SE-1.5-RC2.tar.gz) = 144866
+MD5 (gallery/tr_TR-1.5-RC2.tar.gz) = cd03a96f86203f22abe57937e112d134
+SIZE (gallery/tr_TR-1.5-RC2.tar.gz) = 92485
+MD5 (gallery/vi_VN-1.5-RC2.tar.gz) = 20103bd21e2caa86533dbd616d4d7817
+SIZE (gallery/vi_VN-1.5-RC2.tar.gz) = 147463
+MD5 (gallery/zh_HK-1.5-RC2.tar.gz) = f13ebca41b53681ab481fe7a40dc5fb7
+SIZE (gallery/zh_HK-1.5-RC2.tar.gz) = 133739
+MD5 (gallery/zh_HK.utf8-1.5-RC2.tar.gz) = cf03fb5977fa0e4ff42dd380bfe919f3
+SIZE (gallery/zh_HK.utf8-1.5-RC2.tar.gz) = 139761
+MD5 (gallery/zh_TW-1.5-RC2.tar.gz) = 852f7e5564671077711f13f0fd452c84
+SIZE (gallery/zh_TW-1.5-RC2.tar.gz) = 130764
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index 7603bb5cbcc8..be6da821b88f 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -4,7 +4,7 @@
 %%GALLERYDIR%%/add_photos.php
 %%GALLERYDIR%%/add_photos_frame.php
 %%GALLERYDIR%%/add_photos_refresh.php
-%%GALLERYDIR%%/adv_search.php
+%%GALLERYDIR%%/admin-page.php
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
 %%GALLERYDIR%%/block-random.php
@@ -40,6 +40,7 @@
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
 %%GALLERYDIR%%/classes/remote/GalleryRemoteProperties.php
+%%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/contrib/GeekLog/CREDITS
 %%GALLERYDIR%%/contrib/mambo/HowTo.txt
 %%GALLERYDIR%%/contrib/mambo/admin.gallery.html.php
@@ -47,7 +48,6 @@
 %%GALLERYDIR%%/contrib/mambo/classes/mambo.php
 %%GALLERYDIR%%/contrib/mambo/gallery.php
 %%GALLERYDIR%%/contrib/mambo/gallery.xml
-%%GALLERYDIR%%/contrib/mambo/gallery_popup.tpl.php
 %%GALLERYDIR%%/contrib/mambo/images/logo-228x67.png
 %%GALLERYDIR%%/contrib/mambo/includes/frontend.php
 %%GALLERYDIR%%/contrib/mambo/toolbar.gallery.php
@@ -56,14 +56,17 @@
 %%GALLERYDIR%%/contrib/phpBB2/modules.php
 %%GALLERYDIR%%/contrib/phpBB2/phpBB2-manual_changes.txt
 %%GALLERYDIR%%/contrib/phpBB2/phpBB2.patch
-%%GALLERYDIR%%/contrib/phpnuke/modules.php.patch
+%%GALLERYDIR%%/contrib/phpnuke/block-Random_Image.php.sample
 %%GALLERYDIR%%/contrib/phpnuke/modules.php.MOD
-%%GALLERYDIR%%/configure.sh
+%%GALLERYDIR%%/contrib/phpnuke/modules.php.patch
+%%GALLERYDIR%%/contrib/postnuke/readme.72x
+%%GALLERYDIR%%/contrib/postnuke/readme.750
 %%GALLERYDIR%%/copy_photo.php
 %%GALLERYDIR%%/create_user.php
+%%GALLERYDIR%%/css/base.css.default
 %%GALLERYDIR%%/css/config.css.default
 %%GALLERYDIR%%/css/embedded_style.css.default
-%%GALLERYDIR%%/css/standalone_style.css.default
+%%GALLERYDIR%%/css/screen.css.default
 %%GALLERYDIR%%/delete_album.php
 %%GALLERYDIR%%/delete_photo.php
 %%GALLERYDIR%%/delete_user.php
@@ -80,6 +83,7 @@
 %%GALLERYDIR%%/docs/g1package/gallery1-admin.mirroring.html
 %%GALLERYDIR%%/docs/g1package/gallery1-admin.offline.html
 %%GALLERYDIR%%/docs/g1package/gallery1-admin.patching.html
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.performance.html
 %%GALLERYDIR%%/docs/g1package/gallery1-admin.securing.html
 %%GALLERYDIR%%/docs/g1package/gallery1-admin.users.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.config-wizard.html
@@ -107,6 +111,11 @@
 %%GALLERYDIR%%/docs/g1package/gallery1-user.watermark.html
 %%GALLERYDIR%%/docs/g1package/html.css
 %%GALLERYDIR%%/docs/g1package/images/basic-auth.gif
+%%GALLERYDIR%%/docs/g1package/images/gallery1-admin/component_menu.png
+%%GALLERYDIR%%/docs/g1package/images/gallery1-admin/gallery_setup.png
+%%GALLERYDIR%%/docs/g1package/images/gallery1-admin/install_from_directory.png
+%%GALLERYDIR%%/docs/g1package/images/gallery1-admin/install_success.png
+%%GALLERYDIR%%/docs/g1package/images/gallery1-admin/main_menu.png
 %%GALLERYDIR%%/docs/g1package/images/up-up.gif
 %%GALLERYDIR%%/docs/g1package/images/up.gif
 %%GALLERYDIR%%/docs/g1package/index.html
@@ -235,6 +244,7 @@
 %%GALLERYDIR%%/html_wrap/frames/wooden/frame.def
 %%GALLERYDIR%%/html_wrap/gallery.footer.default
 %%GALLERYDIR%%/html_wrap/gallery.header.default
+%%GALLERYDIR%%/html_wrap/general.footer.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.frame.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.header.default
@@ -251,6 +261,8 @@
 %%GALLERYDIR%%/html_wrap/search.header.default
 %%GALLERYDIR%%/html_wrap/slideshow.footer.default
 %%GALLERYDIR%%/html_wrap/slideshow.header.default
+%%GALLERYDIR%%/html_wrap/stats.footer.default
+%%GALLERYDIR%%/html_wrap/stats.header.default
 %%GALLERYDIR%%/html_wrap/wrapper.footer.default
 %%GALLERYDIR%%/html_wrap/wrapper.header.default
 %%GALLERYDIR%%/images/BB1.gif
@@ -275,8 +287,27 @@
 %%GALLERYDIR%%/images/bar.gif
 %%GALLERYDIR%%/images/computer.gif
 %%GALLERYDIR%%/images/donate.jpg
+%%GALLERYDIR%%/images/favicon.ico
 %%GALLERYDIR%%/images/g1-phpBB2-icon.png
 %%GALLERYDIR%%/images/gallery-tag.png
+%%GALLERYDIR%%/images/icons/1leftarrow.gif
+%%GALLERYDIR%%/images/icons/1rightarrow.gif
+%%GALLERYDIR%%/images/icons/2downarrow.gif
+%%GALLERYDIR%%/images/icons/delete.gif
+%%GALLERYDIR%%/images/icons/display.gif
+%%GALLERYDIR%%/images/icons/exit.gif
+%%GALLERYDIR%%/images/icons/folder_new.gif
+%%GALLERYDIR%%/images/icons/frame_query.gif
+%%GALLERYDIR%%/images/icons/history.gif
+%%GALLERYDIR%%/images/icons/identity.gif
+%%GALLERYDIR%%/images/icons/info.gif
+%%GALLERYDIR%%/images/icons/kdf.gif
+%%GALLERYDIR%%/images/icons/reload.gif
+%%GALLERYDIR%%/images/icons/showcomment.gif
+%%GALLERYDIR%%/images/icons/window_fullscreen.gif
+%%GALLERYDIR%%/images/icons/window_nofullscreen.gif
+%%GALLERYDIR%%/images/icons/yast_sysadmin.gif
+%%GALLERYDIR%%/images/icons/yast_sysadmin2.gif
 %%GALLERYDIR%%/images/movie.thumb.jpg
 %%GALLERYDIR%%/images/nav_dot.gif
 %%GALLERYDIR%%/images/nav_dot_left.gif
@@ -297,13 +328,14 @@
 %%GALLERYDIR%%/includes/add_photos/add_applet_mini.cfg
 %%GALLERYDIR%%/includes/add_photos/add_applet_mini.inc
 %%GALLERYDIR%%/includes/add_photos/add_form.inc
-%%GALLERYDIR%%/includes/add_photos/add_form_one.inc
 %%GALLERYDIR%%/includes/add_photos/add_other.inc
 %%GALLERYDIR%%/includes/add_photos/add_url.inc
+%%GALLERYDIR%%/includes/add_photos/captionOptions.inc.php
 %%GALLERYDIR%%/includes/slideshow/applet.cfg
 %%GALLERYDIR%%/includes/slideshow/applet.inc
 %%GALLERYDIR%%/includes/slideshow/high.inc
 %%GALLERYDIR%%/includes/slideshow/low.inc
+%%GALLERYDIR%%/includes/stats/stats.inc.php
 %%GALLERYDIR%%/index.php
 %%GALLERYDIR%%/init.php
 %%GALLERYDIR%%/java/GalleryRemoteApplet.jar
@@ -311,6 +343,7 @@
 %%GALLERYDIR%%/java/GalleryRemoteHTTPClient.jar
 %%GALLERYDIR%%/java/ImageTools.jar
 %%GALLERYDIR%%/java/applet_img.jar
+%%GALLERYDIR%%/java/metadata-extractor-2.1.jar
 %%GALLERYDIR%%/js/client_sniff.js
 %%GALLERYDIR%%/js/fitToWindow.js.php
 %%GALLERYDIR%%/js/sectionTabs.js.php
@@ -331,6 +364,8 @@
 %%GALLERYDIR%%/layout/watermarkform.inc
 %%GALLERYDIR%%/lib/Form.php
 %%GALLERYDIR%%/lib/lang.php
+%%GALLERYDIR%%/lib/popup.php
+%%GALLERYDIR%%/lib/url.php
 %%GALLERYDIR%%/lib/voting.php
 %%NLS%%%%GALLERYDIR%%/locale/af_ZA/LC_MESSAGES/af_ZA-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/af_ZA/LC_MESSAGES/af_ZA-gallery_core.mo
@@ -399,16 +434,6 @@
 %%NLS%%%%GALLERYDIR%%/locale/gl_ES/gl_ES-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/gl_ES/gl_ES-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/gl_ES/gl_ES-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/he_IL/LC_MESSAGES/he_IL-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/he_IL/LC_MESSAGES/he_IL-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/he_IL/flagimage/he_IL.gif
-%%NLS%%%%GALLERYDIR%%/locale/he_IL/he_IL-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/LC_MESSAGES/he_IL.utf8-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/LC_MESSAGES/he_IL.utf8-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/flagimage/he_IL.utf8.gif
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/he_IL.utf8-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/he_IL.utf8-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/he_IL.utf8/he_IL.utf8-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/hu_HU/LC_MESSAGES/hu_HU-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/hu_HU/LC_MESSAGES/hu_HU-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/hu_HU/flagimage/hu_HU.gif
@@ -475,24 +500,23 @@
 %%NLS%%%%GALLERYDIR%%/locale/pt_PT/pt_PT-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/pt_PT/pt_PT-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/pt_PT/pt_PT-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage/ru_RU.koi8r.gif
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/LC_MESSAGES/ru_RU.cp1251-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/LC_MESSAGES/ru_RU.cp1251-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/flagimage/ru_RU.cp1251.gif
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/ru_RU.cp1251-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/ru_RU.cp1251-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/ru_RU.cp1251-nls.php
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_config.mo
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_core.mo
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage/ru_RU.koi8r.gif
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-gallery_config.po
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-gallery_core.po
+%%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/ru_RU.koi8r-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/sk_SK/LC_MESSAGES/sk_SK-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/sk_SK/LC_MESSAGES/sk_SK-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/sk_SK/flagimage/sk_SK.gif
 %%NLS%%%%GALLERYDIR%%/locale/sk_SK/sk_SK-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/sk_SK/sk_SK-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/sk_SK/sk_SK-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/sl_SI/LC_MESSAGES/sl_SI-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/sl_SI/LC_MESSAGES/sl_SI-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/sl_SI/flagimage/sl_SI.gif
@@ -511,42 +535,22 @@
 %%NLS%%%%GALLERYDIR%%/locale/tr_TR/tr_TR-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/tr_TR/tr_TR-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/tr_TR/tr_TR-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/LC_MESSAGES/uk_UA-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/LC_MESSAGES/uk_UA-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/flagimage/uk_UA.gif
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/uk_UA-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/uk_UA-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/uk_UA/uk_UA-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/LC_MESSAGES/vi_VN-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/LC_MESSAGES/vi_VN-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/flagimage/vi_VN.gif
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/vi_VN-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/vi_VN-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/vi_VN/vi_VN-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/LC_MESSAGES/zh_CN-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/LC_MESSAGES/zh_CN-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/flagimage/zh_CN.gif
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/zh_CN-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/zh_CN-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_CN/zh_CN-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK/LC_MESSAGES/zh_HK-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK/LC_MESSAGES/zh_HK-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/zh_HK/flagimage/zh_HK.gif
+%%NLS%%%%GALLERYDIR%%/locale/zh_HK/flagimage/zh_TW.gif
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK/zh_HK-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK/zh_HK-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_HK/zh_HK-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/LC_MESSAGES/zh_HK.utf8-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/LC_MESSAGES/zh_HK.utf8-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/flagimage/zh_HK.gif
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/zh_HK.utf8-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/zh_HK.utf8-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/zh_HK.utf8-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/LC_MESSAGES/zh_TW.utf8-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/LC_MESSAGES/zh_TW.utf8-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/flagimage/zh_TW.utf8.gif
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/zh_TW.utf8-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/zh_TW.utf8-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/zh_TW.utf8/zh_TW.utf8-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/zh_TW/LC_MESSAGES/zh_TW-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/zh_TW/LC_MESSAGES/zh_TW-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/zh_TW/flagimage/zh_TW.gif
@@ -619,8 +623,12 @@
 %%GALLERYDIR%%/setup/phpinfo.php
 %%GALLERYDIR%%/setup/session_test.php
 %%GALLERYDIR%%/setup/write.inc
-%%GALLERYDIR%%/skins/bblue/css/embedded_style.css
-%%GALLERYDIR%%/skins/bblue/css/standalone_style.css
+%%GALLERYDIR%%/skins/bars002/css/screen.css
+%%GALLERYDIR%%/skins/bars002/images/navbar.jpg
+%%GALLERYDIR%%/skins/bars002/images/screenshot.jpg
+%%GALLERYDIR%%/skins/bars002/images/topbar.jpg
+%%GALLERYDIR%%/skins/bars002/style.def
+%%GALLERYDIR%%/skins/bblue/css/screen.css
 %%GALLERYDIR%%/skins/bblue/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/bblue/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bblue/images/mod_toplight_bg.jpg
@@ -629,8 +637,7 @@
 %%GALLERYDIR%%/skins/bblue/images/mod_under_hl.jpg
 %%GALLERYDIR%%/skins/bblue/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bblue/style.def
-%%GALLERYDIR%%/skins/bgreen/css/embedded_style.css
-%%GALLERYDIR%%/skins/bgreen/css/standalone_style.css
+%%GALLERYDIR%%/skins/bgreen/css/screen.css
 %%GALLERYDIR%%/skins/bgreen/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/bgreen/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bgreen/images/mod_toplight_bg.jpg
@@ -641,8 +648,7 @@
 %%GALLERYDIR%%/skins/bgreen/images/mod_under_hl.jpg
 %%GALLERYDIR%%/skins/bgreen/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bgreen/style.def
-%%GALLERYDIR%%/skins/bgreen2/css/embedded_style.css
-%%GALLERYDIR%%/skins/bgreen2/css/standalone_style.css
+%%GALLERYDIR%%/skins/bgreen2/css/screen.css
 %%GALLERYDIR%%/skins/bgreen2/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/bgreen2/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bgreen2/images/mod_toplight_bg.jpg
@@ -651,22 +657,19 @@
 %%GALLERYDIR%%/skins/bgreen2/images/mod_under_hl.jpg
 %%GALLERYDIR%%/skins/bgreen2/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bgreen2/style.def
-%%GALLERYDIR%%/skins/black/css/embedded_style.css
-%%GALLERYDIR%%/skins/black/css/standalone_style.css
+%%GALLERYDIR%%/skins/black/css/screen.css
 %%GALLERYDIR%%/skins/black/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/black/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/black/images/screenshot.jpg
 %%GALLERYDIR%%/skins/black/style.def
-%%GALLERYDIR%%/skins/bluemod/css/embedded_style.css
-%%GALLERYDIR%%/skins/bluemod/css/standalone_style.css
+%%GALLERYDIR%%/skins/bluemod/css/screen.css
 %%GALLERYDIR%%/skins/bluemod/images/mod_background.jpg
 %%GALLERYDIR%%/skins/bluemod/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bluemod/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/bluemod/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/bluemod/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bluemod/style.def
-%%GALLERYDIR%%/skins/bpurple/css/embedded_style.css
-%%GALLERYDIR%%/skins/bpurple/css/standalone_style.css
+%%GALLERYDIR%%/skins/bpurple/css/screen.css
 %%GALLERYDIR%%/skins/bpurple/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/bpurple/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bpurple/images/mod_toplight_bg.jpg
@@ -675,8 +678,7 @@
 %%GALLERYDIR%%/skins/bpurple/images/mod_under_hl.jpg
 %%GALLERYDIR%%/skins/bpurple/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bpurple/style.def
-%%GALLERYDIR%%/skins/bred/css/embedded_style.css
-%%GALLERYDIR%%/skins/bred/css/standalone_style.css
+%%GALLERYDIR%%/skins/bred/css/screen.css
 %%GALLERYDIR%%/skins/bred/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/bred/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bred/images/mod_toplight_bg.jpg
@@ -687,24 +689,22 @@
 %%GALLERYDIR%%/skins/bred/images/mod_under_hl.jpg
 %%GALLERYDIR%%/skins/bred/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bred/style.def
-%%GALLERYDIR%%/skins/bubbles/css/embedded_style.css
-%%GALLERYDIR%%/skins/bubbles/css/standalone_style.css
+%%GALLERYDIR%%/skins/bubbles/css/screen.css
 %%GALLERYDIR%%/skins/bubbles/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/bubbles/images/mod_toplight_bg.jpg
 %%GALLERYDIR%%/skins/bubbles/images/mod_toplight_left.jpg
 %%GALLERYDIR%%/skins/bubbles/images/mod_toplight_right.jpg
 %%GALLERYDIR%%/skins/bubbles/images/screenshot.jpg
 %%GALLERYDIR%%/skins/bubbles/style.def
-%%GALLERYDIR%%/skins/butterfly_green/css/embedded_style.css
-%%GALLERYDIR%%/skins/butterfly_green/css/standalone_style.css
+%%GALLERYDIR%%/skins/butterfly_green/css/screen.css
+%%GALLERYDIR%%/skins/butterfly_green/images/mod_box.jpg
 %%GALLERYDIR%%/skins/butterfly_green/images/mod_headliner.jpg
 %%GALLERYDIR%%/skins/butterfly_green/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/butterfly_green/images/mod_toplight_bg.jpg
 %%GALLERYDIR%%/skins/butterfly_green/images/mod_toplight_left.jpg
 %%GALLERYDIR%%/skins/butterfly_green/images/screenshot.jpg
 %%GALLERYDIR%%/skins/butterfly_green/style.def
-%%GALLERYDIR%%/skins/greenpurple/css/embedded_style.css
-%%GALLERYDIR%%/skins/greenpurple/css/standalone_style.css
+%%GALLERYDIR%%/skins/greenpurple/css/screen.css
 %%GALLERYDIR%%/skins/greenpurple/images/mod_descbg.jpg
 %%GALLERYDIR%%/skins/greenpurple/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/greenpurple/images/mod_navbox.jpg
@@ -714,8 +714,7 @@
 %%GALLERYDIR%%/skins/greenpurple/images/mod_titlert.jpg
 %%GALLERYDIR%%/skins/greenpurple/images/screenshot.jpg
 %%GALLERYDIR%%/skins/greenpurple/style.def
-%%GALLERYDIR%%/skins/hotred/css/embedded_style.css
-%%GALLERYDIR%%/skins/hotred/css/standalone_style.css
+%%GALLERYDIR%%/skins/hotred/css/screen.css
 %%GALLERYDIR%%/skins/hotred/images/mod_descbg.jpg
 %%GALLERYDIR%%/skins/hotred/images/mod_descbox.jpg
 %%GALLERYDIR%%/skins/hotred/images/mod_navbar.jpg
@@ -724,13 +723,11 @@
 %%GALLERYDIR%%/skins/hotred/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/hotred/images/screenshot.jpg
 %%GALLERYDIR%%/skins/hotred/style.def
-%%GALLERYDIR%%/skins/jenskin/css/embedded_style.css
-%%GALLERYDIR%%/skins/jenskin/css/standalone_style.css
+%%GALLERYDIR%%/skins/jenskin/css/screen.css
 %%GALLERYDIR%%/skins/jenskin/images/screenshot.jpg
 %%GALLERYDIR%%/skins/jenskin/images/simplex-bkg.gif
 %%GALLERYDIR%%/skins/jenskin/style.def
-%%GALLERYDIR%%/skins/lilac/css/embedded_style.css
-%%GALLERYDIR%%/skins/lilac/css/standalone_style.css
+%%GALLERYDIR%%/skins/lilac/css/screen.css
 %%GALLERYDIR%%/skins/lilac/images/mod_descbg.jpg
 %%GALLERYDIR%%/skins/lilac/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/lilac/images/mod_navbox.jpg
@@ -738,8 +735,36 @@
 %%GALLERYDIR%%/skins/lilac/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/lilac/images/screenshot.jpg
 %%GALLERYDIR%%/skins/lilac/style.def
-%%GALLERYDIR%%/skins/paint/css/embedded_style.css
-%%GALLERYDIR%%/skins/paint/css/standalone_style.css
+%%GALLERYDIR%%/skins/madmod1/css/screen.css
+%%GALLERYDIR%%/skins/madmod1/images/background.jpg
+%%GALLERYDIR%%/skins/madmod1/images/background9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/bar.gif
+%%GALLERYDIR%%/skins/madmod1/images/button9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/gallery9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/headbg9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/navbg9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/next9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/prev9.jpg
+%%GALLERYDIR%%/skins/madmod1/images/screenshot.jpg
+%%GALLERYDIR%%/skins/madmod1/images/titlehead9.jpg
+%%GALLERYDIR%%/skins/madmod1/style.def
+%%GALLERYDIR%%/skins/madmod1/tpl/album.footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/album.header.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/breadcrumb.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/gallery.footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/gallery.header.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/header.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/menu.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/navigator.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/navphoto.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/photo.footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/photo.header.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/search.footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/search.header.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/slideshow.footer.tpl
+%%GALLERYDIR%%/skins/madmod1/tpl/slideshow.header.tpl
+%%GALLERYDIR%%/skins/paint/css/screen.css
 %%GALLERYDIR%%/skins/paint/images/mod_background.jpg
 %%GALLERYDIR%%/skins/paint/images/mod_descbg.jpg
 %%GALLERYDIR%%/skins/paint/images/mod_navbar.jpg
@@ -748,16 +773,14 @@
 %%GALLERYDIR%%/skins/paint/images/mod_toplight_right.gif
 %%GALLERYDIR%%/skins/paint/images/screenshot.jpg
 %%GALLERYDIR%%/skins/paint/style.def
-%%GALLERYDIR%%/skins/redmarble/css/embedded_style.css
-%%GALLERYDIR%%/skins/redmarble/css/standalone_style.css
+%%GALLERYDIR%%/skins/redmarble/css/screen.css
 %%GALLERYDIR%%/skins/redmarble/images/mod_background.jpg
 %%GALLERYDIR%%/skins/redmarble/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/redmarble/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/redmarble/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/redmarble/images/screenshot.jpg
 %%GALLERYDIR%%/skins/redmarble/style.def
-%%GALLERYDIR%%/skins/slick/css/embedded_style.css
-%%GALLERYDIR%%/skins/slick/css/standalone_style.css
+%%GALLERYDIR%%/skins/slick/css/screen.css
 %%GALLERYDIR%%/skins/slick/images/mod_background.jpg
 %%GALLERYDIR%%/skins/slick/images/mod_descbg.jpg
 %%GALLERYDIR%%/skins/slick/images/mod_headliner.jpg
@@ -773,22 +796,19 @@
 %%GALLERYDIR%%/skins/slick/images/mod_toplight_right.jpg
 %%GALLERYDIR%%/skins/slick/images/screenshot.jpg
 %%GALLERYDIR%%/skins/slick/style.def
-%%GALLERYDIR%%/skins/suit/css/embedded_style.css
-%%GALLERYDIR%%/skins/suit/css/standalone_style.css
+%%GALLERYDIR%%/skins/suit/css/screen.css
 %%GALLERYDIR%%/skins/suit/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/suit/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/suit/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/suit/images/screenshot.jpg
 %%GALLERYDIR%%/skins/suit/style.def
-%%GALLERYDIR%%/skins/white1/css/embedded_style.css
-%%GALLERYDIR%%/skins/white1/css/standalone_style.css
+%%GALLERYDIR%%/skins/white1/css/screen.css
 %%GALLERYDIR%%/skins/white1/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/white1/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/white1/images/mod_titlemid.jpg
 %%GALLERYDIR%%/skins/white1/images/screenshot.jpg
 %%GALLERYDIR%%/skins/white1/style.def
-%%GALLERYDIR%%/skins/yellow/css/embedded_style.css
-%%GALLERYDIR%%/skins/yellow/css/standalone_style.css
+%%GALLERYDIR%%/skins/yellow/css/screen.css
 %%GALLERYDIR%%/skins/yellow/images/mod_navbar.jpg
 %%GALLERYDIR%%/skins/yellow/images/mod_titlebar.jpg
 %%GALLERYDIR%%/skins/yellow/images/mod_titlemid.jpg
@@ -796,7 +816,10 @@
 %%GALLERYDIR%%/skins/yellow/style.def
 %%GALLERYDIR%%/slideshow.php
 %%GALLERYDIR%%/sort_album.php
+%%GALLERYDIR%%/stats-wizard.php
+%%GALLERYDIR%%/stats.php
 %%GALLERYDIR%%/tools/build_manifest.php
+%%GALLERYDIR%%/tools/despam-comments.php
 %%GALLERYDIR%%/tools/find_orphans.php
 %%GALLERYDIR%%/tools/g1-makereport.php
 %%GALLERYDIR%%/tools/g1-report.css
@@ -804,6 +827,7 @@
 %%GALLERYDIR%%/tools/include/main.inc
 %%GALLERYDIR%%/tools/include/plugin_rowdata.inc
 %%GALLERYDIR%%/tools/include/row_header.inc
+%%GALLERYDIR%%/tools/validate_albums.php
 %%GALLERYDIR%%/upgrade_album.php
 %%GALLERYDIR%%/upgrade_users.php
 %%GALLERYDIR%%/user_preferences.php
@@ -813,226 +837,222 @@
 %%GALLERYDIR%%/view_photo.php
 %%GALLERYDIR%%/view_photo_properties.php
 %%GALLERYDIR%%/watermark_album.php
-@dirrm %%GALLERYDIR%%/tools/include
-@dirrm %%GALLERYDIR%%/tools
-@dirrm %%GALLERYDIR%%/skins/yellow/images
-@dirrm %%GALLERYDIR%%/skins/yellow/css
-@dirrm %%GALLERYDIR%%/skins/yellow
-@dirrm %%GALLERYDIR%%/skins/white1/images
-@dirrm %%GALLERYDIR%%/skins/white1/css
-@dirrm %%GALLERYDIR%%/skins/white1
-@dirrm %%GALLERYDIR%%/skins/suit/images
-@dirrm %%GALLERYDIR%%/skins/suit/css
-@dirrm %%GALLERYDIR%%/skins/suit
-@dirrm %%GALLERYDIR%%/skins/slick/images
-@dirrm %%GALLERYDIR%%/skins/slick/css
-@dirrm %%GALLERYDIR%%/skins/slick
-@dirrm %%GALLERYDIR%%/skins/redmarble/images
-@dirrm %%GALLERYDIR%%/skins/redmarble/css
-@dirrm %%GALLERYDIR%%/skins/redmarble
-@dirrm %%GALLERYDIR%%/skins/paint/images
-@dirrm %%GALLERYDIR%%/skins/paint/css
-@dirrm %%GALLERYDIR%%/skins/paint
-@dirrm %%GALLERYDIR%%/skins/lilac/images
-@dirrm %%GALLERYDIR%%/skins/lilac/css
-@dirrm %%GALLERYDIR%%/skins/lilac
-@dirrm %%GALLERYDIR%%/skins/jenskin/images
-@dirrm %%GALLERYDIR%%/skins/jenskin/css
-@dirrm %%GALLERYDIR%%/skins/jenskin
-@dirrm %%GALLERYDIR%%/skins/hotred/images
-@dirrm %%GALLERYDIR%%/skins/hotred/css
-@dirrm %%GALLERYDIR%%/skins/hotred
-@dirrm %%GALLERYDIR%%/skins/greenpurple/images
-@dirrm %%GALLERYDIR%%/skins/greenpurple/css
-@dirrm %%GALLERYDIR%%/skins/greenpurple
-@dirrm %%GALLERYDIR%%/skins/butterfly_green/images
-@dirrm %%GALLERYDIR%%/skins/butterfly_green/css
-@dirrm %%GALLERYDIR%%/skins/butterfly_green
-@dirrm %%GALLERYDIR%%/skins/bubbles/images
-@dirrm %%GALLERYDIR%%/skins/bubbles/css
-@dirrm %%GALLERYDIR%%/skins/bubbles
-@dirrm %%GALLERYDIR%%/skins/bred/images
-@dirrm %%GALLERYDIR%%/skins/bred/css
-@dirrm %%GALLERYDIR%%/skins/bred
-@dirrm %%GALLERYDIR%%/skins/bpurple/images
-@dirrm %%GALLERYDIR%%/skins/bpurple/css
-@dirrm %%GALLERYDIR%%/skins/bpurple
-@dirrm %%GALLERYDIR%%/skins/bluemod/images
-@dirrm %%GALLERYDIR%%/skins/bluemod/css
-@dirrm %%GALLERYDIR%%/skins/bluemod
-@dirrm %%GALLERYDIR%%/skins/black/images
-@dirrm %%GALLERYDIR%%/skins/black/css
-@dirrm %%GALLERYDIR%%/skins/black
-@dirrm %%GALLERYDIR%%/skins/bgreen2/images
-@dirrm %%GALLERYDIR%%/skins/bgreen2/css
-@dirrm %%GALLERYDIR%%/skins/bgreen2
-@dirrm %%GALLERYDIR%%/skins/bgreen/images
-@dirrm %%GALLERYDIR%%/skins/bgreen/css
-@dirrm %%GALLERYDIR%%/skins/bgreen
-@dirrm %%GALLERYDIR%%/skins/bblue/images
-@dirrm %%GALLERYDIR%%/skins/bblue/css
-@dirrm %%GALLERYDIR%%/skins/bblue
-@dirrm %%GALLERYDIR%%/skins
-@dirrm %%GALLERYDIR%%/setup
-@dirrm %%GALLERYDIR%%/po
-@dirrm %%GALLERYDIR%%/platform
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW.utf8/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW.utf8/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW.utf8
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_TW
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK.utf8/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK.utf8/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK.utf8
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_HK
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_CN/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_CN/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/zh_CN
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/vi_VN/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/vi_VN/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/vi_VN
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/uk_UA/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/uk_UA/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/uk_UA
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/tr_TR/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/tr_TR/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/tr_TR
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sv_SE/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sv_SE/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sv_SE
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sl_SI/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sl_SI/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sl_SI
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sk_SK/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sk_SK/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/sk_SK
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.cp1251/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.cp1251/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ru_RU.cp1251
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_PT/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_PT/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_PT
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_BR/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_BR/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pt_BR
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pl_PL/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pl_PL/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/pl_PL
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/no_NO/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/no_NO/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/no_NO
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/nl_NL/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/nl_NL/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/nl_NL
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/lt_LT/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/lt_LT/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/lt_LT
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ko_KR/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ko_KR/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ko_KR
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ja_JP/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ja_JP/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ja_JP
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/it_IT/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/it_IT/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/it_IT
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/is_IS/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/is_IS/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/is_IS
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/hu_HU/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/hu_HU/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/hu_HU
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL.utf8/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL.utf8/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL.utf8
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fr_FR/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fr_FR/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fr_FR
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/gl_ES/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/gl_ES/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/gl_ES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fi_FI/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fi_FI/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/fi_FI
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/es_ES/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/es_ES/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/es_ES
-@dirrm %%GALLERYDIR%%/locale/en_US/flagimage
-@dirrm %%GALLERYDIR%%/locale/en_US
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/en_GB/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/en_GB/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/en_GB
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/de_DE/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/de_DE/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/de_DE
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/da_DK/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/da_DK/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/da_DK
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/cs_CZ.iso-8859-2
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ca_ES/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ca_ES/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/ca_ES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/bg_BG/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/bg_BG/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/bg_BG
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/af_ZA/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/af_ZA/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/af_ZA
-@dirrm %%GALLERYDIR%%/locale
-@dirrm %%GALLERYDIR%%/lib
-@dirrm %%GALLERYDIR%%/layout
-@dirrm %%GALLERYDIR%%/js
-@dirrm %%GALLERYDIR%%/java
-@dirrm %%GALLERYDIR%%/includes/slideshow
-@dirrm %%GALLERYDIR%%/includes/add_photos
-@dirrm %%GALLERYDIR%%/includes
-@dirrm %%GALLERYDIR%%/images
-@dirrm %%GALLERYDIR%%/html_wrap/frames/wooden
-@dirrm %%GALLERYDIR%%/html_wrap/frames/simple_book
-@dirrm %%GALLERYDIR%%/html_wrap/frames/shadows
-@dirrm %%GALLERYDIR%%/html_wrap/frames/polaroids
-@dirrm %%GALLERYDIR%%/html_wrap/frames/polaroid
-@dirrm %%GALLERYDIR%%/html_wrap/frames/notebook
-@dirrm %%GALLERYDIR%%/html_wrap/frames/golden
-@dirrm %%GALLERYDIR%%/html_wrap/frames
-@dirrm %%GALLERYDIR%%/html_wrap
-@dirrm %%GALLERYDIR%%/html
-@dirrm %%GALLERYDIR%%/errors
-@dirrm %%GALLERYDIR%%/docs/images
-@dirrm %%GALLERYDIR%%/docs/g1package/images
-@dirrm %%GALLERYDIR%%/docs/g1package
-@dirrm %%GALLERYDIR%%/docs/context-help
-@dirrm %%GALLERYDIR%%/docs
-@dirrm %%GALLERYDIR%%/css
-@dirrm %%GALLERYDIR%%/contrib/phpnuke
-@dirrm %%GALLERYDIR%%/contrib/phpBB2
-@dirrm %%GALLERYDIR%%/contrib/mambo/includes
-@dirrm %%GALLERYDIR%%/contrib/mambo/images
-@dirrm %%GALLERYDIR%%/contrib/mambo/classes
-@dirrm %%GALLERYDIR%%/contrib/mambo
-@dirrm %%GALLERYDIR%%/contrib/GeekLog
-@dirrm %%GALLERYDIR%%/contrib
-@dirrm %%GALLERYDIR%%/classes/remote
-@dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
-@dirrm %%GALLERYDIR%%/classes/postnuke
-@dirrm %%GALLERYDIR%%/classes/phpbb
-@dirrm %%GALLERYDIR%%/classes/nuke5
-@dirrm %%GALLERYDIR%%/classes/nsnnuke
-@dirrm %%GALLERYDIR%%/classes/mambo
-@dirrm %%GALLERYDIR%%/classes/geeklog
-@dirrm %%GALLERYDIR%%/classes/gallery
 @dirrm %%GALLERYDIR%%/classes/database/mysql
 @dirrm %%GALLERYDIR%%/classes/database
+@dirrm %%GALLERYDIR%%/classes/gallery
+@dirrm %%GALLERYDIR%%/classes/geeklog
+@dirrm %%GALLERYDIR%%/classes/mambo
+@dirrm %%GALLERYDIR%%/classes/nsnnuke
+@dirrm %%GALLERYDIR%%/classes/nuke5
+@dirrm %%GALLERYDIR%%/classes/phpbb
+@dirrm %%GALLERYDIR%%/classes/postnuke
+@dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
+@dirrm %%GALLERYDIR%%/classes/remote
 @dirrm %%GALLERYDIR%%/classes
+@dirrm %%GALLERYDIR%%/contrib/GeekLog
+@dirrm %%GALLERYDIR%%/contrib/mambo/classes
+@dirrm %%GALLERYDIR%%/contrib/mambo/images
+@dirrm %%GALLERYDIR%%/contrib/mambo/includes
+@dirrm %%GALLERYDIR%%/contrib/mambo
+@dirrm %%GALLERYDIR%%/contrib/phpBB2
+@dirrm %%GALLERYDIR%%/contrib/phpnuke
+@dirrm %%GALLERYDIR%%/contrib/postnuke
+@dirrm %%GALLERYDIR%%/contrib
+@dirrm %%GALLERYDIR%%/css
+@dirrm %%GALLERYDIR%%/docs/context-help
+@dirrm %%GALLERYDIR%%/docs/g1package/images/gallery1-admin
+@dirrm %%GALLERYDIR%%/docs/g1package/images
+@dirrm %%GALLERYDIR%%/docs/g1package
+@dirrm %%GALLERYDIR%%/docs/images
+@dirrm %%GALLERYDIR%%/docs
+@dirrm %%GALLERYDIR%%/errors
+@dirrm %%GALLERYDIR%%/html
+@dirrm %%GALLERYDIR%%/html_wrap/frames/golden
+@dirrm %%GALLERYDIR%%/html_wrap/frames/notebook
+@dirrm %%GALLERYDIR%%/html_wrap/frames/polaroid
+@dirrm %%GALLERYDIR%%/html_wrap/frames/polaroids
+@dirrm %%GALLERYDIR%%/html_wrap/frames/shadows
+@dirrm %%GALLERYDIR%%/html_wrap/frames/simple_book
+@dirrm %%GALLERYDIR%%/html_wrap/frames/wooden
+@dirrm %%GALLERYDIR%%/html_wrap/frames
+@dirrm %%GALLERYDIR%%/html_wrap
+@dirrm %%GALLERYDIR%%/images/icons
+@dirrm %%GALLERYDIR%%/images
+@dirrm %%GALLERYDIR%%/includes/add_photos
+@dirrm %%GALLERYDIR%%/includes/slideshow
+@dirrm %%GALLERYDIR%%/includes/stats
+@dirrm %%GALLERYDIR%%/includes
+@dirrm %%GALLERYDIR%%/java
+@dirrm %%GALLERYDIR%%/js
+@dirrm %%GALLERYDIR%%/layout
+@dirrm %%GALLERYDIR%%/lib
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/af_ZA/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/af_ZA/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/af_ZA
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/bg_BG/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/bg_BG/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/bg_BG
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ca_ES/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ca_ES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/da_DK/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/da_DK/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/da_DK
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/de_DE/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/de_DE/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/de_DE
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/en_GB/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/en_GB/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/en_GB
+@dirrm %%GALLERYDIR%%/locale/en_US/flagimage
+@dirrm %%GALLERYDIR%%/locale/en_US
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/es_ES/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/es_ES/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/es_ES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fi_FI/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fi_FI/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fi_FI
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fr_FR/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fr_FR/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/fr_FR
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/gl_ES/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/gl_ES/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/gl_ES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/hu_HU/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/hu_HU/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/hu_HU
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/is_IS/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/is_IS/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/is_IS
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/it_IT/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/it_IT/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/it_IT
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ja_JP/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ja_JP/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ja_JP
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ko_KR/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ko_KR/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ko_KR
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/lt_LT/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/lt_LT/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/lt_LT
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/nl_NL/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/nl_NL/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/nl_NL
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/no_NO/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/no_NO/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/no_NO
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pl_PL/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pl_PL/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pl_PL
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_BR/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_BR/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_BR
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_PT/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_PT/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/pt_PT
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.cp1251
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/ru_RU.koi8r
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sk_SK/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sk_SK/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sk_SK
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sl_SI/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sl_SI/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sl_SI
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sv_SE/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sv_SE/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/sv_SE
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/tr_TR/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/tr_TR/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/tr_TR
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/vi_VN/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/vi_VN/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/vi_VN
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_HK.utf8
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_TW/LC_MESSAGES
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_TW/flagimage
+@dirrm %%NLS%%%%GALLERYDIR%%/locale/zh_TW
+@dirrm %%NLS%%%%GALLERYDIR%%/locale
+@dirrm %%GALLERYDIR%%/platform
+@dirrm %%GALLERYDIR%%/po
+@dirrm %%GALLERYDIR%%/setup
+@dirrm %%GALLERYDIR%%/skins/bars002/css
+@dirrm %%GALLERYDIR%%/skins/bars002/images
+@dirrm %%GALLERYDIR%%/skins/bars002
+@dirrm %%GALLERYDIR%%/skins/bblue/css
+@dirrm %%GALLERYDIR%%/skins/bblue/images
+@dirrm %%GALLERYDIR%%/skins/bblue
+@dirrm %%GALLERYDIR%%/skins/bgreen/css
+@dirrm %%GALLERYDIR%%/skins/bgreen/images
+@dirrm %%GALLERYDIR%%/skins/bgreen
+@dirrm %%GALLERYDIR%%/skins/bgreen2/css
+@dirrm %%GALLERYDIR%%/skins/bgreen2/images
+@dirrm %%GALLERYDIR%%/skins/bgreen2
+@dirrm %%GALLERYDIR%%/skins/black/css
+@dirrm %%GALLERYDIR%%/skins/black/images
+@dirrm %%GALLERYDIR%%/skins/black
+@dirrm %%GALLERYDIR%%/skins/bluemod/css
+@dirrm %%GALLERYDIR%%/skins/bluemod/images
+@dirrm %%GALLERYDIR%%/skins/bluemod
+@dirrm %%GALLERYDIR%%/skins/bpurple/css
+@dirrm %%GALLERYDIR%%/skins/bpurple/images
+@dirrm %%GALLERYDIR%%/skins/bpurple
+@dirrm %%GALLERYDIR%%/skins/bred/css
+@dirrm %%GALLERYDIR%%/skins/bred/images
+@dirrm %%GALLERYDIR%%/skins/bred
+@dirrm %%GALLERYDIR%%/skins/bubbles/css
+@dirrm %%GALLERYDIR%%/skins/bubbles/images
+@dirrm %%GALLERYDIR%%/skins/bubbles
+@dirrm %%GALLERYDIR%%/skins/butterfly_green/css
+@dirrm %%GALLERYDIR%%/skins/butterfly_green/images
+@dirrm %%GALLERYDIR%%/skins/butterfly_green
+@dirrm %%GALLERYDIR%%/skins/greenpurple/css
+@dirrm %%GALLERYDIR%%/skins/greenpurple/images
+@dirrm %%GALLERYDIR%%/skins/greenpurple
+@dirrm %%GALLERYDIR%%/skins/hotred/css
+@dirrm %%GALLERYDIR%%/skins/hotred/images
+@dirrm %%GALLERYDIR%%/skins/hotred
+@dirrm %%GALLERYDIR%%/skins/jenskin/css
+@dirrm %%GALLERYDIR%%/skins/jenskin/images
+@dirrm %%GALLERYDIR%%/skins/jenskin
+@dirrm %%GALLERYDIR%%/skins/lilac/css
+@dirrm %%GALLERYDIR%%/skins/lilac/images
+@dirrm %%GALLERYDIR%%/skins/lilac
+@dirrm %%GALLERYDIR%%/skins/madmod1/css
+@dirrm %%GALLERYDIR%%/skins/madmod1/images
+@dirrm %%GALLERYDIR%%/skins/madmod1/tpl
+@dirrm %%GALLERYDIR%%/skins/madmod1
+@dirrm %%GALLERYDIR%%/skins/paint/css
+@dirrm %%GALLERYDIR%%/skins/paint/images
+@dirrm %%GALLERYDIR%%/skins/paint
+@dirrm %%GALLERYDIR%%/skins/redmarble/css
+@dirrm %%GALLERYDIR%%/skins/redmarble/images
+@dirrm %%GALLERYDIR%%/skins/redmarble
+@dirrm %%GALLERYDIR%%/skins/slick/css
+@dirrm %%GALLERYDIR%%/skins/slick/images
+@dirrm %%GALLERYDIR%%/skins/slick
+@dirrm %%GALLERYDIR%%/skins/suit/css
+@dirrm %%GALLERYDIR%%/skins/suit/images
+@dirrm %%GALLERYDIR%%/skins/suit
+@dirrm %%GALLERYDIR%%/skins/white1/css
+@dirrm %%GALLERYDIR%%/skins/white1/images
+@dirrm %%GALLERYDIR%%/skins/white1
+@dirrm %%GALLERYDIR%%/skins/yellow/css
+@dirrm %%GALLERYDIR%%/skins/yellow/images
+@dirrm %%GALLERYDIR%%/skins/yellow
+@dirrm %%GALLERYDIR%%/skins
+@dirrm %%GALLERYDIR%%/tools/include
+@dirrm %%GALLERYDIR%%/tools
 @unexec rmdir %D/%%GALLERYDIR%% 2>/dev/null || true