4 files changed, 184 insertions, 91 deletions

diff --git a/www/gallery2/Makefile b/www/gallery2/Makefile
index 1b1e3b68cc5d..df9f96719b67 100644
--- a/www/gallery2/Makefile
+++ b/www/gallery2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gallery
-PORTVERSION=	1.4.1.1
+PORTVERSION=	1.4.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1$/-pl1/}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${LANGPACKS}
 DIST_SUBDIR=	gallery
 
@@ -21,37 +20,38 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm \
 		jhead:${PORTSDIR}/graphics/jhead \
 		unzip:${PORTSDIR}/archivers/unzip
 
-LANGVERSION=	1.4.1
-LANGPACKS=	af_ZA-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		bg_BG-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		cs_CZ.cp1250-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
+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}-u2${EXTRACT_SUFX} \
-		de_DE.du-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
+		de_DE-pack-${LANGVERSION}${EXTRACT_SUFX} \
 		en_GB-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		es_ES-pack-${LANGVERSION}-u2${EXTRACT_SUFX} \
-		fi_FI-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		fr_FR-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		he_IL-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		hu_HU-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		is_IS-pack-${LANGVERSION}-u1${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}-u1${EXTRACT_SUFX} \
-		ko_KR-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		lt_LT-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		nl_NL-pack-${LANGVERSION}-u1${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}-u1${EXTRACT_SUFX} \
-		pt_BR-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
-		pt_PT-pack-${LANGVERSION}-u1${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}-u2${EXTRACT_SUFX} \
+		sv_SE-pack-${LANGVERSION}${EXTRACT_SUFX} \
 		tr_TR-pack-${LANGVERSION}${EXTRACT_SUFX} \
 		uk_UA-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		vi_VN-pack-${LANGVERSION}-u2${EXTRACT_SUFX} \
+		vi_VN-pack-${LANGVERSION}${EXTRACT_SUFX} \
 		zh_CN-pack-${LANGVERSION}${EXTRACT_SUFX} \
-		zh_TW-pack-${LANGVERSION}-u1${EXTRACT_SUFX} \
+		zh_TW-pack-${LANGVERSION}${EXTRACT_SUFX} \
 		zh_TW.utf8-pack-${LANGVERSION}${EXTRACT_SUFX}
 
 USE_PHP=	yes
@@ -60,7 +60,7 @@ WANT_PHP_WEB=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
-DOCFILES=	AUTHORS ChangeLog README RELEASE_NOTES
+DOCFILES=	AUTHORS ChangeLog README
 EXCEPTFILES=	${DOCFILES} LICENSE.txt
 CPIOARGS=	--quiet -pdum -R
 PLIST_SUB=	GALLERYDIR=${GALLERYDIR}
diff --git a/www/gallery2/distinfo b/www/gallery2/distinfo
index b8988369932a..417998578813 100644
--- a/www/gallery2/distinfo
+++ b/www/gallery2/distinfo
@@ -1,32 +1,66 @@
-MD5 (gallery/gallery-1.4.1-pl1.tar.gz) = be41eceb5a5d3c545c72a35c3a4876c2
-MD5 (gallery/af_ZA-pack-1.4.1-u1.tar.gz) = 3e39752633f68280ede7673a20fa295f
-MD5 (gallery/bg_BG-pack-1.4.1-u1.tar.gz) = b5be2721c6f1f21b8da6d59aa8bbc1ff
-MD5 (gallery/cs_CZ.cp1250-pack-1.4.1-u1.tar.gz) = 2c0c201f1d48dae7b5a9cb33bfa48cad
-MD5 (gallery/da_DK-pack-1.4.1.tar.gz) = 28030b7fc9f6e26e3778d75d9a7d3306
-MD5 (gallery/de_DE-pack-1.4.1-u2.tar.gz) = 4c0ae1a1e34d4644251d2cac580c1367
-MD5 (gallery/de_DE.du-pack-1.4.1-u1.tar.gz) = 56ad902f61b2787a873381a19913596d
-MD5 (gallery/en_GB-pack-1.4.1.tar.gz) = 12f5cdaa8d1712439c7a309a8ab4d103
-MD5 (gallery/es_ES-pack-1.4.1-u2.tar.gz) = 23e33efb7f16899c3f60a0991ad7608c
-MD5 (gallery/fi_FI-pack-1.4.1-u1.tar.gz) = 0f4b73073980407960af034e81b5eb93
-MD5 (gallery/fr_FR-pack-1.4.1-u1.tar.gz) = fb2e7431d035953183840464a60bc2eb
-MD5 (gallery/he_IL-pack-1.4.1-u1.tar.gz) = 032b649baa728000a2cc4896adea0d76
-MD5 (gallery/hu_HU-pack-1.4.1-u1.tar.gz) = b2fc9cb60e06298d1ac7e693adef1924
-MD5 (gallery/is_IS-pack-1.4.1-u1.tar.gz) = 3f2a0bcbdd923d493084cc04a1eb83a9
-MD5 (gallery/it_IT-pack-1.4.1.tar.gz) = f708ef4638e26e53076531306d4603ae
-MD5 (gallery/ja_JP-pack-1.4.1-u1.tar.gz) = b2ce15b8d9c6dad45722681c860e1abf
-MD5 (gallery/ko_KR-pack-1.4.1-u1.tar.gz) = 5310de8f605547fc1221b9f63400aa08
-MD5 (gallery/lt_LT-pack-1.4.1-u1.tar.gz) = f9b13c7dd41808dc017d49682174daf4
-MD5 (gallery/nl_NL-pack-1.4.1-u1.tar.gz) = c1189be1bac9114374663f2c1867e282
-MD5 (gallery/no_NO-pack-1.4.1.tar.gz) = 7a5d6ce145308021bcb3146ba0549e91
-MD5 (gallery/pl_PL-pack-1.4.1-u1.tar.gz) = 96f3fde65951eb89613a5b81d2e8aaed
-MD5 (gallery/pt_BR-pack-1.4.1-u1.tar.gz) = ae5f1f0e2c98c07fa6a82e166edb1514
-MD5 (gallery/pt_PT-pack-1.4.1-u1.tar.gz) = ff81c8142b9784b038b47c54b0810c83
-MD5 (gallery/ru_RU.koi8r-pack-1.4.1.tar.gz) = 144adc1262a44abffc31bc572aab2a78
-MD5 (gallery/sl_SI-pack-1.4.1.tar.gz) = 2ecbfd5a57dc5cd832f7162469df5458
-MD5 (gallery/sv_SE-pack-1.4.1-u2.tar.gz) = ccf4604212a0120b36a77f93e2132d17
-MD5 (gallery/tr_TR-pack-1.4.1.tar.gz) = a1b87d7a56b06be3d7ecb93836e93e30
-MD5 (gallery/uk_UA-pack-1.4.1.tar.gz) = ea4bf73f35fcf83ef1e890b750ae718f
-MD5 (gallery/vi_VN-pack-1.4.1-u2.tar.gz) = aa7eafd633731f21861f8be44803524c
-MD5 (gallery/zh_CN-pack-1.4.1.tar.gz) = b7be4ff7f78cdc9b3063f4905fd59014
-MD5 (gallery/zh_TW-pack-1.4.1-u1.tar.gz) = 843fe6e4501e9763c99defe754b7b064
-MD5 (gallery/zh_TW.utf8-pack-1.4.1.tar.gz) = 613f785924339f67bf388d4a254ee011
+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
diff --git a/www/gallery2/files/patch-manifest.inc b/www/gallery2/files/patch-manifest.inc
index 871810258760..44419998a882 100644
--- a/www/gallery2/files/patch-manifest.inc
+++ b/www/gallery2/files/patch-manifest.inc
@@ -1,28 +1,28 @@
---- manifest.inc.orig	Sat Jan 24 22:45:58 2004
-+++ manifest.inc	Sun Jan 25 11:25:43 2004
+--- 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.6.1';
- $versions['Version.php']='1.496.2.40';
- $versions['add_comment.php']='1.26.2.1';
- $versions['add_photo.php']='1.18';
+-$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.33.2.1';
- $versions['albums.php']='1.109.2.1';
- $versions['captionator.php']='1.36';
+ $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';
- $versions['create_user.php']='1.30';
+ $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';
- $versions['save_photos.php']='1.80';
- $versions['search.php']='1.45';
+ $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';
- $versions['slideshow.php']='1.41.2.2';
+ $versions['session.php']='1.26.8.1';
+ $versions['slideshow.php']='1.46.2.1';
diff --git a/www/gallery2/pkg-plist b/www/gallery2/pkg-plist
index 47ce40d1b01e..b0cb1cad7e86 100644
--- a/www/gallery2/pkg-plist
+++ b/www/gallery2/pkg-plist
@@ -1,7 +1,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/RELEASE_NOTES
 %%GALLERYDIR%%/Version.php
 %%GALLERYDIR%%/add_comment.php
 %%GALLERYDIR%%/add_photo.php
@@ -27,6 +26,8 @@
 %%GALLERYDIR%%/classes/nuke5/AdminUser.php
 %%GALLERYDIR%%/classes/nuke5/User.php
 %%GALLERYDIR%%/classes/nuke5/UserDB.php
+%%GALLERYDIR%%/classes/phpbb/User.php
+%%GALLERYDIR%%/classes/phpbb/UserDB.php
 %%GALLERYDIR%%/classes/postnuke/User.php
 %%GALLERYDIR%%/classes/postnuke/UserDB.php
 %%GALLERYDIR%%/classes/postnuke0.7.1/User.php
@@ -37,12 +38,53 @@
 %%GALLERYDIR%%/create_user.php
 %%GALLERYDIR%%/css/config.css.default
 %%GALLERYDIR%%/css/embedded_style.css.default
-%%GALLERYDIR%%/css/embedded_style.css.diff
 %%GALLERYDIR%%/css/standalone_style.css.default
 %%GALLERYDIR%%/delete_album.php
 %%GALLERYDIR%%/delete_photo.php
 %%GALLERYDIR%%/delete_user.php
 %%GALLERYDIR%%/do_command.php
+%%GALLERYDIR%%/docs/context-help/login.php
+%%GALLERYDIR%%/docs/context-help/register.php
+%%GALLERYDIR%%/docs/context-help/search.php
+%%GALLERYDIR%%/docs/context-help/slideshow.php
+%%GALLERYDIR%%/docs/context-help/test.php
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.backup.html
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.basics.html
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.embedding.html
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.html
+%%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.securing.html
+%%GALLERYDIR%%/docs/g1package/gallery1-admin.users.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.config-wizard.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.credits.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.faq.a.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.faq.b.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.faq.c.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.faq.d.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.faq.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.features.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.help.html
+%%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.required-programs.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.requirements.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.unix-ftp.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.unix-shell.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.upgrade.html
+%%GALLERYDIR%%/docs/g1package/gallery1-install.windows-iis.html
+%%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
+%%GALLERYDIR%%/docs/g1package/preface.html
+%%GALLERYDIR%%/docs/g1package/pretty-html.css
 %%GALLERYDIR%%/docs/gallery1-admin.backup.html
 %%GALLERYDIR%%/docs/gallery1-admin.basics.html
 %%GALLERYDIR%%/docs/gallery1-admin.embedding.html
@@ -64,6 +106,7 @@
 %%GALLERYDIR%%/docs/gallery1-install.features.html
 %%GALLERYDIR%%/docs/gallery1-install.help.html
 %%GALLERYDIR%%/docs/gallery1-install.html
+%%GALLERYDIR%%/docs/gallery1-install.language-packs.html
 %%GALLERYDIR%%/docs/gallery1-install.overview.html
 %%GALLERYDIR%%/docs/gallery1-install.required-programs.html
 %%GALLERYDIR%%/docs/gallery1-install.requirements.html
@@ -118,13 +161,13 @@
 %%GALLERYDIR%%/html_wrap/frames/polaroids/TT.gif
 %%GALLERYDIR%%/html_wrap/frames/polaroids/frame.def
 %%GALLERYDIR%%/html_wrap/frames/polaroids/pixel_trans.gif
-%%GALLERYDIR%%/html_wrap/frames/shadows/BB.gif
-%%GALLERYDIR%%/html_wrap/frames/shadows/BBL.gif
-%%GALLERYDIR%%/html_wrap/frames/shadows/BR.gif
-%%GALLERYDIR%%/html_wrap/frames/shadows/RR.gif
-%%GALLERYDIR%%/html_wrap/frames/shadows/RRT.gif
+%%GALLERYDIR%%/html_wrap/frames/shadows/BB.png
+%%GALLERYDIR%%/html_wrap/frames/shadows/BBL.png
+%%GALLERYDIR%%/html_wrap/frames/shadows/BR.png
+%%GALLERYDIR%%/html_wrap/frames/shadows/RR.png
+%%GALLERYDIR%%/html_wrap/frames/shadows/RRT.png
 %%GALLERYDIR%%/html_wrap/frames/shadows/frame.def
-%%GALLERYDIR%%/html_wrap/frames/shadows/pixel_trans.gif
+%%GALLERYDIR%%/html_wrap/frames/shadows/pixel_trans.png
 %%GALLERYDIR%%/html_wrap/frames/simple_book/BB.gif
 %%GALLERYDIR%%/html_wrap/frames/simple_book/BL.gif
 %%GALLERYDIR%%/html_wrap/frames/simple_book/BR.gif
@@ -218,6 +261,12 @@
 %%GALLERYDIR%%/locale/bg_BG/bg_BG-gallery_core.po
 %%GALLERYDIR%%/locale/bg_BG/bg_BG-nls.php
 %%GALLERYDIR%%/locale/bg_BG/flagimage/bg_BG.gif
+%%GALLERYDIR%%/locale/ca_ES/LC_MESSAGES/ca_ES-gallery_config.mo
+%%GALLERYDIR%%/locale/ca_ES/LC_MESSAGES/ca_ES-gallery_core.mo
+%%GALLERYDIR%%/locale/ca_ES/ca_ES-gallery_config.po
+%%GALLERYDIR%%/locale/ca_ES/ca_ES-gallery_core.po
+%%GALLERYDIR%%/locale/ca_ES/ca_ES-nls.php
+%%GALLERYDIR%%/locale/ca_ES/flagimage/ca_ES.gif
 %%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES/cs_CZ.cp1250-gallery_config.mo
 %%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES/cs_CZ.cp1250-gallery_core.mo
 %%GALLERYDIR%%/locale/cs_CZ.cp1250/cs_CZ.cp1250-gallery_config.po
@@ -230,12 +279,6 @@
 %%GALLERYDIR%%/locale/da_DK/da_DK-gallery_core.po
 %%GALLERYDIR%%/locale/da_DK/da_DK-nls.php
 %%GALLERYDIR%%/locale/da_DK/flagimage/da_DK.gif
-%%GALLERYDIR%%/locale/de_DE.du/LC_MESSAGES/de_DE.du-gallery_config.mo
-%%GALLERYDIR%%/locale/de_DE.du/LC_MESSAGES/de_DE.du-gallery_core.mo
-%%GALLERYDIR%%/locale/de_DE.du/de_DE.du-gallery_config.po
-%%GALLERYDIR%%/locale/de_DE.du/de_DE.du-gallery_core.po
-%%GALLERYDIR%%/locale/de_DE.du/de_DE.du-nls.php
-%%GALLERYDIR%%/locale/de_DE.du/flagimage/de_DE.du.gif
 %%GALLERYDIR%%/locale/de_DE/LC_MESSAGES/de_DE-gallery_config.mo
 %%GALLERYDIR%%/locale/de_DE/LC_MESSAGES/de_DE-gallery_core.mo
 %%GALLERYDIR%%/locale/de_DE/de_DE-gallery_config.po
@@ -278,7 +321,6 @@
 %%GALLERYDIR%%/locale/hu_HU/flagimage/hu_HU.gif
 %%GALLERYDIR%%/locale/hu_HU/hu_HU-gallery_config.po
 %%GALLERYDIR%%/locale/hu_HU/hu_HU-gallery_core.po
-%%GALLERYDIR%%/locale/hu_HU/hu_HU-gallery_core.po~
 %%GALLERYDIR%%/locale/hu_HU/hu_HU-nls.php
 %%GALLERYDIR%%/locale/is_IS/LC_MESSAGES/is_IS-gallery_config.mo
 %%GALLERYDIR%%/locale/is_IS/LC_MESSAGES/is_IS-gallery_core.mo
@@ -340,6 +382,12 @@
 %%GALLERYDIR%%/locale/pt_PT/pt_PT-gallery_config.po
 %%GALLERYDIR%%/locale/pt_PT/pt_PT-gallery_core.po
 %%GALLERYDIR%%/locale/pt_PT/pt_PT-nls.php
+%%GALLERYDIR%%/locale/ru_RU/LC_MESSAGES/ru_RU-gallery_config.mo
+%%GALLERYDIR%%/locale/ru_RU/LC_MESSAGES/ru_RU-gallery_core.mo
+%%GALLERYDIR%%/locale/ru_RU/flagimage/ru_RU.gif
+%%GALLERYDIR%%/locale/ru_RU/ru_RU-gallery_config.po
+%%GALLERYDIR%%/locale/ru_RU/ru_RU-gallery_core.po
+%%GALLERYDIR%%/locale/ru_RU/ru_RU-nls.php
 %%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_config.mo
 %%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES/ru_RU.koi8r-gallery_core.mo
 %%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage/ru_RU.koi8r.gif
@@ -407,8 +455,10 @@
 %%GALLERYDIR%%/platform/fs_unix.php
 %%GALLERYDIR%%/platform/fs_win32.php
 %%GALLERYDIR%%/po/CREDITS
+%%GALLERYDIR%%/po/change_version.sh
 %%GALLERYDIR%%/po/copyright.txt
 %%GALLERYDIR%%/po/create_po_template.sh
+%%GALLERYDIR%%/po/edit_changelog.sh
 %%GALLERYDIR%%/po/filelist-config
 %%GALLERYDIR%%/po/filelist-core
 %%GALLERYDIR%%/po/gallery-config.pot
@@ -445,6 +495,7 @@
 %%GALLERYDIR%%/setup/defaults.inc
 %%GALLERYDIR%%/setup/diagnostics.php
 %%GALLERYDIR%%/setup/functions.inc
+%%GALLERYDIR%%/setup/ghcc.php
 %%GALLERYDIR%%/setup/gpl.txt
 %%GALLERYDIR%%/setup/index.php
 %%GALLERYDIR%%/setup/init.php
@@ -627,6 +678,7 @@
 %%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
@@ -729,6 +781,9 @@
 @dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r/flagimage
 @dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r/LC_MESSAGES
 @dirrm %%GALLERYDIR%%/locale/ru_RU.koi8r
+@dirrm %%GALLERYDIR%%/locale/ru_RU/flagimage
+@dirrm %%GALLERYDIR%%/locale/ru_RU/LC_MESSAGES
+@dirrm %%GALLERYDIR%%/locale/ru_RU
 @dirrm %%GALLERYDIR%%/locale/pt_PT/flagimage
 @dirrm %%GALLERYDIR%%/locale/pt_PT/LC_MESSAGES
 @dirrm %%GALLERYDIR%%/locale/pt_PT
@@ -781,9 +836,6 @@
 @dirrm %%GALLERYDIR%%/locale/en_GB
 @dirrm %%GALLERYDIR%%/locale/de_DE/flagimage
 @dirrm %%GALLERYDIR%%/locale/de_DE/LC_MESSAGES
-@dirrm %%GALLERYDIR%%/locale/de_DE.du/flagimage
-@dirrm %%GALLERYDIR%%/locale/de_DE.du/LC_MESSAGES
-@dirrm %%GALLERYDIR%%/locale/de_DE.du
 @dirrm %%GALLERYDIR%%/locale/de_DE
 @dirrm %%GALLERYDIR%%/locale/da_DK/flagimage
 @dirrm %%GALLERYDIR%%/locale/da_DK/LC_MESSAGES
@@ -791,6 +843,9 @@
 @dirrm %%GALLERYDIR%%/locale/cs_CZ.cp1250/flagimage
 @dirrm %%GALLERYDIR%%/locale/cs_CZ.cp1250/LC_MESSAGES
 @dirrm %%GALLERYDIR%%/locale/cs_CZ.cp1250
+@dirrm %%GALLERYDIR%%/locale/ca_ES/flagimage
+@dirrm %%GALLERYDIR%%/locale/ca_ES/LC_MESSAGES
+@dirrm %%GALLERYDIR%%/locale/ca_ES
 @dirrm %%GALLERYDIR%%/locale/bg_BG/flagimage
 @dirrm %%GALLERYDIR%%/locale/bg_BG/LC_MESSAGES
 @dirrm %%GALLERYDIR%%/locale/bg_BG
@@ -811,11 +866,15 @@
 @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%%/classes/remote
 @dirrm %%GALLERYDIR%%/classes/postnuke0.7.1
 @dirrm %%GALLERYDIR%%/classes/postnuke
+@dirrm %%GALLERYDIR%%/classes/phpbb
 @dirrm %%GALLERYDIR%%/classes/nuke5
 @dirrm %%GALLERYDIR%%/classes/gallery
 @dirrm %%GALLERYDIR%%/classes/database/mysql