4 files changed, 223 insertions, 151 deletions

diff --git a/www/gallery/Makefile b/www/gallery/Makefile
index f9b145c2c97f..e7015f2330d3 100644
--- a/www/gallery/Makefile
+++ b/www/gallery/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.2
+PORTVERSION=	1.4.3
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -21,39 +21,39 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		unzip:${PORTSDIR}/archivers/unzip
 
 .if !defined(WITHOUT_NLS)
-LANGVERSION=	1.4.2
-LANGPACKS=	af_ZA-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		bg_BG-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		ca_ES-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		cs_CZ.cp1250-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		da_DK-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		de_DE-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		en_GB-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		es_ES-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		fi_FI-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		fr_FR-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		he_IL-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		hu_HU-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		is_IS-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		it_IT-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		ja_JP-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		ko_KR-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		lt_LT-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		nl_NL-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		no_NO-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		pl_PL-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		pt_BR-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		pt_PT-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		ru_RU.koi8r-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		ru_RU-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		sl_SI-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		sv_SE-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		tr_TR-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		uk_UA-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		vi_VN-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_CN-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW.utf8-pack-${LANGVERSION}${EXTRACT_SUFX}
+LANGVERSION=	1.4.3
+LANGPACKS=	af_ZA-${LANGVERSION}${EXTRACT_SUFX} \
+		bg_BG-${LANGVERSION}${EXTRACT_SUFX} \
+		ca_ES-${LANGVERSION}${EXTRACT_SUFX} \
+		cs_CZ.iso-8859-2-${LANGVERSION}${EXTRACT_SUFX} \
+		da_DK-${LANGVERSION}${EXTRACT_SUFX} \
+		de_DE-${LANGVERSION}${EXTRACT_SUFX} \
+		en_GB-${LANGVERSION}${EXTRACT_SUFX} \
+		es_ES-${LANGVERSION}${EXTRACT_SUFX} \
+		fi_FI-${LANGVERSION}${EXTRACT_SUFX} \
+		fr_FR-${LANGVERSION}${EXTRACT_SUFX} \
+		he_IL.utf8-${LANGVERSION}${EXTRACT_SUFX} \
+		hu_HU-${LANGVERSION}${EXTRACT_SUFX} \
+		is_IS-${LANGVERSION}${EXTRACT_SUFX} \
+		it_IT-${LANGVERSION}${EXTRACT_SUFX} \
+		ja_JP-${LANGVERSION}${EXTRACT_SUFX} \
+		ko_KR-${LANGVERSION}${EXTRACT_SUFX} \
+		lt_LT-${LANGVERSION}${EXTRACT_SUFX} \
+		nl_NL-${LANGVERSION}${EXTRACT_SUFX} \
+		no_NO-${LANGVERSION}${EXTRACT_SUFX} \
+		pl_PL-${LANGVERSION}${EXTRACT_SUFX} \
+		pt_BR-${LANGVERSION}${EXTRACT_SUFX} \
+		pt_PT-${LANGVERSION}${EXTRACT_SUFX} \
+		ru_RU.koi8r-${LANGVERSION}${EXTRACT_SUFX} \
+		ru_RU-${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_TW-${LANGVERSION}${EXTRACT_SUFX} \
+		zh_TW.utf8-${LANGVERSION}${EXTRACT_SUFX}
 PLIST_SUB=		NLS=""
 .else
 PLIST_SUB=		NLS="@comment "
diff --git a/www/gallery/distinfo b/www/gallery/distinfo
index 417998578813..a42fbf7cb9bc 100644
--- a/www/gallery/distinfo
+++ b/www/gallery/distinfo
@@ -1,66 +1,66 @@
-MD5 (gallery/gallery-1.4.2.tar.gz) = 37bb6dcc5c6c41097fac411c13335ea1
-SIZE (gallery/gallery-1.4.2.tar.gz) = 1075429
-MD5 (gallery/af_ZA-pack-1.4.2.tar.gz) = da4c60e0ce4d15e9ced01def9ca2db85
-SIZE (gallery/af_ZA-pack-1.4.2.tar.gz) = 109530
-MD5 (gallery/bg_BG-pack-1.4.2.tar.gz) = f82bf07f0b66cbc9fc9474de66e8abad
-SIZE (gallery/bg_BG-pack-1.4.2.tar.gz) = 116597
-MD5 (gallery/ca_ES-pack-1.4.2.tar.gz) = ca47cf4025e5147d3f0f171d4d5cdb1b
-SIZE (gallery/ca_ES-pack-1.4.2.tar.gz) = 64777
-MD5 (gallery/cs_CZ.cp1250-pack-1.4.2.tar.gz) = 472a097b54ef56c3549d775fd5e01215
-SIZE (gallery/cs_CZ.cp1250-pack-1.4.2.tar.gz) = 113261
-MD5 (gallery/da_DK-pack-1.4.2.tar.gz) = 370d2b892a0ec8343c927d23ebc1c80d
-SIZE (gallery/da_DK-pack-1.4.2.tar.gz) = 82715
-MD5 (gallery/de_DE-pack-1.4.2.tar.gz) = 95b3d01393ae77627f0511dfbac7a89b
-SIZE (gallery/de_DE-pack-1.4.2.tar.gz) = 116139
-MD5 (gallery/en_GB-pack-1.4.2.tar.gz) = fb8e46063572c90f1f9baa4306c7198d
-SIZE (gallery/en_GB-pack-1.4.2.tar.gz) = 34618
-MD5 (gallery/es_ES-pack-1.4.2.tar.gz) = 4b5559b5cb65831890ad69e30e7b34a8
-SIZE (gallery/es_ES-pack-1.4.2.tar.gz) = 114959
-MD5 (gallery/fi_FI-pack-1.4.2.tar.gz) = bd968a14fed8180777ad7a6f854c32b5
-SIZE (gallery/fi_FI-pack-1.4.2.tar.gz) = 116350
-MD5 (gallery/fr_FR-pack-1.4.2.tar.gz) = bc90189de681384b2271c06cff566a36
-SIZE (gallery/fr_FR-pack-1.4.2.tar.gz) = 114794
-MD5 (gallery/he_IL-pack-1.4.2.tar.gz) = 1b03f03c6862c529d12043feb2e83c56
-SIZE (gallery/he_IL-pack-1.4.2.tar.gz) = 66801
-MD5 (gallery/hu_HU-pack-1.4.2.tar.gz) = 0b72ea993789bea96496200f89b9d705
-SIZE (gallery/hu_HU-pack-1.4.2.tar.gz) = 56824
-MD5 (gallery/is_IS-pack-1.4.2.tar.gz) = 41f6359910bc7a1b604d9eae941151b4
-SIZE (gallery/is_IS-pack-1.4.2.tar.gz) = 111527
-MD5 (gallery/it_IT-pack-1.4.2.tar.gz) = d7337411dcd02596e3ad63148603d2e0
-SIZE (gallery/it_IT-pack-1.4.2.tar.gz) = 116507
-MD5 (gallery/ja_JP-pack-1.4.2.tar.gz) = e04b3de09e467bc5a6bac8f8f2cd6153
-SIZE (gallery/ja_JP-pack-1.4.2.tar.gz) = 109024
-MD5 (gallery/ko_KR-pack-1.4.2.tar.gz) = 35d42ef5cb39fdf246a1101eeae1c17d
-SIZE (gallery/ko_KR-pack-1.4.2.tar.gz) = 96559
-MD5 (gallery/lt_LT-pack-1.4.2.tar.gz) = 1a2837b36e7f39d60ffa698329754013
-SIZE (gallery/lt_LT-pack-1.4.2.tar.gz) = 110782
-MD5 (gallery/nl_NL-pack-1.4.2.tar.gz) = 07fe64c0b602556ef06e9693ed13f88d
-SIZE (gallery/nl_NL-pack-1.4.2.tar.gz) = 65456
-MD5 (gallery/no_NO-pack-1.4.2.tar.gz) = e7b37a969e972b9ade93ecf3d980a528
-SIZE (gallery/no_NO-pack-1.4.2.tar.gz) = 60869
-MD5 (gallery/pl_PL-pack-1.4.2.tar.gz) = 88e8a284d08312501c9611a2fcf1eb74
-SIZE (gallery/pl_PL-pack-1.4.2.tar.gz) = 116495
-MD5 (gallery/pt_BR-pack-1.4.2.tar.gz) = 6d8d1ac7a4ab4a0d7c5de74624321bd0
-SIZE (gallery/pt_BR-pack-1.4.2.tar.gz) = 83358
-MD5 (gallery/pt_PT-pack-1.4.2.tar.gz) = bdd27071ffffc80a8f8f1dfafce7514c
-SIZE (gallery/pt_PT-pack-1.4.2.tar.gz) = 60377
-MD5 (gallery/ru_RU.koi8r-pack-1.4.2.tar.gz) = 3f53790a18baf569a09fe8fd2c9ea76b
-SIZE (gallery/ru_RU.koi8r-pack-1.4.2.tar.gz) = 57924
-MD5 (gallery/ru_RU-pack-1.4.2.tar.gz) = 1b9bd8a11d689d2fe7b1e445ece90bef
-SIZE (gallery/ru_RU-pack-1.4.2.tar.gz) = 55326
-MD5 (gallery/sl_SI-pack-1.4.2.tar.gz) = 6cd70c3b92a07e83026a7dd7e2d501da
-SIZE (gallery/sl_SI-pack-1.4.2.tar.gz) = 65343
-MD5 (gallery/sv_SE-pack-1.4.2.tar.gz) = 3eee0aefa3599af2a06aa467c0f39739
-SIZE (gallery/sv_SE-pack-1.4.2.tar.gz) = 114299
-MD5 (gallery/tr_TR-pack-1.4.2.tar.gz) = b0e8c04dacb4891dd7c913b98b9a254a
-SIZE (gallery/tr_TR-pack-1.4.2.tar.gz) = 65337
-MD5 (gallery/uk_UA-pack-1.4.2.tar.gz) = 4cfd834c2c9988829f9877e3c81804ff
-SIZE (gallery/uk_UA-pack-1.4.2.tar.gz) = 63978
-MD5 (gallery/vi_VN-pack-1.4.2.tar.gz) = a29f56ae5294c2bd8325e4c80e50491c
-SIZE (gallery/vi_VN-pack-1.4.2.tar.gz) = 113920
-MD5 (gallery/zh_CN-pack-1.4.2.tar.gz) = f3060e8ce7274f1f930ccc041ebdb897
-SIZE (gallery/zh_CN-pack-1.4.2.tar.gz) = 69515
-MD5 (gallery/zh_TW-pack-1.4.2.tar.gz) = d7c5a6fc583e8092d876aeee3225de6f
-SIZE (gallery/zh_TW-pack-1.4.2.tar.gz) = 91218
-MD5 (gallery/zh_TW.utf8-pack-1.4.2.tar.gz) = 159aea3df400e56baa3aef2b2027a656
-SIZE (gallery/zh_TW.utf8-pack-1.4.2.tar.gz) = 81247
+MD5 (gallery/gallery-1.4.3.tar.gz) = d9fc69721e289f7fde2bc7b00b27be29
+SIZE (gallery/gallery-1.4.3.tar.gz) = 1671766
+MD5 (gallery/af_ZA-1.4.3.tar.gz) = f475b4c56eeedf07e1f864b8f3820d5e
+SIZE (gallery/af_ZA-1.4.3.tar.gz) = 118828
+MD5 (gallery/bg_BG-1.4.3.tar.gz) = d4657213a65e01c514f95b1fac3d1bd5
+SIZE (gallery/bg_BG-1.4.3.tar.gz) = 117409
+MD5 (gallery/ca_ES-1.4.3.tar.gz) = 3d298e487e169f3d3b2e675546a821e4
+SIZE (gallery/ca_ES-1.4.3.tar.gz) = 73077
+MD5 (gallery/cs_CZ.iso-8859-2-1.4.3.tar.gz) = 75ee5ff58a3a96d15717889c35a844ab
+SIZE (gallery/cs_CZ.iso-8859-2-1.4.3.tar.gz) = 85175
+MD5 (gallery/da_DK-1.4.3.tar.gz) = c25dfb1fb3c47f14ac11776fe0b3fcc6
+SIZE (gallery/da_DK-1.4.3.tar.gz) = 88488
+MD5 (gallery/de_DE-1.4.3.tar.gz) = 1699993b7366533b93b18864e1cb0635
+SIZE (gallery/de_DE-1.4.3.tar.gz) = 124393
+MD5 (gallery/en_GB-1.4.3.tar.gz) = b5a065618320d5a935bf3bead711e002
+SIZE (gallery/en_GB-1.4.3.tar.gz) = 36905
+MD5 (gallery/es_ES-1.4.3.tar.gz) = 42c4a4c7a9c8c56c63abec2b18414d40
+SIZE (gallery/es_ES-1.4.3.tar.gz) = 122209
+MD5 (gallery/fi_FI-1.4.3.tar.gz) = 01f5efef52ff25f68f1d0443b4e30d97
+SIZE (gallery/fi_FI-1.4.3.tar.gz) = 122773
+MD5 (gallery/fr_FR-1.4.3.tar.gz) = 3aef7ddc66f7dbe56fd017e2ec90af1f
+SIZE (gallery/fr_FR-1.4.3.tar.gz) = 117398
+MD5 (gallery/he_IL.utf8-1.4.3.tar.gz) = 9586d4f4260db68bf382bb20b466a83d
+SIZE (gallery/he_IL.utf8-1.4.3.tar.gz) = 78117
+MD5 (gallery/hu_HU-1.4.3.tar.gz) = 5ea5d0f17dc86a791652691bea74eb63
+SIZE (gallery/hu_HU-1.4.3.tar.gz) = 71395
+MD5 (gallery/is_IS-1.4.3.tar.gz) = 39eeb3ce0b54d72440075753f4ca762f
+SIZE (gallery/is_IS-1.4.3.tar.gz) = 112315
+MD5 (gallery/it_IT-1.4.3.tar.gz) = b74fec781f5972d279e696931e04a985
+SIZE (gallery/it_IT-1.4.3.tar.gz) = 123430
+MD5 (gallery/ja_JP-1.4.3.tar.gz) = f74f052c7a7078b447af9e46eac0b781
+SIZE (gallery/ja_JP-1.4.3.tar.gz) = 120369
+MD5 (gallery/ko_KR-1.4.3.tar.gz) = 67d0cc3172a63a765e600957d0aa3a30
+SIZE (gallery/ko_KR-1.4.3.tar.gz) = 97389
+MD5 (gallery/lt_LT-1.4.3.tar.gz) = 085ec55e608dfc4c8d49506664e1981d
+SIZE (gallery/lt_LT-1.4.3.tar.gz) = 110939
+MD5 (gallery/nl_NL-1.4.3.tar.gz) = ef7265093fb3263f64e998a1eda5c10d
+SIZE (gallery/nl_NL-1.4.3.tar.gz) = 67913
+MD5 (gallery/no_NO-1.4.3.tar.gz) = a3c8132d95e857f2c9ea802ee3159396
+SIZE (gallery/no_NO-1.4.3.tar.gz) = 79651
+MD5 (gallery/pl_PL-1.4.3.tar.gz) = 87212795007605c34deca655398b70ca
+SIZE (gallery/pl_PL-1.4.3.tar.gz) = 124304
+MD5 (gallery/pt_BR-1.4.3.tar.gz) = b1efddf4a7a36a2e1665bbe2eb88953b
+SIZE (gallery/pt_BR-1.4.3.tar.gz) = 121410
+MD5 (gallery/pt_PT-1.4.3.tar.gz) = 387d77b30a319408f5579da8756bb4f4
+SIZE (gallery/pt_PT-1.4.3.tar.gz) = 62564
+MD5 (gallery/ru_RU.koi8r-1.4.3.tar.gz) = d33507baac378c0644450b64027b6aea
+SIZE (gallery/ru_RU.koi8r-1.4.3.tar.gz) = 124915
+MD5 (gallery/ru_RU-1.4.3.tar.gz) = 07eef03364c3b42eae7285078d5cee6a
+SIZE (gallery/ru_RU-1.4.3.tar.gz) = 124717
+MD5 (gallery/sl_SI-1.4.3.tar.gz) = 62b56a32478c4c9c298466587104333f
+SIZE (gallery/sl_SI-1.4.3.tar.gz) = 67640
+MD5 (gallery/sv_SE-1.4.3.tar.gz) = 606baaa9f9332a7a46477e05f76c8c16
+SIZE (gallery/sv_SE-1.4.3.tar.gz) = 122445
+MD5 (gallery/tr_TR-1.4.3.tar.gz) = 1077cd4fa8dc4ba857e34dc33568449c
+SIZE (gallery/tr_TR-1.4.3.tar.gz) = 67583
+MD5 (gallery/uk_UA-1.4.3.tar.gz) = a3e5c379735647464466de98256afcaa
+SIZE (gallery/uk_UA-1.4.3.tar.gz) = 66267
+MD5 (gallery/vi_VN-1.4.3.tar.gz) = d5244222e9fcc957c4c43ebf3ec5969d
+SIZE (gallery/vi_VN-1.4.3.tar.gz) = 121704
+MD5 (gallery/zh_CN-1.4.3.tar.gz) = 74580c91b51ebd31940271d574e1881c
+SIZE (gallery/zh_CN-1.4.3.tar.gz) = 71684
+MD5 (gallery/zh_TW-1.4.3.tar.gz) = 265d4d6a65d99d3e4647fd3f104a184e
+SIZE (gallery/zh_TW-1.4.3.tar.gz) = 93076
+MD5 (gallery/zh_TW.utf8-1.4.3.tar.gz) = e861c2cb9f3c1c20c7489b369f92be90
+SIZE (gallery/zh_TW.utf8-1.4.3.tar.gz) = 83296
diff --git a/www/gallery/files/patch-manifest.inc b/www/gallery/files/patch-manifest.inc
deleted file mode 100644
index 44419998a882..000000000000
--- a/www/gallery/files/patch-manifest.inc
+++ /dev/null
@@ -1,28 +0,0 @@
---- manifest.inc.orig	Thu Feb 12 03:15:35 2004
-+++ manifest.inc	Thu Feb 12 09:54:28 2004
-@@ -28,9 +28,6 @@
-  */
- 
- $versions=array();
--$versions['AUTHORS']='1.16';
--$versions['LICENSE.txt']='1.2';
--$versions['README']='1.28';
- $versions['Version.php']='1.573.2.13';
- $versions['add_comment.php']='1.29.2.2';
- $versions['add_photo.php']='1.18.6.1';
-@@ -39,7 +36,6 @@
- $versions['album_permissions.php']='1.34.4.2';
- $versions['albums.php']='1.117.2.1';
- $versions['captionator.php']='1.37';
--$versions['configure.bat']='1.2';
- $versions['configure.sh']='1.4';
- $versions['copy_photo.php']='1.3.6.1';
- $versions['create_user.php']='1.30.6.1';
-@@ -77,7 +73,6 @@
- $versions['rotate_photo.php']='1.37.6.1';
- $versions['save_photos.php']='1.80.6.1';
- $versions['search.php']='1.47.4.1';
--$versions['secure.bat']='1.2';
- $versions['secure.sh']='1.5';
- $versions['session.php']='1.26.8.1';
- $versions['slideshow.php']='1.46.2.1';
diff --git a/www/gallery/pkg-plist b/www/gallery/pkg-plist
index e0c6e395d0c3..61d737cd891a 100644
--- a/www/gallery/pkg-plist
+++ b/www/gallery/pkg-plist
@@ -1,10 +1,12 @@
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%GALLERYDIR%%/ChangeLog.archive.gz
 %%GALLERYDIR%%/Version.php
 %%GALLERYDIR%%/add_comment.php
-%%GALLERYDIR%%/add_photo.php
 %%GALLERYDIR%%/add_photos.php
+%%GALLERYDIR%%/add_photos_frame.php
+%%GALLERYDIR%%/add_photos_refresh.php
 %%GALLERYDIR%%/adv_search.php
 %%GALLERYDIR%%/album_permissions.php
 %%GALLERYDIR%%/albums.php
@@ -23,6 +25,13 @@
 %%GALLERYDIR%%/classes/database/mysql/Database.php
 %%GALLERYDIR%%/classes/gallery/User.php
 %%GALLERYDIR%%/classes/gallery/UserDB.php
+%%GALLERYDIR%%/classes/geeklog/User.php
+%%GALLERYDIR%%/classes/geeklog/UserDB.php
+%%GALLERYDIR%%/classes/mambo/User.php
+%%GALLERYDIR%%/classes/mambo/UserDB.php
+%%GALLERYDIR%%/classes/nsnnuke/AdminUser.php
+%%GALLERYDIR%%/classes/nsnnuke/User.php
+%%GALLERYDIR%%/classes/nsnnuke/UserDB.php
 %%GALLERYDIR%%/classes/nuke5/AdminUser.php
 %%GALLERYDIR%%/classes/nuke5/User.php
 %%GALLERYDIR%%/classes/nuke5/UserDB.php
@@ -33,6 +42,22 @@
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/UserDB.php
 %%GALLERYDIR%%/classes/remote/GalleryRemoteProperties.php
+%%GALLERYDIR%%/contrib/GeekLog/CREDITS
+%%GALLERYDIR%%/contrib/mambo/HowTo.txt
+%%GALLERYDIR%%/contrib/mambo/admin.gallery.html.php
+%%GALLERYDIR%%/contrib/mambo/admin.gallery.php
+%%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
+%%GALLERYDIR%%/contrib/phpBB2/CREDITS
+%%GALLERYDIR%%/contrib/phpBB2/HowTo.txt
+%%GALLERYDIR%%/contrib/phpBB2/modules.php.gz
+%%GALLERYDIR%%/contrib/phpBB2/phpBB2-manual_changes.txt
+%%GALLERYDIR%%/contrib/phpBB2/phpBB2.patch
 %%GALLERYDIR%%/configure.sh
 %%GALLERYDIR%%/copy_photo.php
 %%GALLERYDIR%%/create_user.php
@@ -69,6 +94,7 @@
 %%GALLERYDIR%%/docs/g1package/gallery1-install.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.language-packs.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.overview.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.remote-applets.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.required-programs.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.requirements.html
 %%GALLERYDIR%%/docs/g1package/gallery1-install.unix-ftp.html
@@ -78,8 +104,6 @@
 %%GALLERYDIR%%/docs/g1package/gallery1-install.windows.html
 %%GALLERYDIR%%/docs/g1package/html.css
 %%GALLERYDIR%%/docs/g1package/images/basic-auth.gif
-%%GALLERYDIR%%/docs/g1package/images/diagnostics.gif
-%%GALLERYDIR%%/docs/g1package/images/step2setup.gif
 %%GALLERYDIR%%/docs/g1package/images/up-up.gif
 %%GALLERYDIR%%/docs/g1package/images/up.gif
 %%GALLERYDIR%%/docs/g1package/index.html
@@ -128,6 +152,7 @@
 %%GALLERYDIR%%/edit_caption.php
 %%GALLERYDIR%%/edit_field.php
 %%GALLERYDIR%%/edit_thumb.php
+%%GALLERYDIR%%/edit_watermark.php
 %%GALLERYDIR%%/errors/configmode.php
 %%GALLERYDIR%%/errors/configure_help.php
 %%GALLERYDIR%%/errors/configure_instructions.php
@@ -141,6 +166,24 @@
 %%GALLERYDIR%%/html_wrap/album.footer.default
 %%GALLERYDIR%%/html_wrap/album.header.default
 %%GALLERYDIR%%/html_wrap/frames/README.php
+%%GALLERYDIR%%/html_wrap/frames/golden/BB.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/BL.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/BR.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/LL.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/RR.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/TL.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/TR.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/TT.gif
+%%GALLERYDIR%%/html_wrap/frames/golden/frame.def
+%%GALLERYDIR%%/html_wrap/frames/notebook/BB.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/BL.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/BR.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/LL.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/RR.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/TL.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/TR.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/TT.gif
+%%GALLERYDIR%%/html_wrap/frames/notebook/frame.def
 %%GALLERYDIR%%/html_wrap/frames/polaroid/BB.gif
 %%GALLERYDIR%%/html_wrap/frames/polaroid/BL.gif
 %%GALLERYDIR%%/html_wrap/frames/polaroid/BR.gif
@@ -176,6 +219,15 @@
 %%GALLERYDIR%%/html_wrap/frames/simple_book/dot.gif
 %%GALLERYDIR%%/html_wrap/frames/simple_book/frame.def
 %%GALLERYDIR%%/html_wrap/frames/simple_book/pixel_trans.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/BB.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/BL.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/BR.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/LL.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/RR.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/TL.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/TR.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/TT.gif
+%%GALLERYDIR%%/html_wrap/frames/wooden/frame.def
 %%GALLERYDIR%%/html_wrap/gallery.footer.default
 %%GALLERYDIR%%/html_wrap/gallery.header.default
 %%GALLERYDIR%%/html_wrap/inline_albumthumb.footer.default
@@ -218,6 +270,7 @@
 %%GALLERYDIR%%/images/bar.gif
 %%GALLERYDIR%%/images/computer.gif
 %%GALLERYDIR%%/images/donate.jpg
+%%GALLERYDIR%%/images/g1-phpBB2-icon.png
 %%GALLERYDIR%%/images/gallery-tag.png
 %%GALLERYDIR%%/images/movie.thumb.jpg
 %%GALLERYDIR%%/images/nav_dot.gif
@@ -231,11 +284,31 @@
 %%GALLERYDIR%%/images/nav_prev.gif
 %%GALLERYDIR%%/images/pixel_trans.gif
 %%GALLERYDIR%%/images/simplex-bkg.gif
+%%GALLERYDIR%%/images/tab_bottom.gif
 %%GALLERYDIR%%/images/uploading.gif
+%%GALLERYDIR%%/includes/add_photos/add_admin.inc
+%%GALLERYDIR%%/includes/add_photos/add_applet.cfg
+%%GALLERYDIR%%/includes/add_photos/add_applet.inc
+%%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/slideshow/applet.cfg
+%%GALLERYDIR%%/includes/slideshow/applet.inc
+%%GALLERYDIR%%/includes/slideshow/high.inc
+%%GALLERYDIR%%/includes/slideshow/low.inc
 %%GALLERYDIR%%/index.php
 %%GALLERYDIR%%/init.php
+%%GALLERYDIR%%/java/GalleryRemoteApplet.jar
+%%GALLERYDIR%%/java/GalleryRemoteAppletMini.jar
+%%GALLERYDIR%%/java/GalleryRemoteHTTPClient.jar
 %%GALLERYDIR%%/java/ImageTools.jar
+%%GALLERYDIR%%/java/applet_img.jar
 %%GALLERYDIR%%/js/client_sniff.js
+%%GALLERYDIR%%/js/fitToWindow.js.php
+%%GALLERYDIR%%/layout/adminAlbumCommands.inc
 %%GALLERYDIR%%/layout/adminbox.inc
 %%GALLERYDIR%%/layout/breadcrumb.inc
 %%GALLERYDIR%%/layout/commentbox.inc
@@ -249,6 +322,9 @@
 %%GALLERYDIR%%/layout/navtableend.inc
 %%GALLERYDIR%%/layout/navtablemiddle.inc
 %%GALLERYDIR%%/layout/searchdraw.inc
+%%GALLERYDIR%%/layout/watermarkform.inc
+%%GALLERYDIR%%/lib/Form.php
+%%GALLERYDIR%%/lib/lang.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
 %%NLS%%%%GALLERYDIR%%/locale/af_ZA/af_ZA-gallery_config.po
@@ -267,12 +343,12 @@
 %%NLS%%%%GALLERYDIR%%/locale/ca_ES/ca_ES-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/ca_ES/ca_ES-nls.php
 %%NLS%%%%GALLERYDIR%%/locale/ca_ES/flagimage/ca_ES.gif
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES/cs_CZ.cp1250-gallery_config.mo
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES/cs_CZ.cp1250-gallery_core.mo
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/cs_CZ.cp1250-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/cs_CZ.cp1250-gallery_core.po
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/cs_CZ.cp1250-nls.php
-%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.cp1250/flagimage/cs_CZ.cp1250.gif
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/LC_MESSAGES/cs_CZ.iso-8859-2-gallery_config.mo
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/LC_MESSAGES/cs_CZ.iso-8859-2-gallery_core.mo
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/cs_CZ.iso-8859-2-gallery_config.po
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/cs_CZ.iso-8859-2-gallery_core.po
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/cs_CZ.iso-8859-2-nls.php
+%%NLS%%%%GALLERYDIR%%/locale/cs_CZ.iso-8859-2/flagimage/cs_CZ.iso-8859-2.gif
 %%NLS%%%%GALLERYDIR%%/locale/da_DK/LC_MESSAGES/da_DK-gallery_config.mo
 %%NLS%%%%GALLERYDIR%%/locale/da_DK/LC_MESSAGES/da_DK-gallery_core.mo
 %%NLS%%%%GALLERYDIR%%/locale/da_DK/da_DK-gallery_config.po
@@ -310,12 +386,12 @@
 %%NLS%%%%GALLERYDIR%%/locale/fr_FR/fr_FR-gallery_config.po
 %%NLS%%%%GALLERYDIR%%/locale/fr_FR/fr_FR-gallery_core.po
 %%NLS%%%%GALLERYDIR%%/locale/fr_FR/fr_FR-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-gallery_config.po
-%%NLS%%%%GALLERYDIR%%/locale/he_IL/he_IL-gallery_core.po
-%%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
@@ -610,6 +686,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/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/images/mod_descbg.jpg
@@ -676,9 +757,7 @@
 %%GALLERYDIR%%/skins/yellow/images/screenshot.jpg
 %%GALLERYDIR%%/skins/yellow/style.def
 %%GALLERYDIR%%/slideshow.php
-%%GALLERYDIR%%/slideshow_low.php
 %%GALLERYDIR%%/sort_album.php
-%%GALLERYDIR%%/test.php
 %%GALLERYDIR%%/tools/build_manifest.php
 %%GALLERYDIR%%/tools/g1-makereport.php
 %%GALLERYDIR%%/tools/g1-report.css
@@ -694,6 +773,7 @@
 %%GALLERYDIR%%/view_comments.php
 %%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
@@ -717,6 +797,9 @@
 @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
@@ -817,9 +900,9 @@
 %%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/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/he_IL
+%%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/fr_FR/flagimage
 %%NLS%%@dirrm %%GALLERYDIR%%/locale/fr_FR/LC_MESSAGES
 %%NLS%%@dirrm %%GALLERYDIR%%/locale/fr_FR
@@ -840,9 +923,9 @@
 %%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.cp1250/flagimage
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES
-%%NLS%%@dirrm %%GALLERYDIR%%/locale/cs_CZ.cp1250
+%%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
@@ -853,14 +936,21 @@
 %%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
@@ -871,11 +961,21 @@
 @dirrm %%GALLERYDIR%%/docs/context-help
 @dirrm %%GALLERYDIR%%/docs
 @dirrm %%GALLERYDIR%%/css
+@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