Merge remote-tracking branch 'upstream/master'

author: Koop Mast <kwm@rainbow-runner.nl> 2019-08-24 18:15:33 +0800
committer: Koop Mast <kwm@rainbow-runner.nl> 2019-08-24 18:15:33 +0800
commit: 9fcef473288365748d276dbf967c46d8c3698aaf (patch)
tree: f2cb55313941568afa0d6433903b1ef3745562f4 /sysutils
parent: 10567987504404669e1cfc3d20faaeb3dfad42d1 (diff)
parent: acc0f44496c6b2b236d95762511a98a0aa5061e6 (diff)
download: freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.tar.gz
freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.tar.zst
freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.zip
149 files changed, 1509 insertions, 3269 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index a67e740110d1..29c8fa15e63b 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -104,6 +104,7 @@
     SUBDIR += bfs
     SUBDIR += bhyve-firmware
     SUBDIR += bhyve-rc
+    SUBDIR += bibelot
     SUBDIR += biosfont
     SUBDIR += bkpupsd
     SUBDIR += bksh
@@ -348,6 +349,7 @@
     SUBDIR += fpc-users
     SUBDIR += fpc-utmp
     SUBDIR += fpc-uuid
+    SUBDIR += frand
     SUBDIR += freebsd-snapshot
     SUBDIR += freecolor
     SUBDIR += freedt
@@ -444,7 +446,6 @@
     SUBDIR += graid5
     SUBDIR += graveman
     SUBDIR += graylog
-    SUBDIR += grub2
     SUBDIR += grub2-bhyve
     SUBDIR += gsh
     SUBDIR += gsmartcontrol
@@ -630,6 +631,7 @@
     SUBDIR += mac_nonet
     SUBDIR += mac_rtprio
     SUBDIR += magicrescue
+    SUBDIR += makeztxt
     SUBDIR += manck
     SUBDIR += mapchan
     SUBDIR += mapdir
@@ -1230,6 +1232,7 @@
     SUBDIR += schedutils
     SUBDIR += screen
     SUBDIR += screenfetch
+    SUBDIR += screenfetch-nox11
     SUBDIR += screenie
     SUBDIR += scterc
     SUBDIR += sd-agent
@@ -1332,6 +1335,7 @@
     SUBDIR += tenshi
     SUBDIR += tentakel
     SUBDIR += terraform
+    SUBDIR += terraform-provider-vultr
     SUBDIR += testdisk
     SUBDIR += thefish
     SUBDIR += timelimit
diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile
index 4fc2603a4339..2ba035be1ea8 100644
--- a/sysutils/acpica-tools/Makefile
+++ b/sysutils/acpica-tools/Makefile
@@ -1,7 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20190703
+PORTVERSION=	20190816
+PORTREVISION=	1
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim
@@ -16,7 +17,7 @@ LICENSE_COMB=	dual
 
 BROKEN_powerpc64=	fails to compile: comparison is always true due to limited range of data type
 
-USES=		gmake
+USES=		bison gmake
 
 BUILD_WRKSRC=	${WRKSRC}/generate/unix
 
@@ -25,8 +26,8 @@ ACPICA_TOOLS+=	acpixtract iasl
 
 PLIST_FILES=	${ACPICA_TOOLS:S,^,bin/,}
 
-MAKE_ARGS=	HOST=_FreeBSD NOOPT=TRUE PROGS="${ACPICA_TOOLS}"
-MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${YACC}"
+MAKE_ARGS=	HOST=_FreeBSD PROGS="${ACPICA_TOOLS}"
+MAKE_ARGS+=	CC="${CC}" LEX="${FLEX}" YACC="${LOCALBASE}/bin/bison"
 
 do-install:
 	${INSTALL_PROGRAM} ${ACPICA_TOOLS:S,^,${BUILD_WRKSRC}/bin/,} \
diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo
index f4ad24e3518d..e2aa35dc3b85 100644
--- a/sysutils/acpica-tools/distinfo
+++ b/sysutils/acpica-tools/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562691275
-SHA256 (acpica-unix-20190703.tar.gz) = 212563b55c5db1eed84f2e6e9abfee60ab281423f018d39dd93b81a08808350c
-SIZE (acpica-unix-20190703.tar.gz) = 1845874
+TIMESTAMP = 1565969994
+SHA256 (acpica-unix-20190816.tar.gz) = 7aec4dc88a3ba148eecd898e59fb5378573eb6a94585e5538e0b396840d0fc5c
+SIZE (acpica-unix-20190816.tar.gz) = 1856681
diff --git a/sysutils/acpica-tools/files/patch-source_common_dmtables.c b/sysutils/acpica-tools/files/patch-source_common_dmtables.c
new file mode 100644
index 000000000000..58ec0a75042e
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source_common_dmtables.c
@@ -0,0 +1,11 @@
+--- source/common/dmtables.c.orig	2019-08-16 15:01:10 UTC
++++ source/common/dmtables.c
+@@ -327,7 +327,7 @@ AdCreateTableHeader (
+      * makes it easier to rename the disassembled ASL file if needed.
+      */
+     AcpiOsPrintf (
+-        "DefinitionBlock (\"\", \"%4.4s\", %hu, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
++        "DefinitionBlock (\"\", \"%4.4s\", %u, \"%.6s\", \"%.8s\", 0x%8.8X)\n",
+         Table->Signature, Table->Revision,
+         Table->OemId, Table->OemTableId, Table->OemRevision);
+ }
diff --git a/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
new file mode 100644
index 000000000000..adc056b30213
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source_components_namespace_nsdump.c
@@ -0,0 +1,20 @@
+--- source/components/namespace/nsdump.c.orig	2019-08-16 15:01:13 UTC
++++ source/components/namespace/nsdump.c
+@@ -478,7 +478,7 @@ AcpiNsDumpOneObject (
+                     AcpiOsPrintf (" =");
+                     for (i = 0; (i < ObjDesc->Buffer.Length && i < 12); i++)
+                     {
+-                        AcpiOsPrintf (" %.2hX", ObjDesc->Buffer.Pointer[i]);
++                        AcpiOsPrintf (" %2.2X", ObjDesc->Buffer.Pointer[i]);
+                     }
+                 }
+                 AcpiOsPrintf ("\n");
+@@ -575,7 +575,7 @@ AcpiNsDumpOneObject (
+         case ACPI_TYPE_LOCAL_BANK_FIELD:
+         case ACPI_TYPE_LOCAL_INDEX_FIELD:
+ 
+-            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2hd\n",
++            AcpiOsPrintf (" Off %.3X Len %.2X Acc %.2X\n",
+                 (ObjDesc->CommonField.BaseByteOffset * 8)
+                     + ObjDesc->CommonField.StartFieldBitOffset,
+                 ObjDesc->CommonField.BitLength,
diff --git a/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
new file mode 100644
index 000000000000..e576e27d7be1
--- /dev/null
+++ b/sysutils/acpica-tools/files/patch-source_components_utilities_uttrack.c
@@ -0,0 +1,11 @@
+--- source/components/utilities/uttrack.c.orig	2019-08-16 15:01:14 UTC
++++ source/components/utilities/uttrack.c
+@@ -864,7 +864,7 @@ AcpiUtDumpAllocations (
+ 
+                     case ACPI_DESC_TYPE_PARSER:
+ 
+-                        AcpiOsPrintf ("AmlOpcode 0x%04hX\n",
++                        AcpiOsPrintf ("AmlOpcode 0x%04X\n",
+                             Descriptor->Op.Asl.AmlOpcode);
+                         break;
+ 
diff --git a/sysutils/baloo-widgets/Makefile b/sysutils/baloo-widgets/Makefile
index c78bfe6f93dd..83e4f4b7f059 100644
--- a/sysutils/baloo-widgets/Makefile
+++ b/sysutils/baloo-widgets/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	baloo-widgets
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/baloo-widgets/distinfo b/sysutils/baloo-widgets/distinfo
index eee3013a5176..7b972ea96fd1 100644
--- a/sysutils/baloo-widgets/distinfo
+++ b/sysutils/baloo-widgets/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690851
-SHA256 (KDE/applications/19.04.3/baloo-widgets-19.04.3.tar.xz) = ee14c03ac8254a0d0680bce856178a2110f0339b9dd5021927c59ff2df90606f
-SIZE (KDE/applications/19.04.3/baloo-widgets-19.04.3.tar.xz) = 249112
+TIMESTAMP = 1565555768
+SHA256 (KDE/applications/19.08.0/baloo-widgets-19.08.0.tar.xz) = 3ef81f74ce6fccd6eaf60e0dfd18fe660ac357e75c4715801da9bb3a203a6008
+SIZE (KDE/applications/19.08.0/baloo-widgets-19.08.0.tar.xz) = 261580
diff --git a/sysutils/baloo-widgets/pkg-plist b/sysutils/baloo-widgets/pkg-plist
index 353c5948da15..1f93a3899c00 100644
--- a/sysutils/baloo-widgets/pkg-plist
+++ b/sysutils/baloo-widgets/pkg-plist
@@ -12,7 +12,7 @@ lib/cmake/KF5BalooWidgets/KF5BalooWidgetsTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/KF5BalooWidgets/KF5BalooWidgetsTargets.cmake
 lib/libKF5BalooWidgets.so
 lib/libKF5BalooWidgets.so.5
-lib/libKF5BalooWidgets.so.19.4.3
+lib/libKF5BalooWidgets.so.19.8.0
 %%QT_PLUGINDIR%%/baloofilepropertiesplugin.so
 %%QT_PLUGINDIR%%/kf5/kfileitemaction/tagsfileitemaction.so
 share/kservices5/baloofilepropertiesplugin.desktop
@@ -43,6 +43,7 @@ share/locale/ja/LC_MESSAGES/baloowidgets5.mo
 share/locale/kk/LC_MESSAGES/baloowidgets5.mo
 share/locale/ko/LC_MESSAGES/baloowidgets5.mo
 share/locale/lt/LC_MESSAGES/baloowidgets5.mo
+share/locale/ml/LC_MESSAGES/baloowidgets5.mo
 share/locale/mr/LC_MESSAGES/baloowidgets5.mo
 share/locale/nb/LC_MESSAGES/baloowidgets5.mo
 share/locale/nds/LC_MESSAGES/baloowidgets5.mo
diff --git a/sysutils/battray/Makefile b/sysutils/battray/Makefile
index 2f07b5e82ed4..75425f8604cd 100644
--- a/sysutils/battray/Makefile
+++ b/sysutils/battray/Makefile
@@ -2,21 +2,23 @@
 # $FreeBSD$
 
 PORTNAME=	battray
+DISTVERSIONPREFIX=	version-
 DISTVERSION=	2.3
 PORTREVISION=	1
 CATEGORIES=	sysutils python
-DISTVERSIONPREFIX=	version-
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Display notebook battery status in tray
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.3+
 USE_GNOME=	pygobject3
 USE_PYTHON=	autoplist distutils optsuffix
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	Carpetsmoker
+GH_ACCOUNT=	arp242
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/sysutils/battray/distinfo b/sysutils/battray/distinfo
index 5a1af4c8a591..521b57b2e69c 100644
--- a/sysutils/battray/distinfo
+++ b/sysutils/battray/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1511432618
-SHA256 (Carpetsmoker-battray-version-2.3_GH0.tar.gz) = ec0517d389d74ceb6471390051079e80ae53fa287090b9f90813575b593ba56d
-SIZE (Carpetsmoker-battray-version-2.3_GH0.tar.gz) = 68972
+SHA256 (arp242-battray-version-2.3_GH0.tar.gz) = ec0517d389d74ceb6471390051079e80ae53fa287090b9f90813575b593ba56d
+SIZE (arp242-battray-version-2.3_GH0.tar.gz) = 68972
diff --git a/sysutils/battray/pkg-descr b/sysutils/battray/pkg-descr
index 9314c57a6636..ac01d6dc47dd 100644
--- a/sysutils/battray/pkg-descr
+++ b/sysutils/battray/pkg-descr
@@ -6,4 +6,4 @@ It is also able to take certain actions depending on battery status.
 It's simple, easy, fairly environment-independent, and "just works" without
 tons of (Gnome|KDE|..) dependencies.
 
-WWW: http://code.arp242.net/battray
+WWW: https://github.com/arp242/battray
diff --git a/sysutils/bibelot/Makefile b/sysutils/bibelot/Makefile
new file mode 100644
index 000000000000..942473376cb2
--- /dev/null
+++ b/sysutils/bibelot/Makefile
@@ -0,0 +1,27 @@
+# Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	bibelot
+PORTVERSION=	0.9.4
+CATEGORIES=	sysutils
+MASTER_SITES=	SF/${PORTNAME}/Bibelot/${PORTVERSION}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Formats and converts text documents into compressed PalmDoc .pdb files
+
+DEPRECATED=	obsolete technology
+EXPIRATION_DATE=	2019-09-21
+
+USES=		perl5 shebangfix
+NO_BUILD=	yes
+
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
+PLIST_FILES=	bin/bibelot
+SHEBANG_FILES=	bibelot.pl
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
+		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/sysutils/bibelot/distinfo b/sysutils/bibelot/distinfo
new file mode 100644
index 000000000000..8b96c4ebe27a
--- /dev/null
+++ b/sysutils/bibelot/distinfo
@@ -0,0 +1,2 @@
+SHA256 (bibelot-0.9.4.tar.gz) = bc8fe3018553ae641d143586d965eab2e4e6d8a52df304b302a033aba63da007
+SIZE (bibelot-0.9.4.tar.gz) = 22451
diff --git a/sysutils/bibelot/pkg-descr b/sysutils/bibelot/pkg-descr
new file mode 100644
index 000000000000..ed2241b15356
--- /dev/null
+++ b/sysutils/bibelot/pkg-descr
@@ -0,0 +1,6 @@
+bibelot.pl is a Perl script that formats and converts text documents
+into compressed PalmDoc .pdb files, suitable for reading on a Palm
+or Handspring device with any standard PalmDoc reader (AportisDoc,
+CSpotRun, RichReader, TealDoc, etc.)
+
+WWW: https://sourceforge.net/projects/bibelot/
diff --git a/sysutils/bulk_extractor/Makefile b/sysutils/bulk_extractor/Makefile
index b37e4739f0d6..d280b5d78289 100644
--- a/sysutils/bulk_extractor/Makefile
+++ b/sysutils/bulk_extractor/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bulk_extractor
 PORTVERSION=	1.5.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	sysutils
 MASTER_SITES=	http://digitalcorpora.org/downloads/bulk_extractor/
 
diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile
index 87047aebe2c9..31c71ebcfbb9 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	condor
 DISTVERSION=	8.4.12
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://www.acadix.biz/Ports/distfiles/
 DISTNAME=	condor_src-${PORTVERSION}-all-all
diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile
index 355d6b708522..74bed2decd2b 100644
--- a/sysutils/debhelper/Makefile
+++ b/sysutils/debhelper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	debhelper
-PORTVERSION=	12.4
+PORTVERSION=	12.5.3
 CATEGORIES=	sysutils
 MASTER_SITES=	DEBIAN
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/sysutils/debhelper/distinfo b/sysutils/debhelper/distinfo
index a04d70cdc806..40d1e173b273 100644
--- a/sysutils/debhelper/distinfo
+++ b/sysutils/debhelper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565801643
-SHA256 (debhelper_12.4.tar.xz) = 7049b262baff5decef90cdbdb21cf530bcde2562122534a2410cd104377f1505
-SIZE (debhelper_12.4.tar.xz) = 493916
+TIMESTAMP = 1566324247
+SHA256 (debhelper_12.5.3.tar.xz) = ee70aa302270f6235b9603c5707faed5ec1d19234705567c5c1cf27a690d8020
+SIZE (debhelper_12.5.3.tar.xz) = 500304
diff --git a/sysutils/debhelper/pkg-plist b/sysutils/debhelper/pkg-plist
index a6169463809b..428be287de85 100644
--- a/sysutils/debhelper/pkg-plist
+++ b/sysutils/debhelper/pkg-plist
@@ -119,8 +119,10 @@ bin/prerm-wm
 %%SITE_PERL%%/Debian/Debhelper/Dh_Buildsystems.pm
 %%SITE_PERL%%/Debian/Debhelper/Dh_Getopt.pm
 %%SITE_PERL%%/Debian/Debhelper/Dh_Lib.pm
+%%SITE_PERL%%/Debian/Debhelper/Sequence.pm
 %%SITE_PERL%%/Debian/Debhelper/Sequence/build_stamp.pm
 %%SITE_PERL%%/Debian/Debhelper/Sequence/dwz.pm
+%%SITE_PERL%%/Debian/Debhelper/Sequence/elf_tools.pm
 %%SITE_PERL%%/Debian/Debhelper/Sequence/installinitramfs.pm
 %%SITE_PERL%%/Debian/Debhelper/Sequence/python_support.pm
 %%SITE_PERL%%/Debian/Debhelper/Sequence/systemd.pm
diff --git a/sysutils/desktop-installer/Makefile b/sysutils/desktop-installer/Makefile
index 3badca780661..a736632f28b1 100644
--- a/sysutils/desktop-installer/Makefile
+++ b/sysutils/desktop-installer/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	desktop-installer
-DISTVERSION=	0.6.6
+DISTVERSION=	0.6.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://acadix.biz/Ports/distfiles/
 
diff --git a/sysutils/desktop-installer/distinfo b/sysutils/desktop-installer/distinfo
index 879955a12448..c2010a016e4b 100644
--- a/sysutils/desktop-installer/distinfo
+++ b/sysutils/desktop-installer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564081813
-SHA256 (desktop-installer-0.6.6.tar.xz) = dc2f5c4e5945d702f53dd0280e8b82b285f6db4d64baf1bf81937d3d08be5d81
-SIZE (desktop-installer-0.6.6.tar.xz) = 168572
+TIMESTAMP = 1566054254
+SHA256 (desktop-installer-0.6.7.tar.xz) = 559fadb6e839f5192d4bd54a686cbe30ab2e358a57a42d1abe777cf5eed1cddd
+SIZE (desktop-installer-0.6.7.tar.xz) = 169084
diff --git a/sysutils/docker-credential-pass/Makefile b/sysutils/docker-credential-pass/Makefile
index 09b91d79e585..3259368e1c80 100644
--- a/sysutils/docker-credential-pass/Makefile
+++ b/sysutils/docker-credential-pass/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	docker-credential-pass
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.6.2
+DISTVERSION=	0.6.3
 CATEGORIES=	sysutils
 
 MAINTAINER=	dg@syrec.org
@@ -25,8 +25,8 @@ GH_PROJECT=	docker-credential-helpers
 PLIST_FILES=	bin/docker-credential-pass
 
 pre-build:
-	${CP} ${GO_WRKSRC}/pass/cmd/main_linux.go ${GO_WRKSRC}/pass/cmd/main_freebsd.go
-	${CP} ${GO_WRKSRC}/pass/pass_linux.go ${GO_WRKSRC}/pass/pass_freebsd.go
+	${LN} -s ${GO_WRKSRC}/pass/cmd/main_linux.go ${GO_WRKSRC}/pass/cmd/main_freebsd.go
+	${LN} -s ${GO_WRKSRC}/pass/pass_linux.go ${GO_WRKSRC}/pass/pass_freebsd.go
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKDIR_BIN}/cmd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
diff --git a/sysutils/docker-credential-pass/distinfo b/sysutils/docker-credential-pass/distinfo
index 972e0515045e..ee1d6537d951 100644
--- a/sysutils/docker-credential-pass/distinfo
+++ b/sysutils/docker-credential-pass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1556886368
-SHA256 (docker-docker-credential-helpers-v0.6.2_GH0.tar.gz) = 1b332d40e3d50ce084e54feea09750e18c87dadcfdfd2e8e9bd4622cbbf461b2
-SIZE (docker-docker-credential-helpers-v0.6.2_GH0.tar.gz) = 28238
+TIMESTAMP = 1565713791
+SHA256 (docker-docker-credential-helpers-v0.6.3_GH0.tar.gz) = 441684cf1d2434aa1024aa2f8455e11502c44858e93ea171b19caa656dd2b2e2
+SIZE (docker-docker-credential-helpers-v0.6.3_GH0.tar.gz) = 28971
diff --git a/sysutils/exa/Makefile b/sysutils/exa/Makefile
index 84128f064d7a..6fe578600645 100644
--- a/sysutils/exa/Makefile
+++ b/sysutils/exa/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	exa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/sysutils/facter/Makefile b/sysutils/facter/Makefile
index 69aed0ce4b1c..fd70b0abdd8b 100644
--- a/sysutils/facter/Makefile
+++ b/sysutils/facter/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	facter
-PORTVERSION=	3.14.2
+PORTVERSION=	3.14.3
 CATEGORIES?=	sysutils
 MASTER_SITES=	https://downloads.puppetlabs.com/facter/
 
diff --git a/sysutils/facter/distinfo b/sysutils/facter/distinfo
index 3e584c20c68f..f0c9d5afa41e 100644
--- a/sysutils/facter/distinfo
+++ b/sysutils/facter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564126992
-SHA256 (facter-3.14.2.tar.gz) = d43cc988389ebfcfe24e5c5ddce709b84dbaa540a6714262e9445e61d8c1c7c0
-SIZE (facter-3.14.2.tar.gz) = 352881
+TIMESTAMP = 1566517240
+SHA256 (facter-3.14.3.tar.gz) = a456b1de679273911bf9cf2b6b2a6379dc0f71b6e422d7436ab17ba9f5e61dbc
+SIZE (facter-3.14.3.tar.gz) = 354147
diff --git a/sysutils/fd/Makefile b/sysutils/fd/Makefile
index 2da477e9f999..53180da938cf 100644
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	fd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.3.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-find
 
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 767ae53e0b8a..df476007f3c2 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	filelight
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/filelight/distinfo b/sysutils/filelight/distinfo
index c85e92af8ad9..a32c66f679cb 100644
--- a/sysutils/filelight/distinfo
+++ b/sysutils/filelight/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690852
-SHA256 (KDE/applications/19.04.3/filelight-19.04.3.tar.xz) = 4ad45db886f06afdff1e5c580261eea18f2c0cf3bcde92ecdc626583641d6c88
-SIZE (KDE/applications/19.04.3/filelight-19.04.3.tar.xz) = 660700
+TIMESTAMP = 1565555769
+SHA256 (KDE/applications/19.08.0/filelight-19.08.0.tar.xz) = bdd3d32f6666b3d2fa4c614f5f058571c8849484e1ba17a97996680503f8e8e6
+SIZE (KDE/applications/19.08.0/filelight-19.08.0.tar.xz) = 660584
diff --git a/sysutils/filelight/pkg-plist b/sysutils/filelight/pkg-plist
index f6a5fd8f29b1..4441291db2ff 100644
--- a/sysutils/filelight/pkg-plist
+++ b/sysutils/filelight/pkg-plist
@@ -1,5 +1,5 @@
 bin/filelight
-etc/xdg/filelight.categories
+share/qlogging-categories5/filelight.categories
 etc/xdg/filelightrc
 share/applications/org.kde.filelight.desktop
 share/icons/hicolor/128x128/apps/filelight.png
diff --git a/sysutils/flowgger/Makefile b/sysutils/flowgger/Makefile
index ed91f8f11595..b4feafa4156c 100644
--- a/sysutils/flowgger/Makefile
+++ b/sysutils/flowgger/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	flowgger
 DISTVERSION=	0.2.6-28
 DISTVERSIONSUFFIX=	-gab572a0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	sysutils
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index a3691438eed5..a91f5e20ba39 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -1,4 +1,3 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 CATEGORIES=	sysutils lang
diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile
index 58bfb7dcbf3a..51a5831b80c2 100644
--- a/sysutils/fpc-users/Makefile
+++ b/sysutils/fpc-users/Makefile
@@ -1,4 +1,3 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 CATEGORIES=	sysutils lang
diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 3ce9dc760efb..de9b877da4df 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -1,4 +1,3 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 CATEGORIES=	sysutils lang
diff --git a/sysutils/frand/Makefile b/sysutils/frand/Makefile
new file mode 100644
index 000000000000..9bd7e8a0a6bf
--- /dev/null
+++ b/sysutils/frand/Makefile
@@ -0,0 +1,26 @@
+# $FreeBSD$
+
+PORTNAME=	frand
+PORTVERSION=	0.1
+DISTVERSIONPREFIX=	v
+PORTREVISION=	1
+CATEGORIES=	sysutils
+
+MAINTAINER=	serpent7776@gmail.com
+COMMENT=	Selects a random file using reservoir sampling algorithm
+
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs
+
+USES=		cmake
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	serpent7776
+GH_PROJECT=	frand StreamSampler:StreamSampler
+GH_TAGNAME=	919a0f1ba6bb3ae63b4708722e9a7d49164ca92d:StreamSampler
+GH_ACCOUNT_StreamSampler=	LiorKogan
+GH_SUBDIR_StreamSampler=	lib/StreamSampler
+
+.include <bsd.port.mk>
diff --git a/sysutils/frand/distinfo b/sysutils/frand/distinfo
new file mode 100644
index 000000000000..8295bf2a88d5
--- /dev/null
+++ b/sysutils/frand/distinfo
@@ -0,0 +1,5 @@
+TIMESTAMP = 1564056505
+SHA256 (serpent7776-frand-v0.1_GH0.tar.gz) = 62a114ad80443b8e3fffa56ca3182e4e7294d1a3ba4b92cdb4e1cbe625794389
+SIZE (serpent7776-frand-v0.1_GH0.tar.gz) = 2225
+SHA256 (LiorKogan-StreamSampler-919a0f1ba6bb3ae63b4708722e9a7d49164ca92d_GH0.tar.gz) = 654ac0c0c0f161ef40c4d3fd4632d71cdf59c9cbe1108b47ba44b7f9f10f1d73
+SIZE (LiorKogan-StreamSampler-919a0f1ba6bb3ae63b4708722e9a7d49164ca92d_GH0.tar.gz) = 36890
diff --git a/sysutils/frand/pkg-descr b/sysutils/frand/pkg-descr
new file mode 100644
index 000000000000..42917ce9aad0
--- /dev/null
+++ b/sysutils/frand/pkg-descr
@@ -0,0 +1,5 @@
+Selects a random file from given directory using reservoir sampling algorithm.
+This means directory contents doesn't need to be read in memory and then sorted
+and so will perform much better than find+sort for big directories.
+
+WWW: https://github.com/serpent7776/frand
diff --git a/sysutils/frand/pkg-plist b/sysutils/frand/pkg-plist
new file mode 100644
index 000000000000..fb35bbe24eef
--- /dev/null
+++ b/sysutils/frand/pkg-plist
@@ -0,0 +1 @@
+bin/frand
diff --git a/sysutils/freefilesync/Makefile b/sysutils/freefilesync/Makefile
index 8a9eb40565d8..f182dc8136e0 100644
--- a/sysutils/freefilesync/Makefile
+++ b/sysutils/freefilesync/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	freefilesync
 DISTVERSION=	9.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 MASTER_SITES=	https://www.freefilesync.org/download/ \
 		https://www.freefilesync.org/archive/
diff --git a/sysutils/freeipmi/Makefile b/sysutils/freeipmi/Makefile
index 0a6c573d34b4..4f474a547a7d 100644
--- a/sysutils/freeipmi/Makefile
+++ b/sysutils/freeipmi/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	freeipmi
-PORTVERSION=	1.6.3
-PORTREVISION=	1
+PORTVERSION=	1.6.4
 CATEGORIES=	sysutils
 MASTER_SITES=	GNU
 
diff --git a/sysutils/freeipmi/distinfo b/sysutils/freeipmi/distinfo
index c2a32469c4d6..11a1fdec079d 100644
--- a/sysutils/freeipmi/distinfo
+++ b/sysutils/freeipmi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1548498505
-SHA256 (freeipmi-1.6.3.tar.gz) = aad4e735a7ac4a1f8ade20caadb35dfefc2a352fa2ef41d3f6e589179917e1e9
-SIZE (freeipmi-1.6.3.tar.gz) = 3414736
+TIMESTAMP = 1566486919
+SHA256 (freeipmi-1.6.4.tar.gz) = 65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c
+SIZE (freeipmi-1.6.4.tar.gz) = 3415832
diff --git a/sysutils/freeipmi/pkg-plist b/sysutils/freeipmi/pkg-plist
index e0896c0a4c07..77fdc420a5e0 100644
--- a/sysutils/freeipmi/pkg-plist
+++ b/sysutils/freeipmi/pkg-plist
@@ -254,7 +254,7 @@ include/ipmidetect.h
 lib/libfreeipmi.a
 lib/libfreeipmi.so
 lib/libfreeipmi.so.17
-lib/libfreeipmi.so.17.2.2
+lib/libfreeipmi.so.17.2.3
 lib/libipmiconsole.a
 lib/libipmiconsole.so
 lib/libipmiconsole.so.2
diff --git a/sysutils/fusefs-sandboxfs/Makefile b/sysutils/fusefs-sandboxfs/Makefile
index 2563bbe1b1bf..6e8cd3c351bf 100644
--- a/sysutils/fusefs-sandboxfs/Makefile
+++ b/sysutils/fusefs-sandboxfs/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	sandboxfs
 DISTVERSIONPREFIX=	sandboxfs-
 DISTVERSION=	0.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-
 
diff --git a/sysutils/fusefs-smbnetfs/Makefile b/sysutils/fusefs-smbnetfs/Makefile
index f5496db2fbfc..444a77236b5f 100644
--- a/sysutils/fusefs-smbnetfs/Makefile
+++ b/sysutils/fusefs-smbnetfs/Makefile
@@ -22,7 +22,7 @@ LIBSECRET_LIB_DEPENDS=	libsecret-*.so:security/libsecret
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 
-USES=		fuse iconv pkgconfig samba:lib tar:bzip2
+USES=		compiler:c11 fuse iconv pkgconfig samba:lib tar:bzip2
 USE_GNOME=	glib20:build
 
 GNU_CONFIGURE=	yes
diff --git a/sysutils/glogg/Makefile b/sysutils/glogg/Makefile
index 7bfc3032dc67..cfd2e1589e4c 100644
--- a/sysutils/glogg/Makefile
+++ b/sysutils/glogg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	glogg
 DISTVERSION=	1.1.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	http://glogg.bonnefon.org/files/
 
diff --git a/sysutils/grub2/Makefile b/sysutils/grub2/Makefile
deleted file mode 100644
index 946b1023d2ec..000000000000
--- a/sysutils/grub2/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Created by: sem@FreeBSD.org
-# $FreeBSD$
-
-PORTNAME=	grub2
-PORTVERSION=	2.00
-PORTREVISION=	14
-CATEGORIES=	sysutils
-MASTER_SITES=	GNU/grub
-DISTNAME=	grub-${PORTVERSION}
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Multiboot boot loader
-
-LICENSE=	GPLv3
-
-BROKEN_i386=	uses amd64 assembly
-DEPRECATED=	Unmaintained (more than five years), not updated (one-and-a-half years), does not build with modern compilers	# PR232961
-EXPIRATION_DATE=2019-02-04
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex \
-		gsed:textproc/gsed \
-		help2man:misc/help2man
-RUN_DEPENDS=	gsed:textproc/gsed
-
-USES=		autoreconf bison cpe gettext gmake tar:xz
-USE_GCC=	7	# Fails to build with GCC 8, cf. PR 232961, or clang
-
-GNU_CONFIGURE=	yes
-INFO=		grub grub-dev
-MAKE_JOBS_UNSAFE=	yes
-SSP_UNSAFE=	yes
-
-CPE_PRODUCT=	grub
-CPE_VENDOR=	gnu
-
-CONFIGURE_ARGS=	--disable-werror --localedir=${PREFIX}/share/locale
-CONFIGURE_ENV=	CPP="${CC} -E" \
-		LEX=${LOCALBASE}/bin/flex
-
-OPTIONS_DEFINE=	MKFONT FUSE
-OPTIONS_SUB=	yes
-MKFONT_DESC=	Build grub-mkfont (require freetype2)
-FUSE_DESC=	Build grub-mount (require FUSE)
-
-MKFONT_CONFIGURE_ENABLE=	grub-mkfont
-MKFONT_LIB_DEPENDS=		libfreetype.so:print/freetype2
-MKFONT_BUILD_DEPENDS=		${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf:x11-fonts/dejavu
-
-FUSE_CONFIGURE_ENABLE=		grub-mount
-FUSE_LIB_DEPENDS=		libfuse.so:sysutils/fusefs-libs
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != amd64
-PLIST_SUB+=	EFIEMU="@comment "
-.else
-PLIST_SUB+=	EFIEMU=""
-.endif
-
-post-patch:
-	@${LN} -s ${LOCALBASE}/share/fonts/dejavu/DejaVuSans.ttf ${WRKSRC}
-	@${TOUCH} -t 200001010000 ${WRKSRC}/Makefile.util.def
-	@${REINPLACE_CMD} -e '/[^auU]sed/ s,sed,gsed,g' ${WRKSRC}/util/grub.d/*.in \
-		${WRKSRC}/util/*.in ${WRKSRC}/util/i386/efi/grub-dumpdevtree \
-		${WRKSRC}/util/bash-completion.d/grub-completion.bash.in
-
-post-configure:
-	@${LN} -sfh /usr/include/machine /usr/include/sys /usr/include/x86 \
-		${WRKSRC}/grub-core
-
-.include <bsd.port.post.mk>
diff --git a/sysutils/grub2/distinfo b/sysutils/grub2/distinfo
deleted file mode 100644
index 4a33ea0f9b4d..000000000000
--- a/sysutils/grub2/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (grub-2.00.tar.xz) = 784ec38e7edc32239ad75b8e66df04dc8bfb26d88681bc9f627133a6eb85c458
-SIZE (grub-2.00.tar.xz) = 5136412
diff --git a/sysutils/grub2/files/patch-Makefile.util.am b/sysutils/grub2/files/patch-Makefile.util.am
deleted file mode 100644
index a1f25fe7287e..000000000000
--- a/sysutils/grub2/files/patch-Makefile.util.am
+++ /dev/null
@@ -1,254 +0,0 @@
---- Makefile.util.am.orig
-+++ Makefile.util.am
-@@ -185,7 +185,7 @@ endif
- 
- if COND_emu
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -197,7 +197,7 @@ endif
- 
- if COND_i386_pc
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -209,7 +209,7 @@ endif
- 
- if COND_i386_efi
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -221,7 +221,7 @@ endif
- 
- if COND_i386_qemu
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -233,7 +233,7 @@ endif
- 
- if COND_i386_coreboot
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -245,7 +245,7 @@ endif
- 
- if COND_i386_multiboot
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -257,7 +257,7 @@ endif
- 
- if COND_i386_ieee1275
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -269,7 +269,7 @@ endif
- 
- if COND_x86_64_efi
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -281,7 +281,7 @@ endif
- 
- if COND_mips_loongson
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -293,7 +293,7 @@ endif
- 
- if COND_sparc64_ieee1275
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -305,7 +305,7 @@ endif
- 
- if COND_powerpc_ieee1275
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -317,7 +317,7 @@ endif
- 
- if COND_mips_arc
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -329,7 +329,7 @@ endif
- 
- if COND_ia64_efi
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -341,7 +341,7 @@ endif
- 
- if COND_mips_qemu_mips
- noinst_LIBRARIES += libgrubmods.a
--libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
-+libgrubmods_a_SOURCES += grub-core/commands/blocklist.c grub-core/commands/xnu_uuid.c grub-core/commands/testload.c grub-core/commands/ls.c grub-core/disk/dmraid_nvidia.c grub-core/disk/loopback.c grub-core/disk/lvm.c grub-core/disk/mdraid_linux.c grub-core/disk/mdraid_linux_be.c grub-core/disk/mdraid1x_linux.c grub-core/disk/raid5_recover.c grub-core/disk/raid6_recover.c grub-core/fs/affs.c grub-core/fs/afs.c grub-core/fs/bfs.c grub-core/fs/btrfs.c grub-core/fs/cpio.c grub-core/fs/cpio_be.c grub-core/fs/odc.c grub-core/fs/newc.c grub-core/fs/ext2.c grub-core/fs/fat.c grub-core/fs/exfat.c grub-core/fs/fshelp.c grub-core/fs/hfs.c grub-core/fs/hfsplus.c grub-core/fs/iso9660.c grub-core/fs/jfs.c grub-core/fs/minix.c grub-core/fs/minix2.c grub-core/fs/minix3.c grub-core/fs/minix_be.c grub-core/fs/minix2_be.c grub-core/fs/minix3_be.c grub-core/fs/nilfs2.c grub-core/fs/ntfs.c grub-core/fs/ntfscomp.c grub-core/fs/reiserfs.c grub-core/fs/romfs.c grub-core/fs/sfs.c grub-core/fs/squash4.c grub-core/fs/tar.c grub-core/fs/udf.c grub-core/fs/ufs2.c grub-core/fs/ufs.c grub-core/fs/xfs.c grub-core/fs/zfs/zfscrypt.c grub-core/fs/zfs/zfs.c grub-core/fs/zfs/zfsinfo.c grub-core/fs/zfs/zfs_lzjb.c grub-core/fs/zfs/zfs_lz4.c grub-core/fs/zfs/zfs_sha256.c grub-core/fs/zfs/zfs_fletcher.c grub-core/lib/envblk.c grub-core/lib/hexdump.c grub-core/lib/LzFind.c grub-core/lib/LzmaEnc.c grub-core/lib/crc.c grub-core/lib/adler32.c grub-core/lib/crc64.c grub-core/normal/datetime.c grub-core/normal/misc.c grub-core/partmap/acorn.c grub-core/partmap/amiga.c grub-core/partmap/apple.c grub-core/partmap/msdos.c grub-core/partmap/sun.c grub-core/partmap/plan.c grub-core/partmap/dvh.c grub-core/partmap/sunpc.c grub-core/partmap/bsdlabel.c grub-core/script/function.c grub-core/script/lexer.c grub-core/script/main.c grub-core/script/script.c grub-core/script/argv.c grub-core/io/gzio.c grub-core/io/lzopio.c grub-core/kern/ia64/dl_helper.c grub-core/lib/minilzo/minilzo.c grub-core/lib/xzembed/xz_dec_bcj.c grub-core/lib/xzembed/xz_dec_lzma2.c grub-core/lib/xzembed/xz_dec_stream.c 
- nodist_libgrubmods_a_SOURCES += grub_script.tab.c grub_script.yy.c libgrub_a_init.c grub_script.yy.h grub_script.tab.h 
- libgrubmods_a_CFLAGS += $(AM_CFLAGS) $(CFLAGS_LIBRARY) $(CFLAGS_POSIX) -Wno-undef -Wno-error=missing-noreturn 
- libgrubmods_a_CPPFLAGS += $(AM_CPPFLAGS) $(CPPFLAGS_LIBRARY) -I$(top_srcdir)/grub-core/lib/minilzo -I$(srcdir)/grub-core/lib/xzembed -DMINILZO_HAVE_CONFIG_H 
-@@ -3361,7 +3361,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3386,7 +3386,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3411,7 +3411,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3436,7 +3436,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3461,7 +3461,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3486,7 +3486,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3511,7 +3511,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3536,7 +3536,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3561,7 +3561,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3586,7 +3586,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3611,7 +3611,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3636,7 +3636,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3661,7 +3661,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
-@@ -3686,7 +3686,7 @@ CLEANFILES += grub-mount.1
- endif
- grub_mount_SOURCES  = util/grub-mount.c grub-core/kern/emu/hostfs.c grub-core/disk/host.c 
- nodist_grub_mount_SOURCES  = grub_fstest_init.c 
--grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse 
-+grub_mount_LDADD  = libgrubmods.a libgrubgcry.a libgrubkern.a grub-core/gnulib/libgnu.a $(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse 
- grub_mount_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_PROGRAM) 
- grub_mount_LDFLAGS  = $(AM_LDFLAGS) $(LDFLAGS_PROGRAM) 
- grub_mount_CPPFLAGS  = $(AM_CPPFLAGS) $(CPPFLAGS_PROGRAM) 
diff --git a/sysutils/grub2/files/patch-Makefile.util.def b/sysutils/grub2/files/patch-Makefile.util.def
deleted file mode 100644
index 2264895e0369..000000000000
--- a/sysutils/grub2/files/patch-Makefile.util.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.util.def.orig
-+++ Makefile.util.def
-@@ -266,7 +266,7 @@ program = {
-   ldadd = libgrubgcry.a;
-   ldadd = libgrubkern.a;
-   ldadd = grub-core/gnulib/libgnu.a;
--  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) -lfuse';
-+  ldadd = '$(LIBINTL) $(LIBDEVMAPPER) $(LIBZFS) $(LIBNVPAIR) $(LIBGEOM) -lfuse';
-   condition = COND_GRUB_MOUNT;
- };
- 
diff --git a/sysutils/grub2/files/patch-build-aux_test-driver b/sysutils/grub2/files/patch-build-aux_test-driver
deleted file mode 100644
index eded40e2bd77..000000000000
--- a/sysutils/grub2/files/patch-build-aux_test-driver
+++ /dev/null
@@ -1,130 +0,0 @@
---- build-aux/test-driver.o	2013-07-29 08:36:33.775875020 -0400
-+++ build-aux/test-driver	2013-07-29 08:35:04.085870311 -0400
-@@ -0,0 +1,127 @@
-+#! /bin/sh
-+# test-driver - basic testsuite driver script.
-+
-+scriptversion=2012-06-27.10; # UTC
-+
-+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake@gnu.org> or send patches to
-+# <automake-patches@gnu.org>.
-+
-+# Make unconditional expansion of undefined variables an error.  This
-+# helps a lot in preventing typo-related bugs.
-+set -u
-+
-+usage_error ()
-+{
-+  echo "$0: $*" >&2
-+  print_usage >&2
-+  exit 2
-+}
-+
-+print_usage ()
-+{
-+  cat <<END
-+Usage:
-+  test-driver --test-name=NAME --log-file=PATH --trs-file=PATH
-+              [--expect-failure={yes|no}] [--color-tests={yes|no}]
-+              [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT
-+The '--test-name', '--log-file' and '--trs-file' options are mandatory.
-+END
-+}
-+
-+# TODO: better error handling in option parsing (in particular, ensure
-+# TODO: $log_file, $trs_file and $test_name are defined).
-+test_name= # Used for reporting.
-+log_file=  # Where to save the output of the test script.
-+trs_file=  # Where to save the metadata of the test run.
-+expect_failure=no
-+color_tests=no
-+enable_hard_errors=yes
-+while test $# -gt 0; do
-+  case $1 in
-+  --help) print_usage; exit $?;;
-+  --version) echo "test-driver $scriptversion"; exit $?;;
-+  --test-name) test_name=$2; shift;;
-+  --log-file) log_file=$2; shift;;
-+  --trs-file) trs_file=$2; shift;;
-+  --color-tests) color_tests=$2; shift;;
-+  --expect-failure) expect_failure=$2; shift;;
-+  --enable-hard-errors) enable_hard_errors=$2; shift;;
-+  --) shift; break;;
-+  -*) usage_error "invalid option: '$1'";;
-+  esac
-+  shift
-+done
-+
-+if test $color_tests = yes; then
-+  # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'.
-+  red='[0;31m' # Red.
-+  grn='[0;32m' # Green.
-+  lgn='[1;32m' # Light green.
-+  blu='[1;34m' # Blue.
-+  mgn='[0;35m' # Magenta.
-+  std='[m'     # No color.
-+else
-+  red= grn= lgn= blu= mgn= std=
-+fi
-+
-+do_exit='rm -f $log_file $trs_file; (exit $st); exit $st'
-+trap "st=129; $do_exit" 1
-+trap "st=130; $do_exit" 2
-+trap "st=141; $do_exit" 13
-+trap "st=143; $do_exit" 15
-+
-+# Test script is run here.
-+"$@" >$log_file 2>&1
-+estatus=$?
-+if test $enable_hard_errors = no && test $estatus -eq 99; then
-+  estatus=1
-+fi
-+
-+case $estatus:$expect_failure in
-+  0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
-+  0:*)   col=$grn res=PASS  recheck=no  gcopy=no;;
-+  77:*)  col=$blu res=SKIP  recheck=no  gcopy=yes;;
-+  99:*)  col=$mgn res=ERROR recheck=yes gcopy=yes;;
-+  *:yes) col=$lgn res=XFAIL recheck=no  gcopy=yes;;
-+  *:*)   col=$red res=FAIL  recheck=yes gcopy=yes;;
-+esac
-+
-+# Report outcome to console.
-+echo "${col}${res}${std}: $test_name"
-+
-+# Register the test result, and other relevant metadata.
-+echo ":test-result: $res" > $trs_file
-+echo ":global-test-result: $res" >> $trs_file
-+echo ":recheck: $recheck" >> $trs_file
-+echo ":copy-in-global-log: $gcopy" >> $trs_file
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
diff --git a/sysutils/grub2/files/patch-configure.ac b/sysutils/grub2/files/patch-configure.ac
deleted file mode 100644
index 68eaf337834d..000000000000
--- a/sysutils/grub2/files/patch-configure.ac
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.ac.orig
-+++ configure.ac
-@@ -1044,19 +1044,19 @@ fi
- 
- if test x"$libzfs_excuse" = x ; then
-   # Only check for system headers if libzfs support has not been disabled.
--  AC_CHECK_HEADERS(libzfs.h libnvpair.h)
-+  AC_CHECK_HEADERS(libzfs.h libnvpair.h, [], [], [typedef int boolean_t;])
- fi
- 
- if test x"$libzfs_excuse" = x ; then
-   AC_CHECK_LIB([zfs], [libzfs_init],
-                [],
--               [libzfs_excuse="need zfs library"])
-+               [libzfs_excuse="need zfs library"], [-lavl -lnvpair -luutil -lm])
- fi
- 
- if test x"$libzfs_excuse" = x ; then
-   AC_CHECK_LIB([nvpair], [nvlist_print],
-                [],
--               [libzfs_excuse="need nvpair library"])
-+               [libzfs_excuse="need nvpair library"], [-lavl -lnvpair -luutil -lm])
- fi
- 
- if test x"$enable_libzfs" = xyes && test x"$libzfs_excuse" != x ; then
-@@ -1069,6 +1069,9 @@ if test x"$libzfs_excuse" = x ; then
-   AC_DEFINE([HAVE_LIBZFS], [1],
-             [Define to 1 if you have the ZFS library.])
-   LIBNVPAIR="-lnvpair"
-+  if test x$host_kernel = xkfreebsd; then
-+    LIBNVPAIR="$LIBNVPAIR -lavl -luutil -lm"
-+  fi
-   AC_DEFINE([HAVE_LIBNVPAIR], [1],
-             [Define to 1 if you have the NVPAIR library.])
- fi
diff --git a/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support b/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support
deleted file mode 100644
index ac1f474b2bd9..000000000000
--- a/sysutils/grub2/files/patch-grub-2.00-zfs-feature-flag-support
+++ /dev/null
@@ -1,894 +0,0 @@
-From
-
-	http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-boot/grub/files/grub-2.00-zfs-feature-flag-support-r1.patch
-
-ZFS Feature Flag Support
-
-This is a monolithic version of the following commits:
-
-https://github.com/maxximino/grub2/commit/31a32560fd7948ae5ff5c63105d7c068de7890c8
-https://github.com/maxximino/grub2/commit/595d76e8ca0690a963f5533689de8db54ef07e75
-https://github.com/maxximino/grub2/commit/58344034e40218b20500fa2936eb4d7d019e1e88
-https://github.com/maxximino/grub2/commit/f98cb078abab2c14bb0766b5a0ceb055683dab81
-https://github.com/maxximino/grub2/commit/f12806f43a969a654dee7bb89b2e8fd5c42f0e2e
-
-A change was made to account for d8a0feb6 from upstream. This change prevents a
-compile time failure that is caused by a change in the callback interface used
-by mzap_interate(). Modifications to nvlist_find_value() were reverted to
-resolve Gentoo bug #462740. This eliminated the need for the new nvpair_type()
-and nvpair_value() functions. They have been removed to silence a compiler
-warning and reduce the size of the patch. Further adjustments were made to
-silence the following warnings:
-
-/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs_lz4.c:77:5:
-warning: "__STDC_VERSION__" is not defined [-Wundef]
-/var/tmp/portage/sys-boot/grub-2.00-r2/work/grub-2.00/grub-core/fs/zfs/zfs.c:4079:3:
-warning: passing argument 4 of 'mzap_iterate' from incompatible pointer type
-[enabled by default]
-
-The initial feature flag support patches were written by Delphix while the LZ4
-support was written by Saso Kiselkov. The work porting this to GRUB2 was done
-by Massimo Maggi, while the adaption to Gentoo's GRUB2 package was done by
-Richard Yao.
-
-diff --git a/Makefile.util.def b/Makefile.util.def
-index b80187c..1bf3038 100644
---- Makefile.util.def
-+++ Makefile.util.def
-@@ -95,6 +95,7 @@ library = {
-   common = grub-core/fs/zfs/zfs.c;
-   common = grub-core/fs/zfs/zfsinfo.c;
-   common = grub-core/fs/zfs/zfs_lzjb.c;
-+  common = grub-core/fs/zfs/zfs_lz4.c;
-   common = grub-core/fs/zfs/zfs_sha256.c;
-   common = grub-core/fs/zfs/zfs_fletcher.c;
-   common = grub-core/lib/envblk.c;
-diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 39e77a4..1550b90 100644
---- grub-core/Makefile.core.def
-+++ grub-core/Makefile.core.def
-@@ -1186,6 +1186,7 @@ module = {
-   name = zfs;
-   common = fs/zfs/zfs.c;
-   common = fs/zfs/zfs_lzjb.c;
-+  common = fs/zfs/zfs_lz4.c;
-   common = fs/zfs/zfs_sha256.c;
-   common = fs/zfs/zfs_fletcher.c;
- };
-diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index ba0554a..811e3df 100644
---- grub-core/fs/zfs/zfs.c
-+++ grub-core/fs/zfs/zfs.c
-@@ -2,6 +2,7 @@
-  *  GRUB  --  GRand Unified Bootloader
-  *  Copyright (C) 1999,2000,2001,2002,2003,2004,2009,2010,2011  Free Software Foundation, Inc.
-  *  Copyright 2010  Sun Microsystems, Inc.
-+ *  Copyright (c) 2012 by Delphix. All rights reserved.
-  *
-  *  GRUB is free software; you can redistribute it and/or modify
-  *  it under the terms of the GNU General Public License as published by
-@@ -153,11 +154,13 @@ ZAP_LEAF_ENTRY(zap_leaf_phys_t *l, int bs, int idx)
- 
- 
- /*
-- * Decompression Entry - lzjb
-+ * Decompression Entry - lzjb & lz4
-  */
- 
- extern grub_err_t lzjb_decompress (void *, void *, grub_size_t, grub_size_t);
- 
-+extern grub_err_t lz4_decompress (void *, void *, grub_size_t, grub_size_t);
-+
- typedef grub_err_t zfs_decomp_func_t (void *s_start, void *d_start,
- 				      grub_size_t s_len, grub_size_t d_len);
- typedef struct decomp_entry
-@@ -263,6 +266,19 @@ grub_crypto_cipher_handle_t (*grub_zfs_load_key) (const struct grub_zfs_key *key
- 						  grub_size_t keysize,
- 						  grub_uint64_t salt,
- 						  grub_uint64_t algo) = NULL;
-+/*
-+ * List of pool features that the grub implementation of ZFS supports for
-+ * read. Note that features that are only required for write do not need
-+ * to be listed here since grub opens pools in read-only mode.
-+ */
-+static const char *spa_feature_names[] = {
-+	"org.illumos:lz4_compress","com.delphix:hole_birth",NULL
-+};
-+
-+static int NESTED_FUNC_ATTR
-+check_feature(const char *name, grub_uint64_t val);
-+static int
-+check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data );
- 
- static grub_err_t 
- zlib_decompress (void *s, void *d,
-@@ -322,6 +338,7 @@ static decomp_entry_t decomp_table[ZIO_COMPRESS_FUNCTIONS] = {
-   {"gzip-8", zlib_decompress},  /* ZIO_COMPRESS_GZIP8 */
-   {"gzip-9", zlib_decompress},  /* ZIO_COMPRESS_GZIP9 */
-   {"zle", zle_decompress},      /* ZIO_COMPRESS_ZLE   */
-+  {"lz4", lz4_decompress},      /* ZIO_COMPRESS_LZ4   */
- };
- 
- static grub_err_t zio_read_data (blkptr_t * bp, grub_zfs_endian_t endian,
-@@ -482,15 +499,11 @@ uberblock_verify (uberblock_phys_t * ub, grub_uint64_t offset,
- 
-   if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_LITTLE_ENDIAN)
-       == UBERBLOCK_MAGIC
--      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN) > 0 
--      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)
--      <= SPA_VERSION)
--    endian = GRUB_ZFS_LITTLE_ENDIAN;
-+      && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_LITTLE_ENDIAN)))
-+     endian = GRUB_ZFS_LITTLE_ENDIAN;
- 
-   if (grub_zfs_to_cpu64 (uber->ub_magic, GRUB_ZFS_BIG_ENDIAN) == UBERBLOCK_MAGIC
--      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN) > 0 
--      && grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)
--      <= SPA_VERSION)
-+      && SPA_VERSION_IS_SUPPORTED(grub_zfs_to_cpu64 (uber->ub_version, GRUB_ZFS_BIG_ENDIAN)))
-     endian = GRUB_ZFS_BIG_ENDIAN;
- 
-   if (endian == GRUB_ZFS_UNKNOWN_ENDIAN)
-@@ -764,6 +777,99 @@ fill_vdev_info (struct grub_zfs_data *data,
- }
- 
- /*
-+ * For a given XDR packed nvlist, verify the first 4 bytes and move on.
-+ *
-+ * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
-+ *
-+ *      encoding method/host endian     (4 bytes)
-+ *      nvl_version                     (4 bytes)
-+ *      nvl_nvflag                      (4 bytes)
-+ *	encoded nvpairs:
-+ *		encoded size of the nvpair      (4 bytes)
-+ *		decoded size of the nvpair      (4 bytes)
-+ *		name string size                (4 bytes)
-+ *		name string data                (sizeof(NV_ALIGN4(string))
-+ *		data type                       (4 bytes)
-+ *		# of elements in the nvpair     (4 bytes)
-+ *		data
-+ *      2 zero's for the last nvpair
-+ *		(end of the entire list)	(8 bytes)
-+ *
-+ */
-+
-+/*
-+ * The nvlist_next_nvpair() function returns a handle to the next nvpair in the
-+ * list following nvpair. If nvpair is NULL, the first pair is returned. If
-+ * nvpair is the last pair in the nvlist, NULL is returned.
-+ */
-+static const char *
-+nvlist_next_nvpair(const char *nvl, const char *nvpair)
-+{
-+	const char *nvp;
-+	int encode_size;
-+	int name_len;
-+	if (nvl == NULL)
-+		return (NULL);
-+
-+	if (nvpair == NULL) {
-+		/* skip over header, nvl_version and nvl_nvflag */
-+		nvpair = nvl + 4 * 3;
-+	} else {
-+		/* skip to the next nvpair */
-+		encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
-+		nvpair += encode_size;
-+	}
-+	/* 8 bytes of 0 marks the end of the list */
-+	if (*(grub_uint64_t*)nvpair == 0)
-+		return (NULL);
-+	/*consistency checks*/
-+	if (nvpair + 4 * 3 >= nvl + VDEV_PHYS_SIZE)
-+	{
-+	  grub_dprintf ("zfs", "nvlist overflow\n");
-+	  grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
-+	  return (NULL);
-+	}
-+	encode_size = grub_be_to_cpu32 (grub_get_unaligned32(nvpair));
-+
-+	nvp = nvpair + 4*2;
-+	name_len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
-+	nvp += 4;
-+
-+	nvp = nvp + ((name_len + 3) & ~3); // align 
-+	if (nvp + 4 >= nvl + VDEV_PHYS_SIZE                        
-+	    || encode_size < 0
-+	    || nvp + 4 + encode_size > nvl + VDEV_PHYS_SIZE)       
-+	{
-+	  grub_dprintf ("zfs", "nvlist overflow\n");
-+	  grub_error (GRUB_ERR_BAD_FS, "incorrect nvlist");
-+	  return (NULL);
-+	}
-+	 /* end consistency checks */
-+
-+	return (nvpair);
-+}
-+/*
-+ * This function returns 0 on success and 1 on failure. On success, a string
-+ * containing the name of nvpair is saved in buf.
-+ */
-+static int
-+nvpair_name(const char *nvp, char **buf, int* buflen)
-+{
-+	int len;
-+
-+	/* skip over encode/decode size */
-+	nvp += 4 * 2;
-+
-+	len = grub_be_to_cpu32 (grub_get_unaligned32 (nvp));
-+	nvp=nvp+4;
-+	
-+	*buf=(char*)nvp;
-+	*buflen=len;
-+
-+	return (0);
-+}
-+
-+/*
-  * Check the disk label information and retrieve needed vdev name-value pairs.
-  *
-  */
-@@ -773,7 +879,7 @@ check_pool_label (struct grub_zfs_data *data,
- 		  int *inserted)
- {
-   grub_uint64_t pool_state, txg = 0;
--  char *nvlist;
-+  char *nvlist,*features;
- #if 0
-   char *nv;
- #endif
-@@ -837,13 +943,13 @@ check_pool_label (struct grub_zfs_data *data,
-     }
-   grub_dprintf ("zfs", "check 8 passed\n");
- 
--  if (version > SPA_VERSION)
-+  if (!SPA_VERSION_IS_SUPPORTED(version))
-     {
-       grub_free (nvlist);
-       return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
- 			 "too new version %llu > %llu",
- 			 (unsigned long long) version,
--			 (unsigned long long) SPA_VERSION);
-+			 (unsigned long long) SPA_VERSION_BEFORE_FEATURES);
-     }
-   grub_dprintf ("zfs", "check 9 passed\n");
- 
-@@ -893,7 +999,30 @@ check_pool_label (struct grub_zfs_data *data,
-     grub_free (nv);
-   }
-   grub_dprintf ("zfs", "check 10 passed\n");
--
-+  if ((features=grub_zfs_nvlist_lookup_nvlist(nvlist, ZPOOL_CONFIG_FEATURES_FOR_READ)))
-+  {
-+    const char *nvp=NULL;
-+    char *name = grub_zalloc(51);
-+    char *nameptr;
-+    int namelen;
-+    while ((nvp = nvlist_next_nvpair(features, nvp)) != NULL)
-+    {
-+      nvpair_name(nvp, &nameptr,&namelen);
-+      if(namelen > 50){namelen=50;}
-+      grub_strncpy(name,nameptr,namelen);
-+      name[namelen]=0;
-+      grub_dprintf("zfs","namelen=%u str=%s\n",namelen,name);
-+      if (check_feature(name,1) != 0)
-+      {
-+	grub_dprintf("zfs","feature missing in check_pool_label:%s\n",name);
-+	err= grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET," check_pool_label missing feature '%s' for read",name);
-+	grub_free(name);
-+	return err;
-+      }
-+    }
-+    grub_free(name);
-+  }
-+  grub_dprintf ("zfs", "check 12 passed (feature flags)\n");
-   grub_free (nvlist);
- 
-   return GRUB_ERR_NONE;
-@@ -3034,27 +3163,6 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
-   return err;
- }
- 
--/*
-- * For a given XDR packed nvlist, verify the first 4 bytes and move on.
-- *
-- * An XDR packed nvlist is encoded as (comments from nvs_xdr_create) :
-- *
-- *      encoding method/host endian     (4 bytes)
-- *      nvl_version                     (4 bytes)
-- *      nvl_nvflag                      (4 bytes)
-- *	encoded nvpairs:
-- *		encoded size of the nvpair      (4 bytes)
-- *		decoded size of the nvpair      (4 bytes)
-- *		name string size                (4 bytes)
-- *		name string data                (sizeof(NV_ALIGN4(string))
-- *		data type                       (4 bytes)
-- *		# of elements in the nvpair     (4 bytes)
-- *		data
-- *      2 zero's for the last nvpair
-- *		(end of the entire list)	(8 bytes)
-- *
-- */
--
- static int
- nvlist_find_value (const char *nvlist_in, const char *name,
- 		   int valtype, char **val,
-@@ -3386,6 +3494,10 @@ zfs_mount (grub_device_t dev)
-       return NULL;
-     }
- 
-+    if (ub->ub_version >= SPA_VERSION_FEATURES &&
-+	check_mos_features(&((objset_phys_t *) osp)->os_meta_dnode,ub_endian, data) != 0)
-+	  return NULL;
-+	
-   /* Got the MOS. Save it at the memory addr MOS. */
-   grub_memmove (&(data->mos.dn), &((objset_phys_t *) osp)->os_meta_dnode,
- 		DNODE_SIZE);
-@@ -3910,6 +4022,64 @@ grub_zfs_dir (grub_device_t device, const char *path,
-   return grub_errno;
- }
- 
-+static int NESTED_FUNC_ATTR
-+check_feature(const char *name, grub_uint64_t val)
-+{
-+  int i;
-+  if(val ==0) return 0;
-+  if(*name==0) return 0;
-+  for (i = 0; spa_feature_names[i] != NULL; i++) 
-+  {
-+    if (grub_strcmp(name, spa_feature_names[i]) == 0) 
-+        return 0;
-+  }
-+  grub_printf("missing feature for read '%s'\n",name);
-+  return 1;
-+}
-+
-+/*
-+ * Checks whether the MOS features that are active are supported by this
-+ * (GRUB's) implementation of ZFS.
-+ *
-+ * Return:
-+ *	0: Success.
-+ *	errnum: Failure.
-+ */
-+	    	   
-+static int
-+check_mos_features(dnode_phys_t *mosmdn_phys,grub_zfs_endian_t endian,struct grub_zfs_data* data )
-+{
-+  grub_uint64_t objnum;
-+  grub_uint8_t errnum = 0;
-+  dnode_end_t dn,mosmdn;
-+  mzap_phys_t* mzp;
-+  grub_zfs_endian_t endianzap;
-+  int size;
-+  grub_memmove(&(mosmdn.dn),mosmdn_phys,sizeof(dnode_phys_t));
-+  mosmdn.endian=endian;
-+  if ((errnum = dnode_get(&mosmdn, DMU_POOL_DIRECTORY_OBJECT,
-+	  DMU_OT_OBJECT_DIRECTORY, &dn,data)) != 0)
-+      return (errnum);
-+
-+  /*
-+   * Find the object number for 'features_for_read' and retrieve its
-+   * corresponding dnode. Note that we don't check features_for_write
-+   * because GRUB is not opening the pool for write.
-+   */
-+  if ((errnum = zap_lookup(&dn, DMU_POOL_FEATURES_FOR_READ, &objnum, data,0)) != 0)
-+      return (errnum);
-+  
-+  if ((errnum = dnode_get(&mosmdn, objnum, DMU_OTN_ZAP_METADATA, &dn, data)) != 0)
-+      return (errnum);
-+
-+  if ((errnum = dmu_read(&dn, 0, (void**)&mzp, &endianzap,data)) != 0)
-+      return (errnum);
-+
-+  size = grub_zfs_to_cpu16 (dn.dn.dn_datablkszsec, dn.endian) << SPA_MINBLOCKSHIFT;
-+  return (mzap_iterate(mzp,endianzap, size, check_feature));
-+}
-+
-+
- #ifdef GRUB_UTIL
- static grub_err_t
- grub_zfs_embed (grub_device_t device __attribute__ ((unused)),
-diff --git a/grub-core/fs/zfs/zfs_lz4.c b/grub-core/fs/zfs/zfs_lz4.c
-new file mode 100644
-index 0000000..ff85a77
---- /dev/null
-+++ grub-core/fs/zfs/zfs_lz4.c
-@@ -0,0 +1,318 @@
-+/*
-+ * LZ4 - Fast LZ compression algorithm
-+ * Header File
-+ * Copyright (C) 2011-2013, Yann Collet.
-+ * BSD 2-Clause License (http://www.opensource.org/licenses/bsd-license.php)
-+ *
-+ * Redistribution and use in source and binary forms, with or without
-+ * modification, are permitted provided that the following conditions are
-+ * met:
-+ *
-+ *     * Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *     * Redistributions in binary form must reproduce the above
-+ * copyright notice, this list of conditions and the following disclaimer
-+ * in the documentation and/or other materials provided with the
-+ * distribution.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+ *
-+ * You can contact the author at :
-+ * - LZ4 homepage : http://fastcompression.blogspot.com/p/lz4.html
-+ * - LZ4 source repository : http://code.google.com/p/lz4/
-+ */
-+
-+#include <sys/endian.h>
-+#include <grub/err.h>
-+#include <grub/mm.h>
-+#include <grub/misc.h>
-+#include <grub/types.h>
-+
-+static int LZ4_uncompress_unknownOutputSize(const char *source, char *dest,
-+					    int isize, int maxOutputSize);
-+
-+/*
-+ * CPU Feature Detection
-+ */
-+
-+/* 32 or 64 bits ? */
-+#if (defined(__x86_64__) || defined(__x86_64) || defined(__amd64__) || \
-+	defined(__amd64) || defined(__ppc64__) || defined(_WIN64) || \
-+	defined(__LP64__) || defined(_LP64))
-+#define	LZ4_ARCH64	1
-+#else
-+#define	LZ4_ARCH64	0
-+#endif
-+
-+/*
-+ * Little Endian or Big Endian?
-+ * Note: overwrite the below #define if you know your architecture endianess.
-+ */
-+#if BYTE_ORDER == BIG_ENDIAN
-+#define	LZ4_BIG_ENDIAN	1
-+#else
-+	/*
-+	 * Little Endian assumed. PDP Endian and other very rare endian format
-+	 * are unsupported.
-+	 */
-+#endif
-+
-+/*
-+ * Compiler Options
-+ */
-+
-+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L	/* C99 */
-+/* "restrict" is a known keyword */
-+#else
-+/* Disable restrict */
-+#ifndef restrict
-+#define	restrict /* Only if somebody already didn't take care of that.*/
-+#endif
-+#endif
-+
-+#define	GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
-+
-+#define	lz4_bswap16(x) ((unsigned short int) ((((x) >> 8) & 0xffu) \
-+	| (((x) & 0xffu) << 8)))
-+
-+#if (GCC_VERSION >= 302) || (__INTEL_COMPILER >= 800) || defined(__clang__)
-+#define	expect(expr, value)    (__builtin_expect((expr), (value)))
-+#else
-+#define	expect(expr, value)    (expr)
-+#endif
-+
-+#define	likely(expr)	expect((expr) != 0, 1)
-+#define	unlikely(expr)	expect((expr) != 0, 0)
-+
-+/* Basic types */
-+#define	BYTE	grub_uint8_t
-+#define	U16	grub_uint16_t
-+#define	U32	grub_uint32_t
-+#define	S32	grub_int32_t
-+#define	U64	grub_uint64_t
-+typedef grub_size_t size_t;
-+
-+typedef struct _U16_S {
-+	U16 v;
-+} U16_S;
-+typedef struct _U32_S {
-+	U32 v;
-+} U32_S;
-+typedef struct _U64_S {
-+	U64 v;
-+} U64_S;
-+
-+#define	A64(x)	(((U64_S *)(x))->v)
-+#define	A32(x)	(((U32_S *)(x))->v)
-+#define	A16(x)	(((U16_S *)(x))->v)
-+
-+/*
-+ * Constants
-+ */
-+#define	MINMATCH 4
-+
-+#define	COPYLENGTH 8
-+#define	LASTLITERALS 5
-+
-+#define	ML_BITS 4
-+#define	ML_MASK ((1U<<ML_BITS)-1)
-+#define	RUN_BITS (8-ML_BITS)
-+#define	RUN_MASK ((1U<<RUN_BITS)-1)
-+
-+/*
-+ * Architecture-specific macros
-+ */
-+#if LZ4_ARCH64
-+#define	STEPSIZE 8
-+#define	UARCH U64
-+#define	AARCH A64
-+#define	LZ4_COPYSTEP(s, d)	A64(d) = A64(s); d += 8; s += 8;
-+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d)
-+#define	LZ4_SECURECOPY(s, d, e)	if (d < e) LZ4_WILDCOPY(s, d, e)
-+#define	HTYPE U32
-+#define	INITBASE(base)		const BYTE* const base = ip
-+#else
-+#define	STEPSIZE 4
-+#define	UARCH U32
-+#define	AARCH A32
-+#define	LZ4_COPYSTEP(s, d)	A32(d) = A32(s); d += 4; s += 4;
-+#define	LZ4_COPYPACKET(s, d)	LZ4_COPYSTEP(s, d); LZ4_COPYSTEP(s, d);
-+#define	LZ4_SECURECOPY		LZ4_WILDCOPY
-+#define	HTYPE const BYTE*
-+#define	INITBASE(base)		const int base = 0
-+#endif
-+
-+#if (defined(LZ4_BIG_ENDIAN) && !defined(BIG_ENDIAN_NATIVE_BUT_INCOMPATIBLE))
-+#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) \
-+	{ U16 v = A16(p); v = lz4_bswap16(v); d = (s) - v; }
-+#define	LZ4_WRITE_LITTLEENDIAN_16(p, i) \
-+	{ U16 v = (U16)(i); v = lz4_bswap16(v); A16(p) = v; p += 2; }
-+#else
-+#define	LZ4_READ_LITTLEENDIAN_16(d, s, p) { d = (s) - A16(p); }
-+#define	LZ4_WRITE_LITTLEENDIAN_16(p, v)  { A16(p) = v; p += 2; }
-+#endif
-+
-+/* Macros */
-+#define	LZ4_WILDCOPY(s, d, e) do { LZ4_COPYPACKET(s, d) } while (d < e);
-+
-+/* Decompression functions */
-+grub_err_t
-+lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len);
-+
-+grub_err_t
-+lz4_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len)
-+{
-+	const BYTE *src = s_start;
-+	U32 bufsiz = (src[0] << 24) | (src[1] << 16) | (src[2] << 8) |
-+	    src[3];
-+
-+	/* invalid compressed buffer size encoded at start */
-+	if (bufsiz + 4 > s_len)
-+		return grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed.");
-+
-+	/*
-+	 * Returns 0 on success (decompression function returned non-negative)
-+	 * and appropriate error on failure (decompression function returned negative).
-+	 */
-+	return (LZ4_uncompress_unknownOutputSize((char*)s_start + 4, d_start, bufsiz,
-+	    d_len) < 0)?grub_error(GRUB_ERR_BAD_FS,"lz4 decompression failed."):0;
-+}
-+
-+static int
-+LZ4_uncompress_unknownOutputSize(const char *source,
-+    char *dest, int isize, int maxOutputSize)
-+{
-+	/* Local Variables */
-+	const BYTE *restrict ip = (const BYTE *) source;
-+	const BYTE *const iend = ip + isize;
-+	const BYTE *restrict ref;
-+
-+	BYTE *restrict op = (BYTE *) dest;
-+	BYTE *const oend = op + maxOutputSize;
-+	BYTE *cpy;
-+
-+	size_t dec[] = { 0, 3, 2, 3, 0, 0, 0, 0 };
-+
-+	/* Main Loop */
-+	while (ip < iend) {
-+		BYTE token;
-+		int length;
-+
-+		/* get runlength */
-+		token = *ip++;
-+		if ((length = (token >> ML_BITS)) == RUN_MASK) {
-+			int s = 255;
-+			while ((ip < iend) && (s == 255)) {
-+				s = *ip++;
-+				length += s;
-+			}
-+		}
-+		/* copy literals */
-+		cpy = op + length;
-+		if ((cpy > oend - COPYLENGTH) ||
-+		    (ip + length > iend - COPYLENGTH)) {
-+			if (cpy > oend)
-+				/*
-+				 * Error: request to write beyond destination
-+				 * buffer.
-+				 */
-+				goto _output_error;
-+			if (ip + length > iend)
-+				/*
-+				 * Error : request to read beyond source
-+				 * buffer.
-+				 */
-+				goto _output_error;
-+			grub_memcpy(op, ip, length);
-+			op += length;
-+			ip += length;
-+			if (ip < iend)
-+				/* Error : LZ4 format violation */
-+				goto _output_error;
-+			/* Necessarily EOF, due to parsing restrictions. */
-+			break;
-+		}
-+		LZ4_WILDCOPY(ip, op, cpy);
-+		ip -= (op - cpy);
-+		op = cpy;
-+
-+		/* get offset */
-+		LZ4_READ_LITTLEENDIAN_16(ref, cpy, ip);
-+		ip += 2;
-+		if (ref < (BYTE * const) dest)
-+			/*
-+			 * Error: offset creates reference outside of
-+			 * destination buffer.
-+			 */
-+			goto _output_error;
-+
-+		/* get matchlength */
-+		if ((length = (token & ML_MASK)) == ML_MASK) {
-+			while (ip < iend) {
-+				int s = *ip++;
-+				length += s;
-+				if (s == 255)
-+					continue;
-+				break;
-+			}
-+		}
-+		/* copy repeated sequence */
-+		if unlikely(op - ref < STEPSIZE) {
-+#if LZ4_ARCH64
-+			size_t dec2table[] = { 0, 0, 0, -1, 0, 1, 2, 3 };
-+			size_t dec2 = dec2table[op - ref];
-+#else
-+			const int dec2 = 0;
-+#endif
-+			*op++ = *ref++;
-+			*op++ = *ref++;
-+			*op++ = *ref++;
-+			*op++ = *ref++;
-+			ref -= dec[op - ref];
-+			A32(op) = A32(ref);
-+			op += STEPSIZE - 4;
-+			ref -= dec2;
-+		} else {
-+			LZ4_COPYSTEP(ref, op);
-+		}
-+		cpy = op + length - (STEPSIZE - 4);
-+		if (cpy > oend - COPYLENGTH) {
-+			if (cpy > oend)
-+				/*
-+				 * Error: request to write outside of
-+				 * destination buffer.
-+				 */
-+				goto _output_error;
-+			LZ4_SECURECOPY(ref, op, (oend - COPYLENGTH));
-+			while (op < cpy)
-+				*op++ = *ref++;
-+			op = cpy;
-+			if (op == oend)
-+				/*
-+				 * Check EOF (should never happen, since last
-+				 * 5 bytes are supposed to be literals).
-+				 */
-+				break;
-+			continue;
-+		}
-+		LZ4_SECURECOPY(ref, op, cpy);
-+		op = cpy;	/* correction */
-+	}
-+
-+	/* end of decoding */
-+	return (int)(((char *)op) - dest);
-+
-+	/* write overflow error detected */
-+	_output_error:
-+	return (int)(-(((char *)ip) - source));
-+}
-diff --git a/grub-core/fs/zfs/zfsinfo.c b/grub-core/fs/zfs/zfsinfo.c
-index fdb587a..c96bf21 100644
---- grub-core/fs/zfs/zfsinfo.c
-+++ grub-core/fs/zfs/zfsinfo.c
-@@ -132,21 +132,31 @@ print_vdev_info (char *nvlist, int tab)
-       grub_free (path);
-       return GRUB_ERR_NONE;
-     }
-+  char is_mirror=(grub_strcmp(type,VDEV_TYPE_MIRROR) == 0);
-+  char is_raidz=(grub_strcmp(type,VDEV_TYPE_RAIDZ) == 0);
- 
--  if (grub_strcmp (type, VDEV_TYPE_MIRROR) == 0)
-+  if (is_mirror || is_raidz)
-     {
-       int nelm, i;
- 
-       nelm = grub_zfs_nvlist_lookup_nvlist_array_get_nelm
- 	(nvlist, ZPOOL_CONFIG_CHILDREN);
- 
-+      if(is_mirror){
-+	 grub_puts_ (N_("This VDEV is a mirror"));
-+      }
-+      else if(is_raidz){
-+	 grub_uint64_t parity;
-+	 grub_zfs_nvlist_lookup_uint64(nvlist,"nparity",&parity);
-+	 grub_printf_ (N_("This VDEV is a RAIDZ%llu\n"),(unsigned long long)parity);
-+      }
-       print_tabs (tab);
-       if (nelm <= 0)
- 	{
--	  grub_puts_ (N_("Incorrect mirror"));
-+	  grub_puts_ (N_("Incorrect VDEV"));
- 	  return GRUB_ERR_NONE;
- 	}
--      grub_printf_ (N_("Mirror with %d children\n"), nelm);
-+      grub_printf_ (N_("VDEV with %d children\n"), nelm);
-       print_state (nvlist, tab);
-       for (i = 0; i < nelm; i++)
- 	{
-@@ -162,14 +172,14 @@ print_vdev_info (char *nvlist, int tab)
- 		 total element number. And the number itself is fine,
- 		 only the element isn't.
- 	      */
--	      grub_printf_ (N_("Mirror element number %d isn't correct\n"), i);
-+	      grub_printf_ (N_("VDEV element number %d isn't correct\n"), i);
- 	      continue;
- 	    }
- 
- 	  /* TRANSLATORS: it's the element carying the number %d, not
- 	     total element number. This is used in enumeration
- 	     "Element number 1", "Element number 2", ... */
--	  grub_printf_ (N_("Mirror element number %d:\n"), i);
-+	  grub_printf_ (N_("VDEV element number %d:\n"), i);
- 	  print_vdev_info (child, tab + 1);
- 
- 	  grub_free (child);
-diff --git a/include/grub/zfs/dmu.h b/include/grub/zfs/dmu.h
-index 8fc6dc5..4ad616c 100644
---- include/grub/zfs/dmu.h
-+++ include/grub/zfs/dmu.h
-@@ -22,6 +22,39 @@
- 
- #ifndef	_SYS_DMU_H
- #define	_SYS_DMU_H
-+#define	B_FALSE	0
-+#define	B_TRUE	1
-+
-+#define	DMU_OT_NEWTYPE 0x80
-+#define	DMU_OT_METADATA 0x40
-+#define	DMU_OT_BYTESWAP_MASK 0x3f
-+
-+#define	DMU_OT(byteswap, metadata) \
-+	(DMU_OT_NEWTYPE | \
-+	((metadata) ? DMU_OT_METADATA : 0) | \
-+	((byteswap) & DMU_OT_BYTESWAP_MASK))
-+
-+#define	DMU_OT_IS_VALID(ot) (((ot) & DMU_OT_NEWTYPE) ? \
-+	((ot) & DMU_OT_BYTESWAP_MASK) < DMU_BSWAP_NUMFUNCS : \
-+	(ot) < DMU_OT_NUMTYPES)
-+
-+#define	DMU_OT_IS_METADATA(ot) (((ot) & DMU_OT_NEWTYPE) ? \
-+	((ot) & DMU_OT_METADATA) : \
-+	dmu_ot[(ot)].ot_metadata)
-+
-+typedef enum dmu_object_byteswap {
-+	DMU_BSWAP_UINT8,
-+	DMU_BSWAP_UINT16,
-+	DMU_BSWAP_UINT32,
-+	DMU_BSWAP_UINT64,
-+	DMU_BSWAP_ZAP,
-+	DMU_BSWAP_DNODE,
-+	DMU_BSWAP_OBJSET,
-+	DMU_BSWAP_ZNODE,
-+	DMU_BSWAP_OLDACL,
-+	DMU_BSWAP_ACL,
-+	DMU_BSWAP_NUMFUNCS
-+} dmu_object_byteswap_t;
- 
- /*
-  * This file describes the interface that the DMU provides for its
-@@ -89,7 +122,17 @@ typedef enum dmu_object_type {
- 	DMU_OT_SA_ATTR_REGISTRATION,	/* ZAP */
- 	DMU_OT_SA_ATTR_LAYOUTS,		/* ZAP */
- 	DMU_OT_DSL_KEYCHAIN = 54,
--	DMU_OT_NUMTYPES
-+	DMU_OT_NUMTYPES,
-+	DMU_OTN_UINT8_DATA = DMU_OT(DMU_BSWAP_UINT8, B_FALSE),
-+	DMU_OTN_UINT8_METADATA = DMU_OT(DMU_BSWAP_UINT8, B_TRUE),
-+	DMU_OTN_UINT16_DATA = DMU_OT(DMU_BSWAP_UINT16, B_FALSE),
-+	DMU_OTN_UINT16_METADATA = DMU_OT(DMU_BSWAP_UINT16, B_TRUE),
-+	DMU_OTN_UINT32_DATA = DMU_OT(DMU_BSWAP_UINT32, B_FALSE),
-+	DMU_OTN_UINT32_METADATA = DMU_OT(DMU_BSWAP_UINT32, B_TRUE),
-+	DMU_OTN_UINT64_DATA = DMU_OT(DMU_BSWAP_UINT64, B_FALSE),
-+	DMU_OTN_UINT64_METADATA = DMU_OT(DMU_BSWAP_UINT64, B_TRUE),
-+	DMU_OTN_ZAP_DATA = DMU_OT(DMU_BSWAP_ZAP, B_FALSE),
-+	DMU_OTN_ZAP_METADATA = DMU_OT(DMU_BSWAP_ZAP, B_TRUE),
- } dmu_object_type_t;
- 
- typedef enum dmu_objset_type {
-@@ -116,5 +159,6 @@ typedef enum dmu_objset_type {
- #define	DMU_POOL_HISTORY		"history"
- #define	DMU_POOL_PROPS			"pool_props"
- #define	DMU_POOL_L2CACHE		"l2cache"
-+#define	DMU_POOL_FEATURES_FOR_READ	"features_for_read"
- 
- #endif	/* _SYS_DMU_H */
-diff --git a/include/grub/zfs/zfs.h b/include/grub/zfs/zfs.h
-index e326c8b..761ade7 100644
---- include/grub/zfs/zfs.h
-+++ include/grub/zfs/zfs.h
-@@ -36,8 +36,13 @@ typedef enum grub_zfs_endian
- /*
-  * On-disk version number.
-  */
--#define	SPA_VERSION			33ULL
--
-+#define	SPA_VERSION_INITIAL		1ULL
-+#define	SPA_VERSION_BEFORE_FEATURES	33ULL
-+#define	SPA_VERSION			5000ULL
-+#define	SPA_VERSION_FEATURES		5000ULL
-+#define	SPA_VERSION_IS_SUPPORTED(v) \
-+	(((v) >= SPA_VERSION_INITIAL && (v) <= SPA_VERSION_BEFORE_FEATURES) || \
-+	((v) >= SPA_VERSION_FEATURES && (v) <= SPA_VERSION))
- /*
-  * The following are configuration names used in the nvlist describing a pool's
-  * configuration.
-@@ -76,6 +81,7 @@ typedef enum grub_zfs_endian
- #define	ZPOOL_CONFIG_DDT_HISTOGRAM	"ddt_histogram"
- #define	ZPOOL_CONFIG_DDT_OBJ_STATS	"ddt_object_stats"
- #define	ZPOOL_CONFIG_DDT_STATS		"ddt_stats"
-+#define	ZPOOL_CONFIG_FEATURES_FOR_READ	"features_for_read"
- /*
-  * The persistent vdev state is stored as separate values rather than a single
-  * 'vdev_state' entry.  This is because a device can be in multiple states, such
-diff --git a/include/grub/zfs/zio.h b/include/grub/zfs/zio.h
-index b1c46da..8fad2cc 100644
---- include/grub/zfs/zio.h
-+++ include/grub/zfs/zio.h
-@@ -88,6 +88,7 @@ enum zio_compress {
- 	ZIO_COMPRESS_GZIP8,
- 	ZIO_COMPRESS_GZIP9,
- 	ZIO_COMPRESS_ZLE,
-+	ZIO_COMPRESS_LZ4,
- 	ZIO_COMPRESS_FUNCTIONS
- };
- 
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 987b37a..c55d9e3 100644
---- po/POTFILES.in
-+++ po/POTFILES.in
-@@ -173,6 +173,7 @@
- ./grub-core/fs/zfs/zfs_fletcher.c
- ./grub-core/fs/zfs/zfsinfo.c
- ./grub-core/fs/zfs/zfs_lzjb.c
-+./grub-core/fs/zfs/zfs_lz4.c
- ./grub-core/fs/zfs/zfs_sha256.c
- ./grub-core/gdb/cstub.c
- ./grub-core/gdb/gdb.c
diff --git a/sysutils/grub2/files/patch-grub-core-Makefile.core.am b/sysutils/grub2/files/patch-grub-core-Makefile.core.am
deleted file mode 100644
index dc47a1b80232..000000000000
--- a/sysutils/grub2/files/patch-grub-core-Makefile.core.am
+++ /dev/null
@@ -1,128 +0,0 @@
---- grub-core/Makefile.core.am.orig
-+++ grub-core/Makefile.core.am
-@@ -32004,7 +32004,7 @@ endif
- if COND_emu
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32026,7 +32026,7 @@ endif
- if COND_i386_pc
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32048,7 +32048,7 @@ endif
- if COND_i386_efi
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32070,7 +32070,7 @@ endif
- if COND_i386_qemu
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32092,7 +32092,7 @@ endif
- if COND_i386_coreboot
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32114,7 +32114,7 @@ endif
- if COND_i386_multiboot
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32136,7 +32136,7 @@ endif
- if COND_i386_ieee1275
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32158,7 +32158,7 @@ endif
- if COND_x86_64_efi
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32180,7 +32180,7 @@ endif
- if COND_mips_loongson
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32202,7 +32202,7 @@ endif
- if COND_sparc64_ieee1275
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32224,7 +32224,7 @@ endif
- if COND_powerpc_ieee1275
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32246,7 +32246,7 @@ endif
- if COND_mips_arc
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32268,7 +32268,7 @@ endif
- if COND_ia64_efi
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
-@@ -32290,7 +32290,7 @@ endif
- if COND_mips_qemu_mips
- platform_PROGRAMS += zfs.module
- MODULE_FILES += zfs.module$(EXEEXT)
--zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
-+zfs_module_SOURCES  = fs/zfs/zfs.c fs/zfs/zfs_lzjb.c fs/zfs/zfs_lz4.c fs/zfs/zfs_sha256.c fs/zfs/zfs_fletcher.c  ## platform sources
- nodist_zfs_module_SOURCES  =  ## platform nodist sources
- zfs_module_LDADD  = 
- zfs_module_CFLAGS  = $(AM_CFLAGS) $(CFLAGS_MODULE) 
diff --git a/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am b/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am
deleted file mode 100644
index 317d167d3a04..000000000000
--- a/sysutils/grub2/files/patch-grub-core-gnulib-Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
---- grub-core/gnulib/Makefile.am.orig
-+++ grub-core/gnulib/Makefile.am
-@@ -404,13 +404,13 @@ all-local: charset.alias ref-add.sed ref
- 
- charset_alias = $(DESTDIR)$(libdir)/charset.alias
- charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
--install-exec-local: install-exec-localcharset
-+install-exec-local: 
- install-exec-localcharset: all-local
- 	if test $(GLIBC21) = no; then \
- 	  case '$(host_os)' in \
- 	    darwin[56]*) \
- 	      need_charset_alias=true ;; \
--	    darwin* | cygwin* | mingw* | pw32* | cegcc*) \
-+	    darwin* | cygwin* | mingw* | pw32* | cegcc* | freebsd*) \
- 	      need_charset_alias=false ;; \
- 	    *) \
- 	      need_charset_alias=true ;; \
diff --git a/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c b/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c
deleted file mode 100644
index eef0392ba099..000000000000
--- a/sysutils/grub2/files/patch-grub-core-gnulib-argp-fmtstream.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- grub-core/gnulib/argp-fmtstream.c.orig
-+++ grub-core/gnulib/argp-fmtstream.c
-@@ -47,7 +47,11 @@
- #endif
- 
- #define INIT_BUF_SIZE 200
-+#ifdef __FreeBSD__
-+#define PRINTF_SIZE_GUESS 32767
-+#else
- #define PRINTF_SIZE_GUESS 150
-+#endif
- 
- /* Return an argp_fmtstream that outputs to STREAM, and which prefixes lines
-    written on it with LMARGIN spaces and limits them to RMARGIN columns
diff --git a/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c b/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c
deleted file mode 100644
index ffcce6ad138a..000000000000
--- a/sysutils/grub2/files/patch-grub-core-loader-i386-bsd.c
+++ /dev/null
@@ -1,49 +0,0 @@
-=== modified file 'grub-core/loader/i386/bsd.c'
---- grub-core/loader/i386/bsd.c	2012-06-07 14:41:52 +0000
-+++ grub-core/loader/i386/bsd.c	2012-07-21 17:44:45 +0000
-@@ -1309,7 +1309,7 @@
-       && phdr->p_type != PT_DYNAMIC)
-       return 0;
- 
--  paddr = phdr->p_paddr & 0xFFFFFF;
-+  paddr = phdr->p_paddr & 0xFFFFFFF;
- 
-   if (paddr < kern_start)
-     kern_start = paddr;
-@@ -1333,7 +1333,7 @@
-     }
- 
-   *do_load = 1;
--  phdr->p_paddr &= 0xFFFFFF;
-+  phdr->p_paddr &= 0xFFFFFFF;
-   paddr = phdr->p_paddr;
- 
-   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
-@@ -1351,7 +1351,7 @@
-       && phdr->p_type != PT_DYNAMIC)
-     return 0;
- 
--  paddr = phdr->p_paddr & 0xffffff;
-+  paddr = phdr->p_paddr & 0xfffffff;
- 
-   if (paddr < kern_start)
-     kern_start = paddr;
-@@ -1375,7 +1375,7 @@
-     }
- 
-   *do_load = 1;
--  paddr = phdr->p_paddr & 0xffffff;
-+  paddr = phdr->p_paddr & 0xfffffff;
- 
-   *addr = (grub_addr_t) (paddr - kern_start + (grub_uint8_t *) kern_chunk_src);
- 
-@@ -1394,7 +1394,7 @@
-     {
-       grub_relocator_chunk_t ch;
- 
--      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFF;
-+      entry = elf->ehdr.ehdr32.e_entry & 0xFFFFFFF;
-       err = grub_elf32_phdr_iterate (elf, filename,
- 				     grub_bsd_elf32_size_hook, NULL);
-       if (err)
-
diff --git a/sysutils/grub2/files/patch-include-grub-util-libzfs.h b/sysutils/grub2/files/patch-include-grub-util-libzfs.h
deleted file mode 100644
index 87a1fe667df1..000000000000
--- a/sysutils/grub2/files/patch-include-grub-util-libzfs.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- include/grub/util/libzfs.h.orig
-+++ include/grub/util/libzfs.h
-@@ -22,6 +22,9 @@
- #include <config.h>
- 
- #ifdef HAVE_LIBZFS_H
-+#ifdef __FreeBSD__
-+typedef int boolean_t;
-+#endif
- #include <libzfs.h>
- #else /* ! HAVE_LIBZFS_H */
- 
diff --git a/sysutils/grub2/files/patch-util-grub-mkfont.c b/sysutils/grub2/files/patch-util-grub-mkfont.c
deleted file mode 100644
index 36ed69c1f538..000000000000
--- a/sysutils/grub2/files/patch-util-grub-mkfont.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- util/grub-mkfont.c.orig
-+++ util/grub-mkfont.c
-@@ -39,7 +39,7 @@
- #include FT_FREETYPE_H
- #include FT_TRUETYPE_TAGS_H
- #include FT_TRUETYPE_TABLES_H
--#include <freetype/ftsynth.h>
-+#include FT_SYNTHESIS_H
- 
- #undef __FTERRORS_H__
- #define FT_ERROR_START_LIST   const char *ft_errmsgs[] = { 
-
-
diff --git a/sysutils/grub2/files/patch-util_grub-install.in b/sysutils/grub2/files/patch-util_grub-install.in
deleted file mode 100644
index b357b4c74797..000000000000
--- a/sysutils/grub2/files/patch-util_grub-install.in
+++ /dev/null
@@ -1,72 +0,0 @@
---- util/grub-install.in.orig	2012-06-26 21:31:03.000000000 +0000
-+++ util/grub-install.in
-@@ -107,6 +107,8 @@ usage () {
-     print_option_help "--recheck" "$(gettext "delete device map if it already exists")"
-     print_option_help "--force" "$(gettext "install even if problems are detected")"
-     print_option_help "--force-file-id" "$(gettext "use identifier file even if UUID is available")"
-+    print_option_help "--force-label" "$(gettext "use filesystem label even if UUID is available")"
-+
-     print_option_help "--disk-module=$(gettext "MODULE")" "$(gettext "disk module to use (biosdisk or native). This option is only available on BIOS target.")"
-     print_option_help "--no-nvram" "$(gettext "don't update the \`boot-device' NVRAM variable. This option is only available on IEEE1275 targets.")"
-     print_option_help  "--removable" "$(gettext "the installation device is removable. This option is only available on EFI.")"
-@@ -159,6 +161,9 @@ do
-     --force-file-id)
- 	force_file_id=y ;;
- 
-+    --force-label)
-+	force_fs_label=y ;;
-+
- # Accept and ignore for compatibility
-     --font)
-         shift;;
-@@ -585,7 +590,7 @@ fi
- partmap_module=
- for x in `echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=partmap --device 2> /dev/null`; do
-    case "$x" in
--       netbsd | openbsd) 
-+       netbsd | openbsd | freebsd )
- 	   partmap_module="$partmap_module part_bsd";;
-        "") ;;
-        *)
-@@ -593,6 +598,11 @@ for x in `echo "${grub_device}" | xargs 
-    esac
- done
- 
-+case `uname -o` in 
-+    FreeBSD)
-+	    partmap_module="$partmap_module part_msdos part_bsd";;
-+esac
-+
- # Device abstraction module, if any (lvm, raid).
- devabstraction_module="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=abstraction --device`"
- 
-@@ -668,16 +678,28 @@ if [ "x${devabstraction_module}" = "x" ]
- 	    echo 1>&2
- 	    hints=
-         fi
-+
-+	if [ x"$force_fs_label" = xy ]; then
-+            fs_label="`echo "${grub_device}" | xargs "$grub_probe" --device-map="${device_map}" --target=fs_label --device`"
-+	fi
-+
-+	if [ x"$fs_label" != x ]; then
-+            echo "search.fs_label ${fs_label} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
-+	    search_module=search_label
-+	else
-+
- 	if [ x"$uuid" != x ]; then
-             echo "search.fs_uuid ${uuid} root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
- 	    search_module=search_fs_uuid
- 	else
- 	    mkdir -p "${grubdir}/uuid"
--	    file="`mktemp "${grubdir}/uuid/XXXXXXXXXXXXXXXXXXXXXXXXX"`"
-+	    file="`mktemp "${grubdir}/uuid/XXXX-XXXX-XXXX"`"
- 	    relfile="`${grub_mkrelpath} "$file"`"
-             echo "search.file '${relfile}' root $hints " >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
- 	    search_module=search_fs_file
- 	fi
-+	fi
-+
- 	echo 'set prefix=($root)'"$(echo "${relative_grubdir}" | sed "s,\\([ \"'\\\\]\\),\\\\\\1,g")" >> "${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
- 	config_opt_file="${grubdir}/${grub_modinfo_target_cpu}-$grub_modinfo_platform/load.cfg"
-         modules="$modules $search_module"
diff --git a/sysutils/grub2/pkg-descr b/sysutils/grub2/pkg-descr
deleted file mode 100644
index 417ef8a1e1c0..000000000000
--- a/sysutils/grub2/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-GNU GRUB is a multiboot boot loader.  It was derived from GRUB, the GRand
-Unified Bootloader, which was originally designed and implemented by Erich
-Stefan Boleyn.
-
-This port does not install GRUB on the master boot record of your hard drive.
-To do this you will need to read the info page that is installed by the port.
-
-WWW: http://www.gnu.org/software/grub/
diff --git a/sysutils/grub2/pkg-message b/sysutils/grub2/pkg-message
deleted file mode 100644
index 81092db7f468..000000000000
--- a/sysutils/grub2/pkg-message
+++ /dev/null
@@ -1,15 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-To install GRUB on the master boot record of your hard drive
-use 'grub-install <drive-to-install>' command.
-
-A typical menu entry in /boot/grub/grub.cfg for FreeBSD:
-menuentry "FreeBSD" {
-	set root="(hd0,msdos1,bsd1)"
-	kfreebsd /boot/loader
-}
-Or use grub-mkconfig to create the config file.
-EOM
-}
-]
diff --git a/sysutils/grub2/pkg-plist b/sysutils/grub2/pkg-plist
deleted file mode 100644
index a626f5acd913..000000000000
--- a/sysutils/grub2/pkg-plist
+++ /dev/null
@@ -1,561 +0,0 @@
-%%FUSE%%bin/grub-mount
-%%FUSE%%man/man1/grub-mount.1.gz
-%%MKFONT%%bin/grub-mkfont
-%%MKFONT%%man/man1/grub-mkfont.1.gz
-%%MKFONT%%share/grub/themes/starfield/dejavu_10.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_12.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_bold_14.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_14.pf2
-%%MKFONT%%share/grub/themes/starfield/dejavu_16.pf2
-%%MKFONT%%share/grub/themes/starfield/blob_w.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_c.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_e.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_ne.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_n.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_nw.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_se.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_s.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_sw.png
-%%MKFONT%%share/grub/themes/starfield/boot_menu_w.png
-%%MKFONT%%share/grub/themes/starfield/slider_c.png
-%%MKFONT%%share/grub/themes/starfield/slider_n.png
-%%MKFONT%%share/grub/themes/starfield/slider_s.png
-%%MKFONT%%share/grub/themes/starfield/starfield.png
-%%MKFONT%%share/grub/themes/starfield/README
-%%MKFONT%%share/grub/themes/starfield/terminal_box_c.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_e.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_ne.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_n.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_nw.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_se.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_s.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_sw.png
-%%MKFONT%%share/grub/themes/starfield/terminal_box_w.png
-%%MKFONT%%share/grub/themes/starfield/theme.txt
-%%MKFONT%%share/grub/themes/starfield/COPYING.CC-BY-SA-3.0
-bin/grub-editenv
-bin/grub-fstest
-bin/grub-kbdcomp
-bin/grub-menulst2cfg
-bin/grub-mkimage
-bin/grub-mklayout
-bin/grub-mkpasswd-pbkdf2
-bin/grub-mkrelpath
-bin/grub-mkstandalone
-bin/grub-mkrescue
-bin/grub-script-check
-etc/grub.d/00_header
-etc/grub.d/30_os-prober
-etc/grub.d/40_custom
-etc/grub.d/41_custom
-etc/grub.d/10_kfreebsd
-etc/grub.d/README
-etc/bash_completion.d/grub
-lib/grub/i386-pc/acpi.mod
-lib/grub/i386-pc/acpi.module
-lib/grub/i386-pc/adler32.mod
-lib/grub/i386-pc/adler32.module
-lib/grub/i386-pc/affs.mod
-lib/grub/i386-pc/affs.module
-lib/grub/i386-pc/afs.mod
-lib/grub/i386-pc/afs.module
-lib/grub/i386-pc/ahci.mod
-lib/grub/i386-pc/ahci.module
-lib/grub/i386-pc/all_video.mod
-lib/grub/i386-pc/all_video.module
-lib/grub/i386-pc/aout.mod
-lib/grub/i386-pc/aout.module
-lib/grub/i386-pc/at_keyboard.mod
-lib/grub/i386-pc/at_keyboard.module
-lib/grub/i386-pc/ata.mod
-lib/grub/i386-pc/ata.module
-lib/grub/i386-pc/backtrace.mod
-lib/grub/i386-pc/backtrace.module
-lib/grub/i386-pc/bfs.mod
-lib/grub/i386-pc/bfs.module
-lib/grub/i386-pc/biosdisk.mod
-lib/grub/i386-pc/biosdisk.module
-lib/grub/i386-pc/bitmap.mod
-lib/grub/i386-pc/bitmap.module
-lib/grub/i386-pc/bitmap_scale.mod
-lib/grub/i386-pc/bitmap_scale.module
-lib/grub/i386-pc/blocklist.mod
-lib/grub/i386-pc/blocklist.module
-lib/grub/i386-pc/boot.image
-lib/grub/i386-pc/boot.img
-lib/grub/i386-pc/boot.mod
-lib/grub/i386-pc/boot.module
-lib/grub/i386-pc/bsd.mod
-lib/grub/i386-pc/bsd.module
-lib/grub/i386-pc/btrfs.mod
-lib/grub/i386-pc/btrfs.module
-lib/grub/i386-pc/bufio.mod
-lib/grub/i386-pc/bufio.module
-lib/grub/i386-pc/cat.mod
-lib/grub/i386-pc/cat.module
-lib/grub/i386-pc/cdboot.image
-lib/grub/i386-pc/cdboot.img
-lib/grub/i386-pc/chain.mod
-lib/grub/i386-pc/chain.module
-lib/grub/i386-pc/cmostest.mod
-lib/grub/i386-pc/cmostest.module
-lib/grub/i386-pc/cmp.mod
-lib/grub/i386-pc/cmp.module
-lib/grub/i386-pc/command.lst
-lib/grub/i386-pc/config.h
-lib/grub/i386-pc/configfile.mod
-lib/grub/i386-pc/configfile.module
-lib/grub/i386-pc/cpio.mod
-lib/grub/i386-pc/cpio.module
-lib/grub/i386-pc/cpio_be.mod
-lib/grub/i386-pc/cpio_be.module
-lib/grub/i386-pc/cpuid.mod
-lib/grub/i386-pc/cpuid.module
-lib/grub/i386-pc/crc64.mod
-lib/grub/i386-pc/crc64.module
-lib/grub/i386-pc/crypto.lst
-lib/grub/i386-pc/crypto.mod
-lib/grub/i386-pc/crypto.module
-lib/grub/i386-pc/cryptodisk.mod
-lib/grub/i386-pc/cryptodisk.module
-lib/grub/i386-pc/cs5536.mod
-lib/grub/i386-pc/cs5536.module
-lib/grub/i386-pc/date.mod
-lib/grub/i386-pc/date.module
-lib/grub/i386-pc/datehook.mod
-lib/grub/i386-pc/datehook.module
-lib/grub/i386-pc/datetime.mod
-lib/grub/i386-pc/datetime.module
-lib/grub/i386-pc/diskboot.image
-lib/grub/i386-pc/diskboot.img
-lib/grub/i386-pc/diskfilter.mod
-lib/grub/i386-pc/diskfilter.module
-lib/grub/i386-pc/dm_nv.mod
-lib/grub/i386-pc/dm_nv.module
-lib/grub/i386-pc/drivemap.mod
-lib/grub/i386-pc/drivemap.module
-lib/grub/i386-pc/echo.mod
-lib/grub/i386-pc/echo.module
-lib/grub/i386-pc/efiemu.mod
-lib/grub/i386-pc/efiemu.module
-%%EFIEMU%%lib/grub/i386-pc/efiemu32.o
-%%EFIEMU%%lib/grub/i386-pc/efiemu64.o
-lib/grub/i386-pc/ehci.mod
-lib/grub/i386-pc/ehci.module
-lib/grub/i386-pc/elf.mod
-lib/grub/i386-pc/elf.module
-lib/grub/i386-pc/exfat.mod
-lib/grub/i386-pc/exfat.module
-lib/grub/i386-pc/exfctest.mod
-lib/grub/i386-pc/exfctest.module
-lib/grub/i386-pc/ext2.mod
-lib/grub/i386-pc/ext2.module
-lib/grub/i386-pc/extcmd.mod
-lib/grub/i386-pc/extcmd.module
-lib/grub/i386-pc/fat.mod
-lib/grub/i386-pc/fat.module
-lib/grub/i386-pc/font.mod
-lib/grub/i386-pc/font.module
-lib/grub/i386-pc/freedos.mod
-lib/grub/i386-pc/freedos.module
-lib/grub/i386-pc/fs.lst
-lib/grub/i386-pc/fshelp.mod
-lib/grub/i386-pc/fshelp.module
-lib/grub/i386-pc/functional_test.mod
-lib/grub/i386-pc/functional_test.module
-lib/grub/i386-pc/gcry_arcfour.mod
-lib/grub/i386-pc/gcry_arcfour.module
-lib/grub/i386-pc/gcry_blowfish.mod
-lib/grub/i386-pc/gcry_blowfish.module
-lib/grub/i386-pc/gcry_camellia.mod
-lib/grub/i386-pc/gcry_camellia.module
-lib/grub/i386-pc/gcry_cast5.mod
-lib/grub/i386-pc/gcry_cast5.module
-lib/grub/i386-pc/gcry_crc.mod
-lib/grub/i386-pc/gcry_crc.module
-lib/grub/i386-pc/gcry_des.mod
-lib/grub/i386-pc/gcry_des.module
-lib/grub/i386-pc/gcry_md4.mod
-lib/grub/i386-pc/gcry_md4.module
-lib/grub/i386-pc/gcry_md5.mod
-lib/grub/i386-pc/gcry_md5.module
-lib/grub/i386-pc/gcry_rfc2268.mod
-lib/grub/i386-pc/gcry_rfc2268.module
-lib/grub/i386-pc/gcry_rijndael.mod
-lib/grub/i386-pc/gcry_rijndael.module
-lib/grub/i386-pc/gcry_rmd160.mod
-lib/grub/i386-pc/gcry_rmd160.module
-lib/grub/i386-pc/gcry_seed.mod
-lib/grub/i386-pc/gcry_seed.module
-lib/grub/i386-pc/gcry_serpent.mod
-lib/grub/i386-pc/gcry_serpent.module
-lib/grub/i386-pc/gcry_sha1.mod
-lib/grub/i386-pc/gcry_sha1.module
-lib/grub/i386-pc/gcry_sha256.mod
-lib/grub/i386-pc/gcry_sha256.module
-lib/grub/i386-pc/gcry_sha512.mod
-lib/grub/i386-pc/gcry_sha512.module
-lib/grub/i386-pc/gcry_tiger.mod
-lib/grub/i386-pc/gcry_tiger.module
-lib/grub/i386-pc/gcry_twofish.mod
-lib/grub/i386-pc/gcry_twofish.module
-lib/grub/i386-pc/gcry_whirlpool.mod
-lib/grub/i386-pc/gcry_whirlpool.module
-lib/grub/i386-pc/gdb.mod
-lib/grub/i386-pc/gdb.module
-lib/grub/i386-pc/gdb_grub
-lib/grub/i386-pc/geli.mod
-lib/grub/i386-pc/geli.module
-lib/grub/i386-pc/gettext.mod
-lib/grub/i386-pc/gettext.module
-lib/grub/i386-pc/gfxmenu.mod
-lib/grub/i386-pc/gfxmenu.module
-lib/grub/i386-pc/gfxterm.mod
-lib/grub/i386-pc/gfxterm.module
-lib/grub/i386-pc/gmodule.pl
-lib/grub/i386-pc/gptsync.mod
-lib/grub/i386-pc/gptsync.module
-lib/grub/i386-pc/gzio.mod
-lib/grub/i386-pc/gzio.module
-lib/grub/i386-pc/halt.mod
-lib/grub/i386-pc/halt.module
-lib/grub/i386-pc/hashsum.mod
-lib/grub/i386-pc/hashsum.module
-lib/grub/i386-pc/hdparm.mod
-lib/grub/i386-pc/hdparm.module
-lib/grub/i386-pc/hello.mod
-lib/grub/i386-pc/hello.module
-lib/grub/i386-pc/help.mod
-lib/grub/i386-pc/help.module
-lib/grub/i386-pc/hexdump.mod
-lib/grub/i386-pc/hexdump.module
-lib/grub/i386-pc/hfs.mod
-lib/grub/i386-pc/hfs.module
-lib/grub/i386-pc/hfsplus.mod
-lib/grub/i386-pc/hfsplus.module
-lib/grub/i386-pc/http.mod
-lib/grub/i386-pc/http.module
-lib/grub/i386-pc/iorw.mod
-lib/grub/i386-pc/iorw.module
-lib/grub/i386-pc/iso9660.mod
-lib/grub/i386-pc/iso9660.module
-lib/grub/i386-pc/jfs.mod
-lib/grub/i386-pc/jfs.module
-lib/grub/i386-pc/jpeg.mod
-lib/grub/i386-pc/jpeg.module
-lib/grub/i386-pc/kernel.exec
-lib/grub/i386-pc/kernel.img
-lib/grub/i386-pc/keylayouts.mod
-lib/grub/i386-pc/keylayouts.module
-lib/grub/i386-pc/keystatus.mod
-lib/grub/i386-pc/keystatus.module
-lib/grub/i386-pc/ldm.mod
-lib/grub/i386-pc/ldm.module
-lib/grub/i386-pc/legacycfg.mod
-lib/grub/i386-pc/legacycfg.module
-lib/grub/i386-pc/linux.mod
-lib/grub/i386-pc/linux.module
-lib/grub/i386-pc/linux16.mod
-lib/grub/i386-pc/linux16.module
-lib/grub/i386-pc/lnxboot.image
-lib/grub/i386-pc/lnxboot.img
-lib/grub/i386-pc/loadenv.mod
-lib/grub/i386-pc/loadenv.module
-lib/grub/i386-pc/loopback.mod
-lib/grub/i386-pc/loopback.module
-lib/grub/i386-pc/ls.mod
-lib/grub/i386-pc/ls.module
-lib/grub/i386-pc/lsacpi.mod
-lib/grub/i386-pc/lsacpi.module
-lib/grub/i386-pc/lsapm.mod
-lib/grub/i386-pc/lsapm.module
-lib/grub/i386-pc/lsmmap.mod
-lib/grub/i386-pc/lsmmap.module
-lib/grub/i386-pc/lspci.mod
-lib/grub/i386-pc/lspci.module
-lib/grub/i386-pc/luks.mod
-lib/grub/i386-pc/luks.module
-lib/grub/i386-pc/lvm.mod
-lib/grub/i386-pc/lvm.module
-lib/grub/i386-pc/lzma_decompress.image
-lib/grub/i386-pc/lzma_decompress.img
-lib/grub/i386-pc/lzopio.mod
-lib/grub/i386-pc/lzopio.module
-lib/grub/i386-pc/mdraid09.mod
-lib/grub/i386-pc/mdraid09.module
-lib/grub/i386-pc/mdraid09_be.mod
-lib/grub/i386-pc/mdraid09_be.module
-lib/grub/i386-pc/mdraid1x.mod
-lib/grub/i386-pc/mdraid1x.module
-lib/grub/i386-pc/memdisk.mod
-lib/grub/i386-pc/memdisk.module
-lib/grub/i386-pc/memrw.mod
-lib/grub/i386-pc/memrw.module
-lib/grub/i386-pc/minicmd.mod
-lib/grub/i386-pc/minicmd.module
-lib/grub/i386-pc/minix.mod
-lib/grub/i386-pc/minix.module
-lib/grub/i386-pc/minix2.mod
-lib/grub/i386-pc/minix2.module
-lib/grub/i386-pc/minix2_be.mod
-lib/grub/i386-pc/minix2_be.module
-lib/grub/i386-pc/minix3.mod
-lib/grub/i386-pc/minix3.module
-lib/grub/i386-pc/minix3_be.mod
-lib/grub/i386-pc/minix3_be.module
-lib/grub/i386-pc/minix_be.mod
-lib/grub/i386-pc/minix_be.module
-lib/grub/i386-pc/mmap.mod
-lib/grub/i386-pc/mmap.module
-lib/grub/i386-pc/moddep.lst
-lib/grub/i386-pc/modinfo.sh
-lib/grub/i386-pc/msdospart.mod
-lib/grub/i386-pc/msdospart.module
-lib/grub/i386-pc/multiboot.mod
-lib/grub/i386-pc/multiboot.module
-lib/grub/i386-pc/multiboot2.mod
-lib/grub/i386-pc/multiboot2.module
-lib/grub/i386-pc/net.mod
-lib/grub/i386-pc/net.module
-lib/grub/i386-pc/newc.mod
-lib/grub/i386-pc/newc.module
-lib/grub/i386-pc/nilfs2.mod
-lib/grub/i386-pc/nilfs2.module
-lib/grub/i386-pc/normal.mod
-lib/grub/i386-pc/normal.module
-lib/grub/i386-pc/ntfs.mod
-lib/grub/i386-pc/ntfs.module
-lib/grub/i386-pc/ntfscomp.mod
-lib/grub/i386-pc/ntfscomp.module
-lib/grub/i386-pc/ntldr.mod
-lib/grub/i386-pc/ntldr.module
-lib/grub/i386-pc/odc.mod
-lib/grub/i386-pc/odc.module
-lib/grub/i386-pc/ohci.mod
-lib/grub/i386-pc/ohci.module
-lib/grub/i386-pc/part_acorn.mod
-lib/grub/i386-pc/part_acorn.module
-lib/grub/i386-pc/part_amiga.mod
-lib/grub/i386-pc/part_amiga.module
-lib/grub/i386-pc/part_apple.mod
-lib/grub/i386-pc/part_apple.module
-lib/grub/i386-pc/part_bsd.mod
-lib/grub/i386-pc/part_bsd.module
-lib/grub/i386-pc/part_dvh.mod
-lib/grub/i386-pc/part_dvh.module
-lib/grub/i386-pc/part_gpt.mod
-lib/grub/i386-pc/part_gpt.module
-lib/grub/i386-pc/part_msdos.mod
-lib/grub/i386-pc/part_msdos.module
-lib/grub/i386-pc/part_plan.mod
-lib/grub/i386-pc/part_plan.module
-lib/grub/i386-pc/part_sun.mod
-lib/grub/i386-pc/part_sun.module
-lib/grub/i386-pc/part_sunpc.mod
-lib/grub/i386-pc/part_sunpc.module
-lib/grub/i386-pc/partmap.lst
-lib/grub/i386-pc/parttool.lst
-lib/grub/i386-pc/parttool.mod
-lib/grub/i386-pc/parttool.module
-lib/grub/i386-pc/password.mod
-lib/grub/i386-pc/password.module
-lib/grub/i386-pc/password_pbkdf2.mod
-lib/grub/i386-pc/password_pbkdf2.module
-lib/grub/i386-pc/pata.mod
-lib/grub/i386-pc/pata.module
-lib/grub/i386-pc/pbkdf2.mod
-lib/grub/i386-pc/pbkdf2.module
-lib/grub/i386-pc/pci.mod
-lib/grub/i386-pc/pci.module
-lib/grub/i386-pc/plan9.mod
-lib/grub/i386-pc/plan9.module
-lib/grub/i386-pc/play.mod
-lib/grub/i386-pc/play.module
-lib/grub/i386-pc/png.mod
-lib/grub/i386-pc/png.module
-lib/grub/i386-pc/priority_queue.mod
-lib/grub/i386-pc/priority_queue.module
-lib/grub/i386-pc/probe.mod
-lib/grub/i386-pc/probe.module
-lib/grub/i386-pc/pxe.mod
-lib/grub/i386-pc/pxe.module
-lib/grub/i386-pc/pxeboot.image
-lib/grub/i386-pc/pxeboot.img
-lib/grub/i386-pc/pxechain.mod
-lib/grub/i386-pc/pxechain.module
-lib/grub/i386-pc/raid5rec.mod
-lib/grub/i386-pc/raid5rec.module
-lib/grub/i386-pc/raid6rec.mod
-lib/grub/i386-pc/raid6rec.module
-lib/grub/i386-pc/read.mod
-lib/grub/i386-pc/read.module
-lib/grub/i386-pc/reboot.mod
-lib/grub/i386-pc/reboot.module
-lib/grub/i386-pc/regexp.mod
-lib/grub/i386-pc/regexp.module
-lib/grub/i386-pc/reiserfs.mod
-lib/grub/i386-pc/reiserfs.module
-lib/grub/i386-pc/relocator.mod
-lib/grub/i386-pc/relocator.module
-lib/grub/i386-pc/romfs.mod
-lib/grub/i386-pc/romfs.module
-lib/grub/i386-pc/scsi.mod
-lib/grub/i386-pc/scsi.module
-lib/grub/i386-pc/search.mod
-lib/grub/i386-pc/search.module
-lib/grub/i386-pc/search_fs_file.mod
-lib/grub/i386-pc/search_fs_file.module
-lib/grub/i386-pc/search_fs_uuid.mod
-lib/grub/i386-pc/search_fs_uuid.module
-lib/grub/i386-pc/search_label.mod
-lib/grub/i386-pc/search_label.module
-lib/grub/i386-pc/sendkey.mod
-lib/grub/i386-pc/sendkey.module
-lib/grub/i386-pc/serial.mod
-lib/grub/i386-pc/serial.module
-lib/grub/i386-pc/setjmp.mod
-lib/grub/i386-pc/setjmp.module
-lib/grub/i386-pc/setpci.mod
-lib/grub/i386-pc/setpci.module
-lib/grub/i386-pc/sfs.mod
-lib/grub/i386-pc/sfs.module
-lib/grub/i386-pc/sleep.mod
-lib/grub/i386-pc/sleep.module
-lib/grub/i386-pc/squash4.mod
-lib/grub/i386-pc/squash4.module
-lib/grub/i386-pc/tar.mod
-lib/grub/i386-pc/tar.module
-lib/grub/i386-pc/terminal.lst
-lib/grub/i386-pc/terminal.mod
-lib/grub/i386-pc/terminal.module
-lib/grub/i386-pc/terminfo.mod
-lib/grub/i386-pc/terminfo.module
-lib/grub/i386-pc/test.mod
-lib/grub/i386-pc/test.module
-lib/grub/i386-pc/test_blockarg.mod
-lib/grub/i386-pc/test_blockarg.module
-lib/grub/i386-pc/testload.mod
-lib/grub/i386-pc/testload.module
-lib/grub/i386-pc/tftp.mod
-lib/grub/i386-pc/tftp.module
-lib/grub/i386-pc/tga.mod
-lib/grub/i386-pc/tga.module
-lib/grub/i386-pc/time.mod
-lib/grub/i386-pc/time.module
-lib/grub/i386-pc/trig.mod
-lib/grub/i386-pc/trig.module
-lib/grub/i386-pc/true.mod
-lib/grub/i386-pc/true.module
-lib/grub/i386-pc/udf.mod
-lib/grub/i386-pc/udf.module
-lib/grub/i386-pc/ufs1.mod
-lib/grub/i386-pc/ufs1.module
-lib/grub/i386-pc/ufs2.mod
-lib/grub/i386-pc/ufs2.module
-lib/grub/i386-pc/uhci.mod
-lib/grub/i386-pc/uhci.module
-lib/grub/i386-pc/usb.mod
-lib/grub/i386-pc/usb.module
-lib/grub/i386-pc/usb_keyboard.mod
-lib/grub/i386-pc/usb_keyboard.module
-lib/grub/i386-pc/usbms.mod
-lib/grub/i386-pc/usbms.module
-lib/grub/i386-pc/usbserial_common.mod
-lib/grub/i386-pc/usbserial_common.module
-lib/grub/i386-pc/usbserial_ftdi.mod
-lib/grub/i386-pc/usbserial_ftdi.module
-lib/grub/i386-pc/usbserial_pl2303.mod
-lib/grub/i386-pc/usbserial_pl2303.module
-lib/grub/i386-pc/usbtest.mod
-lib/grub/i386-pc/usbtest.module
-lib/grub/i386-pc/vbe.mod
-lib/grub/i386-pc/vbe.module
-lib/grub/i386-pc/vga.mod
-lib/grub/i386-pc/vga.module
-lib/grub/i386-pc/vga_text.mod
-lib/grub/i386-pc/vga_text.module
-lib/grub/i386-pc/video.lst
-lib/grub/i386-pc/video.mod
-lib/grub/i386-pc/video.module
-lib/grub/i386-pc/video_bochs.mod
-lib/grub/i386-pc/video_bochs.module
-lib/grub/i386-pc/video_cirrus.mod
-lib/grub/i386-pc/video_cirrus.module
-lib/grub/i386-pc/video_fb.mod
-lib/grub/i386-pc/video_fb.module
-lib/grub/i386-pc/videoinfo.mod
-lib/grub/i386-pc/videoinfo.module
-lib/grub/i386-pc/videotest.mod
-lib/grub/i386-pc/videotest.module
-lib/grub/i386-pc/xfs.mod
-lib/grub/i386-pc/xfs.module
-lib/grub/i386-pc/xnu.mod
-lib/grub/i386-pc/xnu.module
-lib/grub/i386-pc/xnu_uuid.mod
-lib/grub/i386-pc/xnu_uuid.module
-lib/grub/i386-pc/xzio.mod
-lib/grub/i386-pc/xzio.module
-lib/grub/i386-pc/zfs.mod
-lib/grub/i386-pc/zfs.module
-lib/grub/i386-pc/zfscrypt.mod
-lib/grub/i386-pc/zfscrypt.module
-lib/grub/i386-pc/zfsinfo.mod
-lib/grub/i386-pc/zfsinfo.module
-sbin/grub-bios-setup
-sbin/grub-probe
-sbin/grub-install
-sbin/grub-mkconfig
-sbin/grub-mknetdir
-sbin/grub-ofpathname
-sbin/grub-set-default
-sbin/grub-sparc64-setup
-sbin/grub-reboot
-share/grub/grub-mkconfig_lib
-share/locale/ast/LC_MESSAGES/grub.mo
-share/locale/ca/LC_MESSAGES/grub.mo
-share/locale/da/LC_MESSAGES/grub.mo
-share/locale/de/LC_MESSAGES/grub.mo
-share/locale/de@hebrew/LC_MESSAGES/grub.mo
-share/locale/de_CH/LC_MESSAGES/grub.mo
-share/locale/en@arabic/LC_MESSAGES/grub.mo
-share/locale/en@cyrillic/LC_MESSAGES/grub.mo
-share/locale/en@greek/LC_MESSAGES/grub.mo
-share/locale/en@hebrew/LC_MESSAGES/grub.mo
-share/locale/en@piglatin/LC_MESSAGES/grub.mo
-share/locale/en@quot/LC_MESSAGES/grub.mo
-share/locale/eo/LC_MESSAGES/grub.mo
-share/locale/fi/LC_MESSAGES/grub.mo
-share/locale/fr/LC_MESSAGES/grub.mo
-share/locale/hu/LC_MESSAGES/grub.mo
-share/locale/id/LC_MESSAGES/grub.mo
-share/locale/it/LC_MESSAGES/grub.mo
-share/locale/ja/LC_MESSAGES/grub.mo
-share/locale/nl/LC_MESSAGES/grub.mo
-share/locale/pa/LC_MESSAGES/grub.mo
-share/locale/pl/LC_MESSAGES/grub.mo
-share/locale/ru/LC_MESSAGES/grub.mo
-share/locale/sv/LC_MESSAGES/grub.mo
-share/locale/uk/LC_MESSAGES/grub.mo
-share/locale/vi/LC_MESSAGES/grub.mo
-share/locale/zh_CN/LC_MESSAGES/grub.mo
-share/locale/zh_TW/LC_MESSAGES/grub.mo
-man/man1/grub-editenv.1.gz
-man/man1/grub-fstest.1.gz
-man/man1/grub-kbdcomp.1.gz
-man/man1/grub-menulst2cfg.1.gz
-man/man1/grub-mkimage.1.gz
-man/man1/grub-mklayout.1.gz
-man/man1/grub-mkpasswd-pbkdf2.1.gz
-man/man1/grub-mkrelpath.1.gz
-man/man1/grub-mkrescue.1.gz
-man/man1/grub-mkstandalone.1.gz
-man/man1/grub-script-check.1.gz
-man/man8/grub-bios-setup.8.gz
-man/man8/grub-install.8.gz
-man/man8/grub-mkconfig.8.gz
-man/man8/grub-mknetdir.8.gz
-man/man8/grub-ofpathname.8.gz
-man/man8/grub-probe.8.gz
-man/man8/grub-reboot.8.gz
-man/man8/grub-set-default.8.gz
-man/man8/grub-sparc64-setup.8.gz
diff --git a/sysutils/hexyl/Makefile b/sysutils/hexyl/Makefile
index 6206ddff5e92..bedfa6a3a761 100644
--- a/sysutils/hexyl/Makefile
+++ b/sysutils/hexyl/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	hexyl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 
 MAINTAINER=	tobik@FreeBSD.org
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index 347a03dcc05a..846ec60ce3ca 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	k3b
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils multimedia kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index c2040e14f15e..887a1c0f81fe 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690852
-SHA256 (KDE/applications/19.04.3/k3b-19.04.3.tar.xz) = c92b7b811f47d31b107aa14fb1e21d01a8635c208c1503f4ddf183522501df61
-SIZE (KDE/applications/19.04.3/k3b-19.04.3.tar.xz) = 10496576
+TIMESTAMP = 1565555769
+SHA256 (KDE/applications/19.08.0/k3b-19.08.0.tar.xz) = 6a740724945496395cea1b5850ea9567a9aa9cc8a28c5366c9709b4226dc4b10
+SIZE (KDE/applications/19.08.0/k3b-19.08.0.tar.xz) = 10499140
diff --git a/sysutils/k3b/pkg-plist b/sysutils/k3b/pkg-plist
index 220ebe446a8b..06117e61190b 100644
--- a/sysutils/k3b/pkg-plist
+++ b/sysutils/k3b/pkg-plist
@@ -124,6 +124,7 @@ lib/libk3bdevice.so.7.0.0
 lib/libk3blib.so
 lib/libk3blib.so.7
 lib/libk3blib.so.7.0.0
+lib/libexec/k3bhelper
 %%QT_PLUGINDIR%%/k3baudiometainforenamerplugin.so
 %%QT_PLUGINDIR%%/k3baudioprojectcddbplugin.so
 %%QT_PLUGINDIR%%/k3bexternalencoder.so
@@ -141,6 +142,8 @@ lib/libk3blib.so.7.0.0
 %%QT_PLUGINDIR%%/kcm_k3bsoxencoder.so
 %%QT_PLUGINDIR%%/kf5/kio/videodvd.so
 share/applications/org.kde.k3b.desktop
+share/dbus-1/system-services/org.kde.k3b.service
+share/dbus-1/system.d/org.kde.k3b.conf
 share/icons/hicolor/128x128/apps/k3b.png
 share/icons/hicolor/128x128/mimetypes/application-x-k3b.png
 share/icons/hicolor/16x16/apps/k3b.png
@@ -323,6 +326,8 @@ share/kservicetypes5/k3bplugin.desktop
 share/kxmlgui5/k3b/k3bdeviceui.rc
 share/kxmlgui5/k3b/k3bui.rc
 share/locale/ar/LC_MESSAGES/k3b.mo
+share/locale/ast/LC_MESSAGES/kio_videodvd.mo
+share/locale/ast/LC_MESSAGES/libk3bdevice.mo
 share/locale/bg/LC_MESSAGES/k3b.mo
 share/locale/bg/LC_MESSAGES/kio_videodvd.mo
 share/locale/bg/LC_MESSAGES/libk3b.mo
@@ -441,6 +446,7 @@ share/locale/lv/LC_MESSAGES/k3b.mo
 share/locale/lv/LC_MESSAGES/kio_videodvd.mo
 share/locale/lv/LC_MESSAGES/libk3b.mo
 share/locale/lv/LC_MESSAGES/libk3bdevice.mo
+share/locale/ml/LC_MESSAGES/kio_videodvd.mo
 share/locale/mr/LC_MESSAGES/k3b.mo
 share/locale/mr/LC_MESSAGES/kio_videodvd.mo
 share/locale/mr/LC_MESSAGES/libk3b.mo
@@ -524,6 +530,7 @@ share/locale/zh_TW/LC_MESSAGES/libk3b.mo
 share/locale/zh_TW/LC_MESSAGES/libk3bdevice.mo
 share/metainfo/org.kde.k3b.appdata.xml
 share/mime/packages/x-k3b.xml
+share/polkit-1/actions/org.kde.k3b.policy
 share/solid/actions/k3b_audiocd_rip.desktop
 share/solid/actions/k3b_copy_disc.desktop
 share/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop
diff --git a/sysutils/kbackup/Makefile b/sysutils/kbackup/Makefile
index c0569bb4affe..13a2dabf14dc 100644
--- a/sysutils/kbackup/Makefile
+++ b/sysutils/kbackup/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kbackup
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kbackup/distinfo b/sysutils/kbackup/distinfo
index 63af42a5db62..f2df598f967a 100644
--- a/sysutils/kbackup/distinfo
+++ b/sysutils/kbackup/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690852
-SHA256 (KDE/applications/19.04.3/kbackup-19.04.3.tar.xz) = 421e05fbc7b6332cfdca08faa65e74def2c5fa40a6211e6623e03cc4ec568019
-SIZE (KDE/applications/19.04.3/kbackup-19.04.3.tar.xz) = 357424
+TIMESTAMP = 1565555769
+SHA256 (KDE/applications/19.08.0/kbackup-19.08.0.tar.xz) = 2cd447ef7d53e7ee55868086e7a894f550fd81515cf5d87d0561520f45145127
+SIZE (KDE/applications/19.08.0/kbackup-19.08.0.tar.xz) = 358300
diff --git a/sysutils/kbackup/pkg-plist b/sysutils/kbackup/pkg-plist
index 362ea4c87d74..b700d915a7f9 100644
--- a/sysutils/kbackup/pkg-plist
+++ b/sysutils/kbackup/pkg-plist
@@ -24,6 +24,7 @@ share/locale/ia/LC_MESSAGES/kbackup.mo
 share/locale/it/LC_MESSAGES/kbackup.mo
 share/locale/ja/LC_MESSAGES/kbackup.mo
 share/locale/ko/LC_MESSAGES/kbackup.mo
+share/locale/lt/LC_MESSAGES/kbackup.mo
 share/locale/nl/LC_MESSAGES/kbackup.mo
 share/locale/nn/LC_MESSAGES/kbackup.mo
 share/locale/pl/LC_MESSAGES/kbackup.mo
diff --git a/sysutils/kcron/Makefile b/sysutils/kcron/Makefile
index 8b91cb966caf..8a65940eb364 100644
--- a/sysutils/kcron/Makefile
+++ b/sysutils/kcron/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kcron
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kcron/distinfo b/sysutils/kcron/distinfo
index 36f11dae85f4..1bee3c5a468e 100644
--- a/sysutils/kcron/distinfo
+++ b/sysutils/kcron/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690853
-SHA256 (KDE/applications/19.04.3/kcron-19.04.3.tar.xz) = 24f6f36d058c3e0587a7a70cc2d2df77eb593efa642833cfb17bc671e97c9cd6
-SIZE (KDE/applications/19.04.3/kcron-19.04.3.tar.xz) = 887528
+TIMESTAMP = 1565555770
+SHA256 (KDE/applications/19.08.0/kcron-19.08.0.tar.xz) = 1594aafc964d8e6c9ff31056d8f6f9ca6ee51ef9067b3ee1c991744baf54a88c
+SIZE (KDE/applications/19.08.0/kcron-19.08.0.tar.xz) = 888212
diff --git a/sysutils/kcron/pkg-plist b/sysutils/kcron/pkg-plist
index 8c8487a0dc3b..1b1bfa5112a0 100644
--- a/sysutils/kcron/pkg-plist
+++ b/sysutils/kcron/pkg-plist
@@ -1,4 +1,4 @@
-etc/xdg/kcron.categories
+share/qlogging-categories5/kcron.categories
 %%QT_PLUGINDIR%%/kcm_cron.so
 share/kservices5/kcm_cron.desktop
 share/locale/ar/LC_MESSAGES/kcron.mo
diff --git a/sysutils/kdebugsettings/Makefile b/sysutils/kdebugsettings/Makefile
index d5dec9dbc562..744929d9cb3d 100644
--- a/sysutils/kdebugsettings/Makefile
+++ b/sysutils/kdebugsettings/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kdebugsettings
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kdebugsettings/distinfo b/sysutils/kdebugsettings/distinfo
index f9a1117c8486..2e9d787af895 100644
--- a/sysutils/kdebugsettings/distinfo
+++ b/sysutils/kdebugsettings/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690853
-SHA256 (KDE/applications/19.04.3/kdebugsettings-19.04.3.tar.xz) = 0f3f2afafad0cfb312b51b15de6615359ba5ccd7bee6b35ce48a40e3a58368c5
-SIZE (KDE/applications/19.04.3/kdebugsettings-19.04.3.tar.xz) = 55324
+TIMESTAMP = 1565555770
+SHA256 (KDE/applications/19.08.0/kdebugsettings-19.08.0.tar.xz) = b47987cabffe464c21c96b31991643efafc24f77d31b768ed9dff075567aa361
+SIZE (KDE/applications/19.08.0/kdebugsettings-19.08.0.tar.xz) = 55400
diff --git a/sysutils/kdebugsettings/pkg-plist b/sysutils/kdebugsettings/pkg-plist
index 7b37a09414e3..385d5e15616f 100644
--- a/sysutils/kdebugsettings/pkg-plist
+++ b/sysutils/kdebugsettings/pkg-plist
@@ -1,6 +1,6 @@
 bin/kdebugsettings
-etc/xdg/kde.categories
-etc/xdg/kde.renamecategories
+share/qlogging-categories5/kde.categories
+share/qlogging-categories5/kde.renamecategories
 share/applications/org.kde.kdebugsettings.desktop
 share/locale/ar/LC_MESSAGES/kdebugsettings.mo
 share/locale/ca/LC_MESSAGES/kdebugsettings.mo
@@ -37,3 +37,4 @@ share/locale/tr/LC_MESSAGES/kdebugsettings.mo
 share/locale/uk/LC_MESSAGES/kdebugsettings.mo
 share/locale/zh_CN/LC_MESSAGES/kdebugsettings.mo
 share/locale/zh_TW/LC_MESSAGES/kdebugsettings.mo
+share/qlogging-categories5/kdebugsettings.categories
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 20e7e23bfe1d..55dbe55761d1 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kdf
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index d5b7c0c568ee..5ae669ff8929 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690853
-SHA256 (KDE/applications/19.04.3/kdf-19.04.3.tar.xz) = 4d3d3218cee73238e9be73db131062f186ede393bbe0115e4df633c7d21f2572
-SIZE (KDE/applications/19.04.3/kdf-19.04.3.tar.xz) = 461476
+TIMESTAMP = 1565555770
+SHA256 (KDE/applications/19.08.0/kdf-19.08.0.tar.xz) = e6effd6aaf08c9bfa649b194313e7719b65a9d53f00570e14d2752ce68d13bfe
+SIZE (KDE/applications/19.08.0/kdf-19.08.0.tar.xz) = 461884
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index dd89959a6f48..c924385edad6 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -1,6 +1,6 @@
 bin/kdf
 bin/kwikdisk
-etc/xdg/kdf.categories
+share/qlogging-categories5/kdf.categories
 lib/libkdfprivate.so.%%KDE_APPLICATIONS_VERSION_SHORT%%
 lib/libkdfprivate.so.%%KDE_APPLICATIONS_VERSION%%
 %%QT_PLUGINDIR%%/libkcm_kdf.so
diff --git a/sysutils/kdialog/Makefile b/sysutils/kdialog/Makefile
index 2acff11419a1..d3d74c2596bc 100644
--- a/sysutils/kdialog/Makefile
+++ b/sysutils/kdialog/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kdialog
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kdialog/distinfo b/sysutils/kdialog/distinfo
index b0a39d679eb8..d43cfff52d97 100644
--- a/sysutils/kdialog/distinfo
+++ b/sysutils/kdialog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690854
-SHA256 (KDE/applications/19.04.3/kdialog-19.04.3.tar.xz) = 647c5eac9d34f2cc8011f6214bc5a8ddc1eca8f0b381c66eaf20848eccdf9823
-SIZE (KDE/applications/19.04.3/kdialog-19.04.3.tar.xz) = 98192
+TIMESTAMP = 1565555771
+SHA256 (KDE/applications/19.08.0/kdialog-19.08.0.tar.xz) = dc60f9ea0c59435b0da37f4bc50716d43ebfb9b9d0b05955c96393e6d06ea687
+SIZE (KDE/applications/19.08.0/kdialog-19.08.0.tar.xz) = 102564
diff --git a/sysutils/kdialog/pkg-plist b/sysutils/kdialog/pkg-plist
index 38a942d8a1e1..87a5998bf54d 100644
--- a/sysutils/kdialog/pkg-plist
+++ b/sysutils/kdialog/pkg-plist
@@ -35,6 +35,7 @@ share/locale/km/LC_MESSAGES/kdialog.mo
 share/locale/ko/LC_MESSAGES/kdialog.mo
 share/locale/lt/LC_MESSAGES/kdialog.mo
 share/locale/lv/LC_MESSAGES/kdialog.mo
+share/locale/ml/LC_MESSAGES/kdialog.mo
 share/locale/mr/LC_MESSAGES/kdialog.mo
 share/locale/nb/LC_MESSAGES/kdialog.mo
 share/locale/nds/LC_MESSAGES/kdialog.mo
@@ -56,3 +57,4 @@ share/locale/uk/LC_MESSAGES/kdialog.mo
 share/locale/wa/LC_MESSAGES/kdialog.mo
 share/locale/zh_CN/LC_MESSAGES/kdialog.mo
 share/locale/zh_TW/LC_MESSAGES/kdialog.mo
+share/metainfo/org.kde.kdialog.metainfo.xml
diff --git a/sysutils/kf5-kwallet/Makefile b/sysutils/kf5-kwallet/Makefile
index be8f558bcaed..acd93d615798 100644
--- a/sysutils/kf5-kwallet/Makefile
+++ b/sysutils/kf5-kwallet/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	kwallet
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-frameworks
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 57ff9727e6f8..dac0052537af 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	kfloppy
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index f2c024e03e56..1c7b43a0aba7 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690854
-SHA256 (KDE/applications/19.04.3/kfloppy-19.04.3.tar.xz) = 7f3a206b6f4cd03771d8fba94423bf749a2b8e6bb4dfd01f30502d1ab08f1d8e
-SIZE (KDE/applications/19.04.3/kfloppy-19.04.3.tar.xz) = 198868
+TIMESTAMP = 1565555771
+SHA256 (KDE/applications/19.08.0/kfloppy-19.08.0.tar.xz) = 312345286fa1dba2cac782523d95c1e4ed0d7ef272c93c5d7bf2f9d8f635fa82
+SIZE (KDE/applications/19.08.0/kfloppy-19.08.0.tar.xz) = 198720
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 6b23a2bda7f0..b63e956e8d81 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -1,5 +1,5 @@
 bin/kfloppy
-etc/xdg/kfloppy.categories
+share/qlogging-categories5/kfloppy.categories
 share/applications/org.kde.kfloppy.desktop
 share/icons/hicolor/128x128/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kfloppy.png
diff --git a/sysutils/khelpcenter/Makefile b/sysutils/khelpcenter/Makefile
index 3af58e739eb9..07feb9068f2e 100644
--- a/sysutils/khelpcenter/Makefile
+++ b/sysutils/khelpcenter/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	khelpcenter
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications # kde kde-applications-plasma
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/khelpcenter/distinfo b/sysutils/khelpcenter/distinfo
index 0f26785ce572..a0e572a3ab22 100644
--- a/sysutils/khelpcenter/distinfo
+++ b/sysutils/khelpcenter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690865
-SHA256 (KDE/applications/19.04.3/khelpcenter-19.04.3.tar.xz) = d18e0960859d72d9c2ebf187a9f5b1b65a8c78032e32df0d6eb0cce73921e972
-SIZE (KDE/applications/19.04.3/khelpcenter-19.04.3.tar.xz) = 3851316
+TIMESTAMP = 1565555782
+SHA256 (KDE/applications/19.08.0/khelpcenter-19.08.0.tar.xz) = 36810c12ae5d163738101b0f5f13c03cda03ee4c157f641df0f73105a894644f
+SIZE (KDE/applications/19.08.0/khelpcenter-19.08.0.tar.xz) = 3845972
diff --git a/sysutils/khelpcenter/pkg-plist b/sysutils/khelpcenter/pkg-plist
index 01a46ccc878c..86322f944f22 100644
--- a/sysutils/khelpcenter/pkg-plist
+++ b/sysutils/khelpcenter/pkg-plist
@@ -1,5 +1,5 @@
 bin/khelpcenter
-etc/xdg/khelpcenter.categories
+share/qlogging-categories5/khelpcenter.categories
 lib/libexec/khc_mansearch.pl
 lib/libexec/khc_xapianindexer
 lib/libexec/khc_xapiansearch
@@ -72,6 +72,7 @@ share/locale/km/LC_MESSAGES/khelpcenter5.mo
 share/locale/ko/LC_MESSAGES/khelpcenter5.mo
 share/locale/lt/LC_MESSAGES/khelpcenter5.mo
 share/locale/lv/LC_MESSAGES/khelpcenter5.mo
+share/locale/ml/LC_MESSAGES/khelpcenter5.mo
 share/locale/mr/LC_MESSAGES/khelpcenter5.mo
 share/locale/nb/LC_MESSAGES/khelpcenter5.mo
 share/locale/nds/LC_MESSAGES/khelpcenter5.mo
diff --git a/sysutils/ksystemlog/Makefile b/sysutils/ksystemlog/Makefile
index 8da7aa11e996..52fc21db8ec8 100644
--- a/sysutils/ksystemlog/Makefile
+++ b/sysutils/ksystemlog/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	ksystemlog
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/ksystemlog/distinfo b/sysutils/ksystemlog/distinfo
index 7f48e140c80e..66465976b88c 100644
--- a/sysutils/ksystemlog/distinfo
+++ b/sysutils/ksystemlog/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690865
-SHA256 (KDE/applications/19.04.3/ksystemlog-19.04.3.tar.xz) = 7d155c91d57e253c00f038100e136e4bf6eb4d709549d689608ee0026354a965
-SIZE (KDE/applications/19.04.3/ksystemlog-19.04.3.tar.xz) = 1922176
+TIMESTAMP = 1565555782
+SHA256 (KDE/applications/19.08.0/ksystemlog-19.08.0.tar.xz) = 1231a9dd9a697fe2379a93a3a4d5c026aedf70a8f7e14d8a626ef6b782fb4259
+SIZE (KDE/applications/19.08.0/ksystemlog-19.08.0.tar.xz) = 1927060
diff --git a/sysutils/ksystemlog/pkg-plist b/sysutils/ksystemlog/pkg-plist
index 320acc5c8224..62c8b8e5511b 100644
--- a/sysutils/ksystemlog/pkg-plist
+++ b/sysutils/ksystemlog/pkg-plist
@@ -50,3 +50,4 @@ share/locale/ug/LC_MESSAGES/ksystemlog.mo
 share/locale/uk/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_CN/LC_MESSAGES/ksystemlog.mo
 share/locale/zh_TW/LC_MESSAGES/ksystemlog.mo
+share/metainfo/org.kde.ksystemlog.appdata.xml
diff --git a/sysutils/lizardfs/Makefile b/sysutils/lizardfs/Makefile
index 92410e5c15c7..5c32c23eb145 100644
--- a/sysutils/lizardfs/Makefile
+++ b/sysutils/lizardfs/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	lizardfs
 PORTVERSION=	3.12.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	jhixson@FreeBSD.org
diff --git a/sysutils/lockfile-progs/pkg-plist b/sysutils/lockfile-progs/pkg-plist
index 7325a8fe1226..423a1e9714a5 100644
--- a/sysutils/lockfile-progs/pkg-plist
+++ b/sysutils/lockfile-progs/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/lockfile-check
 bin/lockfile-create
 bin/lockfile-remove
diff --git a/sysutils/logstalgia/Makefile b/sysutils/logstalgia/Makefile
index 7fb9b381a659..aebc69aa2768 100644
--- a/sysutils/logstalgia/Makefile
+++ b/sysutils/logstalgia/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	logstalgia
 DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.1.2
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils www
 
 MAINTAINER=	ehaupt@FreeBSD.org
diff --git a/sysutils/makeztxt/Makefile b/sysutils/makeztxt/Makefile
new file mode 100644
index 000000000000..9d99e2372bc4
--- /dev/null
+++ b/sysutils/makeztxt/Makefile
@@ -0,0 +1,30 @@
+# Created by: Roman Shterenzon <roman@xpert.com>
+# $FreeBSD$
+
+PORTNAME=	makeztxt
+PORTVERSION=	1.62
+CATEGORIES=	sysutils
+MASTER_SITES=	SF/gutenpalm/${PORTNAME}/${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Command line utility to create GutenPalm's zTXT format databases
+
+LICENSE=	GPLv2
+
+DEPRECATED=	obsolete technology
+EXPIRATION_DATE=	2019-09-21
+
+PLIST_FILES=	bin/makeztxt
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USES=		gmake
+
+MAKE_ENV+=	USEPOSIX=1 LONG_OPTS=1
+
+post-patch:
+	${REINPLACE_CMD} 's/-O2//' ${WRKSRC}/libztxt/Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/makeztxt ${STAGEDIR}${LOCALBASE}/bin/
+
+.include <bsd.port.mk>
diff --git a/sysutils/makeztxt/distinfo b/sysutils/makeztxt/distinfo
new file mode 100644
index 000000000000..98b292faf6d8
--- /dev/null
+++ b/sysutils/makeztxt/distinfo
@@ -0,0 +1,2 @@
+SHA256 (makeztxt-1.62-src.tar.gz) = 72404f0c1ea037038937884a79f75061d2c0347de0d9cd09b91b8f3139cd9567
+SIZE (makeztxt-1.62-src.tar.gz) = 39971
diff --git a/sysutils/makeztxt/files/patch-Makefile b/sysutils/makeztxt/files/patch-Makefile
new file mode 100644
index 000000000000..0785f9eff2d3
--- /dev/null
+++ b/sysutils/makeztxt/files/patch-Makefile
@@ -0,0 +1,21 @@
+--- ./Makefile.orig	Mon May  1 14:39:51 2006
++++ ./Makefile	Mon May  1 14:40:05 2006
+@@ -9,8 +9,7 @@
+ LIBS	= -lztxt
+ INCLUDE	= -I../common -I.
+ 
+-CC	= gcc
+-CFLAGS	= -Wall -O2 -pipe $(INCLUDE)
++CFLAGS	= -Wall $(INCLUDE)
+ # GNU make is mandatory
+ #MAKE	= make
+ 
+@@ -44,7 +43,7 @@
+ 
+ # If you're on a system that does not have getopt.h or does not have the
+ # getopt_long() function, comment this out.  Regular getopt() will be used.
+-LONG_OPTS = 1
++#LONG_OPTS = 1
+ 
+ 
+ #####################################
diff --git a/sysutils/makeztxt/pkg-descr b/sysutils/makeztxt/pkg-descr
new file mode 100644
index 000000000000..044934b0a577
--- /dev/null
+++ b/sysutils/makeztxt/pkg-descr
@@ -0,0 +1,6 @@
+makeztxt is a simple command line program that takes a plain ASCII text file
+and compresses it into a zTXT database.  makeztxt will remove newline
+characters at the end of lines that contain text so that the paragraphs flow
+better on the Palm screen.
+
+WWW: http://gutenpalm.sourceforge.net/
diff --git a/sysutils/ori/Makefile b/sysutils/ori/Makefile
index b1d9bf8d1db1..3ef7dc177983 100644
--- a/sysutils/ori/Makefile
+++ b/sysutils/ori/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ori
 PORTVERSION=	0.8.1
-PORTREVISION=	21
+PORTREVISION=	22
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cdn.bitbucket.org/orifs/ori/downloads/
 
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index b7d9cf789b42..9bc8642f31a8 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	osquery
 PORTVERSION=	3.3.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 
 MAINTAINER=	zi@FreeBSD.org
diff --git a/sysutils/pot/Makefile b/sysutils/pot/Makefile
index 926781ac4a04..caf528970b13 100644
--- a/sysutils/pot/Makefile
+++ b/sysutils/pot/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pot
-PORTVERSION=	0.9.0
+PORTVERSION=	0.9.1
 CATEGORIES=	sysutils
 
 MAINTAINER=	pizzamig@FreeBSD.org
@@ -12,7 +12,8 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	potnet:sysutils/potnet \
-		${LOCALBASE}/share/freebsd/MANIFESTS/amd64-amd64-11.2-RELEASE:misc/freebsd-release-manifests
+	ncat:security/nmap \
+	${LOCALBASE}/share/freebsd/MANIFESTS/amd64-amd64-11.2-RELEASE:misc/freebsd-release-manifests
 
 USE_RC_SUBR=	pot
 
diff --git a/sysutils/pot/distinfo b/sysutils/pot/distinfo
index f5a0890e1bbb..3876e4b748d4 100644
--- a/sysutils/pot/distinfo
+++ b/sysutils/pot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1565694596
-SHA256 (pizzamig-pot-0.9.0_GH0.tar.gz) = b54e7b2adab04e4bcada6fbcd6d3a5adc6ea2012ddf11c7a8f59354ec9f4e15c
-SIZE (pizzamig-pot-0.9.0_GH0.tar.gz) = 130964
+TIMESTAMP = 1566308392
+SHA256 (pizzamig-pot-0.9.1_GH0.tar.gz) = ae32630cba7acb89da4323f806758c6af65939e5606bd7687dfa947c7097f388
+SIZE (pizzamig-pot-0.9.1_GH0.tar.gz) = 131905
diff --git a/sysutils/potnet/Makefile b/sysutils/potnet/Makefile
index 41a032700476..a5fbb7f7b58b 100644
--- a/sysutils/potnet/Makefile
+++ b/sysutils/potnet/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	potnet
 DISTVERSION=	0.3.2
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
 MAINTAINER=	pizzamig@FreeBSD.org
diff --git a/sysutils/puppet6/Makefile b/sysutils/puppet6/Makefile
index 2c7288559963..b383373ce4c8 100644
--- a/sysutils/puppet6/Makefile
+++ b/sysutils/puppet6/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppet
-PORTVERSION=	6.7.2
+PORTVERSION=	6.8.0
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	6
 
diff --git a/sysutils/puppet6/distinfo b/sysutils/puppet6/distinfo
index 8c731cd9b3b1..20544360abde 100644
--- a/sysutils/puppet6/distinfo
+++ b/sysutils/puppet6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564167384
-SHA256 (puppetlabs-puppet-6.7.2_GH0.tar.gz) = e036ed08da3dfdddeece18078d936d42e02a175a5c81ecd172d38e6161323369
-SIZE (puppetlabs-puppet-6.7.2_GH0.tar.gz) = 3237640
+TIMESTAMP = 1566158983
+SHA256 (puppetlabs-puppet-6.8.0_GH0.tar.gz) = f26b6fda6ffd5d7a351e491193085d1f7f7f1e9e5b48dbe345fcced88e2b6c80
+SIZE (puppetlabs-puppet-6.8.0_GH0.tar.gz) = 3245069
diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile
index afca542e92c2..0f76715f6aa4 100644
--- a/sysutils/rsyslog8/Makefile
+++ b/sysutils/rsyslog8/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rsyslog
-PORTVERSION=	8.1907.0
-PORTREVISION=	1
+PORTVERSION=	8.1908.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
diff --git a/sysutils/rsyslog8/distinfo b/sysutils/rsyslog8/distinfo
index a60b7bee09c2..0dc0197c283b 100644
--- a/sysutils/rsyslog8/distinfo
+++ b/sysutils/rsyslog8/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562702295
-SHA256 (rsyslog-8.1907.0.tar.gz) = eb27535ece93174ef6b551c88467d2c9cd826b62479625bb881a53d50b079fb5
-SIZE (rsyslog-8.1907.0.tar.gz) = 2926855
+TIMESTAMP = 1566371041
+SHA256 (rsyslog-8.1908.0.tar.gz) = f8c8e53b651e03a011667c60bd2d4dba7a7cb6ec04b247c8ea8514115527863b
+SIZE (rsyslog-8.1908.0.tar.gz) = 2952939
diff --git a/sysutils/rubygem-backup/Makefile b/sysutils/rubygem-backup/Makefile
index 3956e16af7af..52d2998ca927 100644
--- a/sysutils/rubygem-backup/Makefile
+++ b/sysutils/rubygem-backup/Makefile
@@ -75,9 +75,10 @@ RUN_DEPENDS=	rubygem-CFPropertyList>=2.3.1:devel/rubygem-CFPropertyList \
 		rubygem-unf_ext>=0.0.6:textproc/rubygem-unf_ext \
 		rubygem-xml-simple>=1.1.4:textproc/rubygem-xml-simple
 
-NO_ARCH=	yes
-USE_RUBY=	yes
 USES=		gem
+USE_RUBY=	yes
+
+NO_ARCH=	yes
 
 PLIST_FILES=	bin/backup
 
diff --git a/sysutils/rubygem-puppetserver-ca/Makefile b/sysutils/rubygem-puppetserver-ca/Makefile
index 0bc9fee9b28c..eda375c819b8 100644
--- a/sysutils/rubygem-puppetserver-ca/Makefile
+++ b/sysutils/rubygem-puppetserver-ca/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	puppetserver-ca
-PORTVERSION=	1.3.2
+PORTVERSION=	1.4.0
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
@@ -16,6 +16,8 @@ RUN_DEPENDS=	facter:sysutils/facter
 USES=		gem
 USE_RUBY=	yes
 
+PLIST_FILES=	bin/puppetserver-ca
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \
 		${WRKSRC}/lib/puppetserver/ca/config/puppet.rb
diff --git a/sysutils/rubygem-puppetserver-ca/distinfo b/sysutils/rubygem-puppetserver-ca/distinfo
index dc56059dbfd5..e51b2a39f198 100644
--- a/sysutils/rubygem-puppetserver-ca/distinfo
+++ b/sysutils/rubygem-puppetserver-ca/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563739467
-SHA256 (rubygem/puppetserver-ca-1.3.2.gem) = 98edbe279ae3013682e2b3803ca70354d40db6acef29d80b935e65c0e08667cf
-SIZE (rubygem/puppetserver-ca-1.3.2.gem) = 35328
+TIMESTAMP = 1566159099
+SHA256 (rubygem/puppetserver-ca-1.4.0.gem) = dd194c0b23f973c8a0b16cee1bcddae0d57ee5715f554967523961dd6f025a34
+SIZE (rubygem/puppetserver-ca-1.4.0.gem) = 35840
diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile
index 9f4605a40648..91c4d64939ae 100644
--- a/sysutils/rubygem-r10k/Makefile
+++ b/sysutils/rubygem-r10k/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	r10k
-PORTVERSION=	3.3.0
+PORTVERSION=	3.3.1
 CATEGORIES=	sysutils rubygems
 MASTER_SITES=	RG
 
diff --git a/sysutils/rubygem-r10k/distinfo b/sysutils/rubygem-r10k/distinfo
index e937f68a5e56..669d41f93fcd 100644
--- a/sysutils/rubygem-r10k/distinfo
+++ b/sysutils/rubygem-r10k/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1560015358
-SHA256 (rubygem/r10k-3.3.0.gem) = e50eb955be198fda25a1c3704793f8dbc9eb0caac25039727027dd80b8b97a9c
-SIZE (rubygem/r10k-3.3.0.gem) = 206848
+TIMESTAMP = 1566317482
+SHA256 (rubygem/r10k-3.3.1.gem) = 5ff1307ecbf22f416b62d3b804becd5618ee51e967511bf90f2e6554774066d9
+SIZE (rubygem/r10k-3.3.1.gem) = 208384
diff --git a/sysutils/screenfetch-nox11/Makefile b/sysutils/screenfetch-nox11/Makefile
new file mode 100644
index 000000000000..a067e8af398b
--- /dev/null
+++ b/sysutils/screenfetch-nox11/Makefile
@@ -0,0 +1,12 @@
+# Created by: Jason Helfman <jgh@FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-nox11
+
+MASTERDIR=	${.CURDIR}/../screenfetch
+
+CONFLICTS_INSTALL=	screenFetch-[0-9].*
+
+OPTIONS_EXCLUDE=	X11
+
+.include "${MASTERDIR}/Makefile"
diff --git a/sysutils/screenfetch/Makefile b/sysutils/screenfetch/Makefile
index f85284436d96..8bd551a61c6a 100644
--- a/sysutils/screenfetch/Makefile
+++ b/sysutils/screenfetch/Makefile
@@ -13,10 +13,13 @@ COMMENT=	Bash Screenshot Information Tool
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-RUN_DEPENDS=	bash:shells/bash \
-		xdpyinfo:x11/xdpyinfo
+RUN_DEPENDS=	bash:shells/bash
+X11_RUN_DEPENDS=	xdpyinfo:x11/xdpyinfo
 
-OPTIONS_DEFINE=	DOCS
+CONFLICTS_INSTALL?=	screenFetch-nox11
+
+OPTIONS_DEFINE=	DOCS X11
+OPTIONS_DEFAULT=	X11
 
 NO_BUILD=	yes
 NO_ARCH=	yes
diff --git a/sysutils/sensu-go/Makefile b/sysutils/sensu-go/Makefile
index 5c70c9f2c45b..5ac00589a726 100644
--- a/sysutils/sensu-go/Makefile
+++ b/sysutils/sensu-go/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=		sensu-go
 DISTVERSION=		5.11.1
+PORTREVISION=		1
 CATEGORIES=		sysutils
 
 MAINTAINER=		jp+ports@supplntr.io
@@ -24,11 +25,11 @@ OPTIONS_DEFAULT=	SENSU_AGENT
 OPTIONS_SUB=		yes
 
 SENSU_AGENT_DESC=	Install sensu-agent daemon
-SENSU_AGENT_VARS=	GO_TARGETS+=agent GO_BIN_TARGETS+=sensu-agent
+SENSU_AGENT_VARS=	GO_TARGETS+=agent GO_BIN_TARGETS+=sensu-agent \
+			USE_RC_SUBR+=sensu-agent
 
 SENSU_CLI_DESC=		Install sensuctl binary
-SENSU_CLI_VARS=		GO_TARGETS+=cli GO_BIN_TARGETS+=sensuctl \
-			USE_RC_SUBR+=sensu-agent
+SENSU_CLI_VARS=		GO_TARGETS+=cli GO_BIN_TARGETS+=sensuctl
 
 SENSU_BE_DESC=		Install sensu-backend daemon (unsupported)
 SENSU_BE_VARS=		GO_TARGETS+=backend GO_BIN_TARGETS+=sensu-backend \
@@ -48,7 +49,7 @@ do-build:
 
 do-install:
 .for GO_BIN_TARGET in ${GO_BIN_TARGETS}
-	${INSTALL_PROGRAM} ${GO_WRKSRC}/target/freebsd-${ARCH}/${GO_BIN_TARGET} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${GO_WRKSRC}/target/freebsd-${ARCH:S/^i//}/${GO_BIN_TARGET} ${STAGEDIR}${PREFIX}/bin
 .endfor
 
 post-install-SENSU_AGENT-on:
diff --git a/sysutils/signon-kwallet-extension/Makefile b/sysutils/signon-kwallet-extension/Makefile
index cc57939163f4..c90128ccc5a3 100644
--- a/sysutils/signon-kwallet-extension/Makefile
+++ b/sysutils/signon-kwallet-extension/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	signon-kwallet-extension
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/signon-kwallet-extension/distinfo b/sysutils/signon-kwallet-extension/distinfo
index b9927de54df0..4c79d201415a 100644
--- a/sysutils/signon-kwallet-extension/distinfo
+++ b/sysutils/signon-kwallet-extension/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690865
-SHA256 (KDE/applications/19.04.3/signon-kwallet-extension-19.04.3.tar.xz) = bddf5fe036b95769ad9ff02a9583b7f96280e9a48db4abc92f98e4d163f7daa9
-SIZE (KDE/applications/19.04.3/signon-kwallet-extension-19.04.3.tar.xz) = 10624
+TIMESTAMP = 1565555782
+SHA256 (KDE/applications/19.08.0/signon-kwallet-extension-19.08.0.tar.xz) = f8cd646365f82c82de6c9f2dda8250579a2e469504e4358a334786f8f8e8b61f
+SIZE (KDE/applications/19.08.0/signon-kwallet-extension-19.08.0.tar.xz) = 10616
diff --git a/sysutils/snmp_exporter/Makefile b/sysutils/snmp_exporter/Makefile
index 56e0a56f1641..465e1536dadd 100644
--- a/sysutils/snmp_exporter/Makefile
+++ b/sysutils/snmp_exporter/Makefile
@@ -12,26 +12,20 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libnetsnmp.so:net-mgmt/net-snmp
 
-USES=		go
+USES=		go:modules
 USE_GITHUB=	yes
 USE_RC_SUBR=	snmp_exporter
 
 GH_ACCOUNT=	prometheus
 
-GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
-GO_TARGET=	github.com/${GH_ACCOUNT}/${PORTNAME}
-
-do-build:
-	(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET})
-	(cd ${GO_WRKSRC}/generator; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} install -v ${GO_TARGET}/generator)
+GO_TARGET=	. ./generator
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' ${GO_WRKSRC}/generator/main.go
 
-do-install:
+post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/snmp_exporter/
 	${INSTALL_DATA} ${FILESDIR}/generator.yml ${STAGEDIR}${PREFIX}/etc/snmp_exporter/generator.yml
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/snmp_exporter ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKDIR}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator
+	${MV} ${STAGEDIR}${PREFIX}/bin/generator ${STAGEDIR}${PREFIX}/bin/snmp_exporter_generator
 
 .include <bsd.port.mk>
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index fea31925f763..f5c89c939b5c 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	sweeper
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
 CATEGORIES=	sysutils kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 0e8b3ae7550a..ca9c6f281052 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1562690866
-SHA256 (KDE/applications/19.04.3/sweeper-19.04.3.tar.xz) = 03b0ed0006da9a9ee02b9e3201e4974444fba00a5a59fc14ca179656eeb86aaf
-SIZE (KDE/applications/19.04.3/sweeper-19.04.3.tar.xz) = 368208
+TIMESTAMP = 1565555783
+SHA256 (KDE/applications/19.08.0/sweeper-19.08.0.tar.xz) = 3cab8817b5c52bd0064e49e6062d3295328604d96e355779a766075d5ae10764
+SIZE (KDE/applications/19.08.0/sweeper-19.08.0.tar.xz) = 368892
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index a2acde7e9a73..88c2215a9cc0 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 VERSIONS=		39 314 315 317 318 319 320 321 322
-SYSLOG_NG_VERSION?=	321
+SYSLOG_NG_VERSION?=	322
 
 MASTERDIR=		${.CURDIR}/../syslog-ng${SYSLOG_NG_VERSION}
 
diff --git a/sysutils/syslog-ng310/Makefile b/sysutils/syslog-ng310/Makefile
index 4a5f4142ae4d..94e323f84cf3 100644
--- a/sysutils/syslog-ng310/Makefile
+++ b/sysutils/syslog-ng310/Makefile
@@ -102,6 +102,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -144,6 +145,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng311/Makefile b/sysutils/syslog-ng311/Makefile
index d7e793d9d573..1e74adcd0d9c 100644
--- a/sysutils/syslog-ng311/Makefile
+++ b/sysutils/syslog-ng311/Makefile
@@ -108,6 +108,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -150,6 +151,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng312/Makefile b/sysutils/syslog-ng312/Makefile
index 5916bba4fc41..bf9e9aa390cb 100644
--- a/sysutils/syslog-ng312/Makefile
+++ b/sysutils/syslog-ng312/Makefile
@@ -109,6 +109,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -151,6 +152,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng313/Makefile b/sysutils/syslog-ng313/Makefile
index 49129c5b3803..fb7a522824a4 100644
--- a/sysutils/syslog-ng313/Makefile
+++ b/sysutils/syslog-ng313/Makefile
@@ -110,6 +110,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -152,6 +153,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng314/Makefile b/sysutils/syslog-ng314/Makefile
index 023d91bc5298..e98c27e7dbb1 100644
--- a/sysutils/syslog-ng314/Makefile
+++ b/sysutils/syslog-ng314/Makefile
@@ -110,6 +110,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -152,6 +153,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng315/Makefile b/sysutils/syslog-ng315/Makefile
index 20c8e57ee357..2722690ecfe3 100644
--- a/sysutils/syslog-ng315/Makefile
+++ b/sysutils/syslog-ng315/Makefile
@@ -107,6 +107,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -188,6 +189,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng317/Makefile b/sysutils/syslog-ng317/Makefile
index 351d7f63ddda..cca058e99f82 100644
--- a/sysutils/syslog-ng317/Makefile
+++ b/sysutils/syslog-ng317/Makefile
@@ -108,6 +108,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -193,6 +194,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng318/Makefile b/sysutils/syslog-ng318/Makefile
index 6f32899f9314..b204da5ff4d5 100644
--- a/sysutils/syslog-ng318/Makefile
+++ b/sysutils/syslog-ng318/Makefile
@@ -110,6 +110,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -195,6 +196,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng319/Makefile b/sysutils/syslog-ng319/Makefile
index 56af9c62b49a..c25eb82307fa 100644
--- a/sysutils/syslog-ng319/Makefile
+++ b/sysutils/syslog-ng319/Makefile
@@ -110,6 +110,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -195,6 +196,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng320/Makefile b/sysutils/syslog-ng320/Makefile
index 824d33844de1..a399eed19e3a 100644
--- a/sysutils/syslog-ng320/Makefile
+++ b/sysutils/syslog-ng320/Makefile
@@ -111,6 +111,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -200,6 +201,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng321/Makefile b/sysutils/syslog-ng321/Makefile
index ef94bffc6de3..d7f2f0f9ce8f 100644
--- a/sysutils/syslog-ng321/Makefile
+++ b/sysutils/syslog-ng321/Makefile
@@ -112,6 +112,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -206,6 +207,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng322/Makefile b/sysutils/syslog-ng322/Makefile
index 60ff8fd84cdb..f6204bb6adc7 100644
--- a/sysutils/syslog-ng322/Makefile
+++ b/sysutils/syslog-ng322/Makefile
@@ -117,6 +117,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
@@ -211,6 +212,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/syslog-ng39/Makefile b/sysutils/syslog-ng39/Makefile
index 64f5f6c27f14..d6d014224ff6 100644
--- a/sysutils/syslog-ng39/Makefile
+++ b/sysutils/syslog-ng39/Makefile
@@ -99,6 +99,7 @@ JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
+JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 # JAVA_MOD_BROKEN=		Unsupported maven downloads.
 JAVA_MOD_USE=			JAVA=yes
@@ -142,6 +143,9 @@ post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	@${CP} ${WRKSRC}/scl/scl.conf ${WRKSRC}/scl/scl.conf.sample
 
+post-patch-JAVA_MOD-on:
+	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
+
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
diff --git a/sysutils/terraform-provider-vultr/Makefile b/sysutils/terraform-provider-vultr/Makefile
new file mode 100644
index 000000000000..8bf5ff990c8a
--- /dev/null
+++ b/sysutils/terraform-provider-vultr/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	terraform-provider-vultr
+PORTVERSION=	0.1.10
+DISTVERSIONPREFIX=	v
+CATEGORIES=	sysutils
+
+MAINTAINER=	woodsb02@FreeBSD.org
+COMMENT=	Terraform provider for Vultr
+
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	terraform:sysutils/terraform
+
+USES=		go
+GO_PKGNAME=	github.com/${GH_ACCOUNT}/${PORTNAME}
+USE_GITHUB=	yes
+GH_ACCOUNT=	squat
+
+PLIST_FILES=	bin/${PORTNAME}
+
+.include <bsd.port.mk>
diff --git a/sysutils/terraform-provider-vultr/distinfo b/sysutils/terraform-provider-vultr/distinfo
new file mode 100644
index 000000000000..7a9a53863f95
--- /dev/null
+++ b/sysutils/terraform-provider-vultr/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1566611069
+SHA256 (squat-terraform-provider-vultr-v0.1.10_GH0.tar.gz) = ed4e874cbe1a7f3f163dbfdedc436c7443bede5f8aeabc2857f50dfcf1e2ed3f
+SIZE (squat-terraform-provider-vultr-v0.1.10_GH0.tar.gz) = 4297187
diff --git a/sysutils/terraform-provider-vultr/pkg-descr b/sysutils/terraform-provider-vultr/pkg-descr
new file mode 100644
index 000000000000..2564475bc30c
--- /dev/null
+++ b/sysutils/terraform-provider-vultr/pkg-descr
@@ -0,0 +1,10 @@
+A community developed provider to support the Vultr cloud with Terraform.
+
+Terraform is used to create, manage, and update infrastructure resources such as
+physical machines, VMs, network switches, containers, and more.
+Almost any infrastructure type can be represented as a resource in Terraform.
+
+A provider is responsible for understanding API interactions and exposing
+resources. Providers generally are an IaaS, PaaS, or SaaS services.
+
+WWW: https://github.com/squat/terraform-provider-vultr
diff --git a/sysutils/twmn/Makefile b/sysutils/twmn/Makefile
index 851dd78307a1..fc266dae1021 100644
--- a/sysutils/twmn/Makefile
+++ b/sysutils/twmn/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	twmn
 PORTVERSION=	g20171216
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	sysutils
 
 MAINTAINER=	dg@syrec.org
diff --git a/sysutils/usbtop/Makefile b/sysutils/usbtop/Makefile
index 49deb1ff57b0..161a2873c219 100644
--- a/sysutils/usbtop/Makefile
+++ b/sysutils/usbtop/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	usbtop
 DISTVERSIONPREFIX=	release-
 DISTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 
 MAINTAINER=	yuri@FreeBSD.org
diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index 0721f287a32b..c65db37d5410 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	usermin
-PORTVERSION=	1.750
+PORTVERSION=	1.780
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf \
diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo
index 904a7136c7a6..1d422151fd55 100644
--- a/sysutils/usermin/distinfo
+++ b/sysutils/usermin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549736295
-SHA256 (usermin-1.750.tar.gz) = ed2fe3885b651e45dd8c8938a732d81793bcc32111e135088c7f5d72a921ebf9
-SIZE (usermin-1.750.tar.gz) = 15798892
+TIMESTAMP = 1566166759
+SHA256 (usermin-1.780.tar.gz) = 6fc147e339106dbf3db5596b8712bf39a7e7181a15d329cad2b86e856fa7bc36
+SIZE (usermin-1.780.tar.gz) = 17676345
diff --git a/sysutils/usermin/pkg-plist b/sysutils/usermin/pkg-plist
index d95bbadaea7a..8898eeb1523c 100644
--- a/sysutils/usermin/pkg-plist
+++ b/sysutils/usermin/pkg-plist
@@ -1,3 +1,4 @@
+lib/usermin/JSON/PP.pm
 lib/usermin/LICENCE
 lib/usermin/LICENCE.ja
 lib/usermin/README
@@ -84,7 +85,6 @@ lib/usermin/at/delete_jobs.cgi
 lib/usermin/at/edit_job.cgi
 lib/usermin/at/freebsd-lib.pl
 lib/usermin/at/images/icon.gif
-lib/usermin/at/images/smallicon.gif
 lib/usermin/at/index.cgi
 lib/usermin/at/irix-lib.pl
 lib/usermin/at/lang/bg
@@ -137,20 +137,29 @@ lib/usermin/at/lang/zh_TW.UTF-8
 lib/usermin/at/linux-lib.pl
 lib/usermin/at/module.info
 lib/usermin/at/module.info.ca
+lib/usermin/at/module.info.ca.UTF-8
 lib/usermin/at/module.info.cz
 lib/usermin/at/module.info.cz.UTF-8
 lib/usermin/at/module.info.de
+lib/usermin/at/module.info.de.UTF-8
 lib/usermin/at/module.info.el
 lib/usermin/at/module.info.es
+lib/usermin/at/module.info.es.UTF-8
 lib/usermin/at/module.info.fr
+lib/usermin/at/module.info.fr.UTF-8
 lib/usermin/at/module.info.hu
 lib/usermin/at/module.info.hu.UTF-8
 lib/usermin/at/module.info.nl
+lib/usermin/at/module.info.nl.UTF-8
 lib/usermin/at/module.info.no
 lib/usermin/at/module.info.no.UTF-8
 lib/usermin/at/module.info.pl
 lib/usermin/at/module.info.pl.UTF-8
 lib/usermin/at/solaris-lib.pl
+lib/usermin/authentic-theme/401.cgi
+lib/usermin/authentic-theme/403.cgi
+lib/usermin/authentic-theme/404.cgi
+lib/usermin/authentic-theme/FUNDING.yml
 lib/usermin/authentic-theme/LICENSE
 lib/usermin/authentic-theme/THEME.pgp
 lib/usermin/authentic-theme/authentic-funcs.pm
@@ -159,8 +168,11 @@ lib/usermin/authentic-theme/authentic-lib.pm
 lib/usermin/authentic-theme/authentic.pm
 lib/usermin/authentic-theme/buttons.pm
 lib/usermin/authentic-theme/config
+lib/usermin/authentic-theme/extensions/csf/csf-lib.pm
 lib/usermin/authentic-theme/extensions/csf/csf.min.css
+lib/usermin/authentic-theme/extensions/csf/csf.min.css.gz
 lib/usermin/authentic-theme/extensions/csf/csf.min.js
+lib/usermin/authentic-theme/extensions/csf/csf.min.js.gz
 lib/usermin/authentic-theme/extensions/file-manager/bookmark.cgi
 lib/usermin/authentic-theme/extensions/file-manager/chattr.cgi
 lib/usermin/authentic-theme/extensions/file-manager/chcon.cgi
@@ -178,7 +190,12 @@ lib/usermin/authentic-theme/extensions/file-manager/extract.cgi
 lib/usermin/authentic-theme/extensions/file-manager/fetcher.cgi
 lib/usermin/authentic-theme/extensions/file-manager/file-manager-lib.pm
 lib/usermin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js
+lib/usermin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.gz
 lib/usermin/authentic-theme/extensions/file-manager/file-manager.min.js
+lib/usermin/authentic-theme/extensions/file-manager/file-manager.min.js.gz
+lib/usermin/authentic-theme/extensions/file-manager/gpg.cgi
+lib/usermin/authentic-theme/extensions/file-manager/http_download.cgi
+lib/usermin/authentic-theme/extensions/file-manager/list-images.cgi
 lib/usermin/authentic-theme/extensions/file-manager/list.cgi
 lib/usermin/authentic-theme/extensions/file-manager/paste.cgi
 lib/usermin/authentic-theme/extensions/file-manager/rename.cgi
@@ -187,14 +204,18 @@ lib/usermin/authentic-theme/extensions/file-manager/tree.cgi
 lib/usermin/authentic-theme/extensions/mail/folders.cgi
 lib/usermin/authentic-theme/extensions/mail/mail-lib.pm
 lib/usermin/authentic-theme/extensions/mail/mail.min.css
+lib/usermin/authentic-theme/extensions/mail/mail.min.css.gz
 lib/usermin/authentic-theme/extensions/mail/mail.min.js
+lib/usermin/authentic-theme/extensions/mail/mail.min.js.gz
 lib/usermin/authentic-theme/extensions/mail/mail.src.js
 lib/usermin/authentic-theme/extensions/mail/message.cgi
 lib/usermin/authentic-theme/extensions/mail/messages.cgi
 lib/usermin/authentic-theme/extensions/mail/search.cgi
 lib/usermin/authentic-theme/extensions/sql.min.js
+lib/usermin/authentic-theme/extensions/sql.min.js.gz
 lib/usermin/authentic-theme/extensions/stats/stats.min.css
 lib/usermin/authentic-theme/extensions/stats/stats.min.js
+lib/usermin/authentic-theme/extensions/stats/stats.min.js.gz
 lib/usermin/authentic-theme/extensions/stats/stats.src.css
 lib/usermin/authentic-theme/extensions/stats/stats.src.js
 lib/usermin/authentic-theme/help/editor.ca.UTF-8.html
@@ -254,13 +275,13 @@ lib/usermin/authentic-theme/images/favicons/cloudmin/browserconfig.xml
 lib/usermin/authentic-theme/images/favicons/cloudmin/favicon-16x16.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/favicon-32x32.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/favicon.ico
+lib/usermin/authentic-theme/images/favicons/cloudmin/manifest.json
 lib/usermin/authentic-theme/images/favicons/cloudmin/mstile-144x144.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/mstile-150x150.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/mstile-310x150.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/mstile-310x310.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/mstile-70x70.png
 lib/usermin/authentic-theme/images/favicons/cloudmin/safari-pinned-tab.svg
-lib/usermin/authentic-theme/images/favicons/cloudmin/site.webmanifest
 lib/usermin/authentic-theme/images/favicons/usermin/android-chrome-144x144.png
 lib/usermin/authentic-theme/images/favicons/usermin/android-chrome-192x192.png
 lib/usermin/authentic-theme/images/favicons/usermin/android-chrome-256x256.png
@@ -284,13 +305,13 @@ lib/usermin/authentic-theme/images/favicons/usermin/browserconfig.xml
 lib/usermin/authentic-theme/images/favicons/usermin/favicon-16x16.png
 lib/usermin/authentic-theme/images/favicons/usermin/favicon-32x32.png
 lib/usermin/authentic-theme/images/favicons/usermin/favicon.ico
+lib/usermin/authentic-theme/images/favicons/usermin/manifest.json
 lib/usermin/authentic-theme/images/favicons/usermin/mstile-144x144.png
 lib/usermin/authentic-theme/images/favicons/usermin/mstile-150x150.png
 lib/usermin/authentic-theme/images/favicons/usermin/mstile-310x150.png
 lib/usermin/authentic-theme/images/favicons/usermin/mstile-310x310.png
 lib/usermin/authentic-theme/images/favicons/usermin/mstile-70x70.png
 lib/usermin/authentic-theme/images/favicons/usermin/safari-pinned-tab.svg
-lib/usermin/authentic-theme/images/favicons/usermin/site.webmanifest
 lib/usermin/authentic-theme/images/favicons/virtualmin/android-chrome-144x144.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/android-chrome-192x192.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/android-chrome-256x256.png
@@ -314,13 +335,13 @@ lib/usermin/authentic-theme/images/favicons/virtualmin/browserconfig.xml
 lib/usermin/authentic-theme/images/favicons/virtualmin/favicon-16x16.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/favicon-32x32.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/favicon.ico
+lib/usermin/authentic-theme/images/favicons/virtualmin/manifest.json
 lib/usermin/authentic-theme/images/favicons/virtualmin/mstile-144x144.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/mstile-150x150.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/mstile-310x150.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/mstile-310x310.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/mstile-70x70.png
 lib/usermin/authentic-theme/images/favicons/virtualmin/safari-pinned-tab.svg
-lib/usermin/authentic-theme/images/favicons/virtualmin/site.webmanifest
 lib/usermin/authentic-theme/images/favicons/webmin/android-chrome-144x144.png
 lib/usermin/authentic-theme/images/favicons/webmin/android-chrome-192x192.png
 lib/usermin/authentic-theme/images/favicons/webmin/android-chrome-256x256.png
@@ -344,13 +365,13 @@ lib/usermin/authentic-theme/images/favicons/webmin/browserconfig.xml
 lib/usermin/authentic-theme/images/favicons/webmin/favicon-16x16.png
 lib/usermin/authentic-theme/images/favicons/webmin/favicon-32x32.png
 lib/usermin/authentic-theme/images/favicons/webmin/favicon.ico
+lib/usermin/authentic-theme/images/favicons/webmin/manifest.json
 lib/usermin/authentic-theme/images/favicons/webmin/mstile-144x144.png
 lib/usermin/authentic-theme/images/favicons/webmin/mstile-150x150.png
 lib/usermin/authentic-theme/images/favicons/webmin/mstile-310x150.png
 lib/usermin/authentic-theme/images/favicons/webmin/mstile-310x310.png
 lib/usermin/authentic-theme/images/favicons/webmin/mstile-70x70.png
 lib/usermin/authentic-theme/images/favicons/webmin/safari-pinned-tab.svg
-lib/usermin/authentic-theme/images/favicons/webmin/site.webmanifest
 lib/usermin/authentic-theme/images/filter.gif
 lib/usermin/authentic-theme/images/first-grey.gif
 lib/usermin/authentic-theme/images/first.gif
@@ -1114,6 +1135,8 @@ lib/usermin/authentic-theme/images/notifications_authentic_remote_version.png
 lib/usermin/authentic-theme/images/notifications_csf_deny.png
 lib/usermin/authentic-theme/images/notifications_csf_remote_version.png
 lib/usermin/authentic-theme/images/notifications_package_message.png
+lib/usermin/authentic-theme/images/notifications_usermin.png
+lib/usermin/authentic-theme/images/notifications_webmin.png
 lib/usermin/authentic-theme/images/ok.gif
 lib/usermin/authentic-theme/images/open.gif
 lib/usermin/authentic-theme/images/p1.gif
@@ -1129,7 +1152,6 @@ lib/usermin/authentic-theme/images/right-grey.gif
 lib/usermin/authentic-theme/images/right.gif
 lib/usermin/authentic-theme/images/screenshot.png
 lib/usermin/authentic-theme/images/search.gif
-lib/usermin/authentic-theme/images/smallicon.gif
 lib/usermin/authentic-theme/images/sort_asc.png
 lib/usermin/authentic-theme/images/sort_asc_disabled.png
 lib/usermin/authentic-theme/images/sort_both.png
@@ -1204,6 +1226,8 @@ lib/usermin/authentic-theme/password_form.cgi
 lib/usermin/authentic-theme/session_login.cgi
 lib/usermin/authentic-theme/settings-backgrounds.cgi
 lib/usermin/authentic-theme/settings-backgrounds_save.cgi
+lib/usermin/authentic-theme/settings-editor_favorites_read.cgi
+lib/usermin/authentic-theme/settings-editor_favorites_write.cgi
 lib/usermin/authentic-theme/settings-editor_read.cgi
 lib/usermin/authentic-theme/settings-editor_write.cgi
 lib/usermin/authentic-theme/settings-favorites_save.cgi
@@ -1216,6 +1240,7 @@ lib/usermin/authentic-theme/sysinfo.cgi
 lib/usermin/authentic-theme/theme-update.sh
 lib/usermin/authentic-theme/theme.info
 lib/usermin/authentic-theme/unauthenticated/css/bundle.min.css
+lib/usermin/authentic-theme/unauthenticated/css/bundle.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/css/font-arial.min.css
 lib/usermin/authentic-theme/unauthenticated/css/font-helvetica-neue.min.css
 lib/usermin/authentic-theme/unauthenticated/css/font-open-sans-condensed.min.css
@@ -1226,9 +1251,12 @@ lib/usermin/authentic-theme/unauthenticated/css/font-system-default.min.css
 lib/usermin/authentic-theme/unauthenticated/css/font-tahoma.min.css
 lib/usermin/authentic-theme/unauthenticated/css/font-trebuchet-ms.min.css
 lib/usermin/authentic-theme/unauthenticated/css/fonts-roboto.min.css
+lib/usermin/authentic-theme/unauthenticated/css/fonts-roboto.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/css/high-contrast.min.css
 lib/usermin/authentic-theme/unauthenticated/css/jquery.fancytree.min.css
+lib/usermin/authentic-theme/unauthenticated/css/jquery.fancytree.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/css/jquery.jspanel.min.css
+lib/usermin/authentic-theme/unauthenticated/css/jquery.jspanel.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/css/palettes/brown.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/darkblue.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/darkgrey.min.css
@@ -1239,33 +1267,59 @@ lib/usermin/authentic-theme/unauthenticated/css/palettes/gunmetal.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/indianred.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/lightblue.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/nightrider.min.css
+lib/usermin/authentic-theme/unauthenticated/css/palettes/nightrider.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/css/palettes/noir.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/orange.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/purple.min.css
 lib/usermin/authentic-theme/unauthenticated/css/palettes/red.min.css
+lib/usermin/authentic-theme/unauthenticated/css/palettes/white.min.css
+lib/usermin/authentic-theme/unauthenticated/css/photoswipe.min.css
+lib/usermin/authentic-theme/unauthenticated/css/photoswipe.min.css.gz
 lib/usermin/authentic-theme/unauthenticated/js/bundle.min.js
+lib/usermin/authentic-theme/unauthenticated/js/bundle.min.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/adapters/jquery.js
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/ckeditor.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/ckeditor.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/config.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/config.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/contents.css
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/contents.css.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ca.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ca.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/cs.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/cs.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/da.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/da.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/de.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/de.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/en.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/en.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/es.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/es.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/fr.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/fr.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/id.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/id.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/it.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/it.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/nl.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/nl.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/no.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/no.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/pl.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/pl.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/pt.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/pt.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ro.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ro.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ru.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/ru.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/sq.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/sq.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/sv.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/sv.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/zh-cn.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/lang/zh-cn.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/base64image/dialogs/base64image.js
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/colordialog/dialogs/colordialog.css
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -1320,7 +1374,9 @@ lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/table/dialogs/ta
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/plugins/wordcount/css/wordcount.css
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/dialog.css
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/dialog.css.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/editor.css
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/editor.css.gz
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/icons.png
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/icons_hidpi.png
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/arrow.png
@@ -1333,6 +1389,7 @@ lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/lock.png
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/refresh.png
 lib/usermin/authentic-theme/unauthenticated/js/ckeditor/styles.js
+lib/usermin/authentic-theme/unauthenticated/js/ckeditor/styles.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/apl/apl.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/asciiarmor/asciiarmor.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/asn.1/asn.1.js
@@ -1341,6 +1398,7 @@ lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/brainfuck/brainfu
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/clike/clike.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/clike/test.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/clojure/clojure.js
+lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/clojure/test.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/cmake/cmake.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/cobol/cobol.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/coffeescript/coffeescript.js
@@ -1359,6 +1417,7 @@ lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dart/dart.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/diff/diff.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/django/django.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dockerfile/dockerfile.js
+lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dockerfile/test.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dtd/dtd.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dylan/dylan.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/dylan/test.js
@@ -1399,7 +1458,6 @@ lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/markdown/markdown
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/markdown/test.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/mathematica/mathematica.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/mbox/mbox.js
-lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/meta.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/mirc/mirc.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/mllike/mllike.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/modelica/modelica.js
@@ -1486,9 +1544,15 @@ lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/yacas/yacas.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/yaml/yaml.js
 lib/usermin/authentic-theme/unauthenticated/js/codemirror/mode/z80/z80.js
+lib/usermin/authentic-theme/unauthenticated/js/defaults.js
 lib/usermin/authentic-theme/unauthenticated/js/detector.min.js
+lib/usermin/authentic-theme/unauthenticated/js/detector.min.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/jquery.fancytree.min.js
+lib/usermin/authentic-theme/unauthenticated/js/jquery.fancytree.min.js.gz
 lib/usermin/authentic-theme/unauthenticated/js/jquery.jspanel.min.js
+lib/usermin/authentic-theme/unauthenticated/js/jquery.jspanel.min.js.gz
+lib/usermin/authentic-theme/unauthenticated/js/photoswipe.min.js
+lib/usermin/authentic-theme/unauthenticated/js/photoswipe.min.js.gz
 lib/usermin/blue-theme/CHANGELOG
 lib/usermin/blue-theme/acl/images/convert.gif
 lib/usermin/blue-theme/acl/images/icon.gif
@@ -2339,22 +2403,28 @@ lib/usermin/changepass/lang/zh_TW.UTF-8
 lib/usermin/changepass/md5-lib.pl
 lib/usermin/changepass/module.info
 lib/usermin/changepass/module.info.ca
+lib/usermin/changepass/module.info.ca.UTF-8
 lib/usermin/changepass/module.info.cz
 lib/usermin/changepass/module.info.cz.UTF-8
 lib/usermin/changepass/module.info.de
+lib/usermin/changepass/module.info.de.UTF-8
 lib/usermin/changepass/module.info.el
 lib/usermin/changepass/module.info.es
+lib/usermin/changepass/module.info.es.UTF-8
 lib/usermin/changepass/module.info.fr
+lib/usermin/changepass/module.info.fr.UTF-8
 lib/usermin/changepass/module.info.hu
 lib/usermin/changepass/module.info.hu.UTF-8
 lib/usermin/changepass/module.info.ja_JP.UTF-8
 lib/usermin/changepass/module.info.ja_JP.euc
 lib/usermin/changepass/module.info.nl
+lib/usermin/changepass/module.info.nl.UTF-8
 lib/usermin/changepass/module.info.no
 lib/usermin/changepass/module.info.no.UTF-8
 lib/usermin/changepass/module.info.pl
 lib/usermin/changepass/module.info.pl.UTF-8
 lib/usermin/changepass/module.info.pt_BR
+lib/usermin/changepass/module.info.pt_BR.UTF-8
 lib/usermin/changepass/module.info.ru.UTF-8
 lib/usermin/changepass/module.info.ru_RU
 lib/usermin/changepass/module.info.ru_RU.UTF-8
@@ -2409,16 +2479,20 @@ lib/usermin/chfn/lang/tr
 lib/usermin/chfn/linux-lib.pl
 lib/usermin/chfn/module.info
 lib/usermin/chfn/module.info.ca
+lib/usermin/chfn/module.info.ca.UTF-8
 lib/usermin/chfn/module.info.cz
 lib/usermin/chfn/module.info.cz.UTF-8
 lib/usermin/chfn/module.info.de
+lib/usermin/chfn/module.info.de.UTF-8
 lib/usermin/chfn/module.info.el
 lib/usermin/chfn/module.info.fr
+lib/usermin/chfn/module.info.fr.UTF-8
 lib/usermin/chfn/module.info.hu
 lib/usermin/chfn/module.info.hu.UTF-8
 lib/usermin/chfn/module.info.ja_JP.UTF-8
 lib/usermin/chfn/module.info.ja_JP.euc
 lib/usermin/chfn/module.info.nl
+lib/usermin/chfn/module.info.nl.UTF-8
 lib/usermin/chfn/module.info.no
 lib/usermin/chfn/module.info.no.UTF-8
 lib/usermin/chfn/module.info.ru.UTF-8
@@ -2442,7 +2516,6 @@ lib/usermin/commands/config.info.nl.UTF-8
 lib/usermin/commands/custom-lib.pl
 lib/usermin/commands/form.cgi
 lib/usermin/commands/images/icon.gif
-lib/usermin/commands/images/smallicon.gif
 lib/usermin/commands/index.cgi
 lib/usermin/commands/lang/ca
 lib/usermin/commands/lang/ca.UTF-8
@@ -2493,12 +2566,16 @@ lib/usermin/commands/lang/zh_TW.Big5
 lib/usermin/commands/lang/zh_TW.UTF-8
 lib/usermin/commands/module.info
 lib/usermin/commands/module.info.ca
+lib/usermin/commands/module.info.ca.UTF-8
 lib/usermin/commands/module.info.cz
 lib/usermin/commands/module.info.cz.UTF-8
 lib/usermin/commands/module.info.de
+lib/usermin/commands/module.info.de.UTF-8
 lib/usermin/commands/module.info.el
 lib/usermin/commands/module.info.es
+lib/usermin/commands/module.info.es.UTF-8
 lib/usermin/commands/module.info.fr
+lib/usermin/commands/module.info.fr.UTF-8
 lib/usermin/commands/module.info.hu
 lib/usermin/commands/module.info.hu.UTF-8
 lib/usermin/commands/module.info.ja_JP.UTF-8
@@ -2506,16 +2583,19 @@ lib/usermin/commands/module.info.ja_JP.euc
 lib/usermin/commands/module.info.ko_KR.UTF-8
 lib/usermin/commands/module.info.ko_KR.euc
 lib/usermin/commands/module.info.nl
+lib/usermin/commands/module.info.nl.UTF-8
 lib/usermin/commands/module.info.no
 lib/usermin/commands/module.info.no.UTF-8
 lib/usermin/commands/module.info.pl
 lib/usermin/commands/module.info.pl.UTF-8
 lib/usermin/commands/module.info.pt
+lib/usermin/commands/module.info.pt.UTF-8
 lib/usermin/commands/module.info.ru.UTF-8
 lib/usermin/commands/module.info.ru_RU
 lib/usermin/commands/module.info.ru_RU.UTF-8
 lib/usermin/commands/module.info.ru_SU
 lib/usermin/commands/module.info.sv
+lib/usermin/commands/module.info.sv.UTF-8
 lib/usermin/commands/module.info.tr
 lib/usermin/commands/module.info.zh_CN
 lib/usermin/commands/module.info.zh_TW.Big5
@@ -2681,7 +2761,6 @@ lib/usermin/cron/images/bottom.gif
 lib/usermin/cron/images/down.gif
 lib/usermin/cron/images/gap.gif
 lib/usermin/cron/images/icon.gif
-lib/usermin/cron/images/smallicon.gif
 lib/usermin/cron/images/top.gif
 lib/usermin/cron/images/up.gif
 lib/usermin/cron/index.cgi
@@ -2740,14 +2819,18 @@ lib/usermin/cron/lang/zh_TW.Big5
 lib/usermin/cron/lang/zh_TW.UTF-8
 lib/usermin/cron/module.info
 lib/usermin/cron/module.info.ca
+lib/usermin/cron/module.info.ca.UTF-8
 lib/usermin/cron/module.info.cz
 lib/usermin/cron/module.info.cz.UTF-8
 lib/usermin/cron/module.info.de
+lib/usermin/cron/module.info.de.UTF-8
 lib/usermin/cron/module.info.el
 lib/usermin/cron/module.info.fr
+lib/usermin/cron/module.info.fr.UTF-8
 lib/usermin/cron/module.info.hu
 lib/usermin/cron/module.info.hu.UTF-8
 lib/usermin/cron/module.info.nl
+lib/usermin/cron/module.info.nl.UTF-8
 lib/usermin/cron/module.info.no
 lib/usermin/cron/module.info.no.UTF-8
 lib/usermin/cron/module.info.pl
@@ -2787,14 +2870,17 @@ lib/usermin/cshrc/lang/ru_RU.UTF-8
 lib/usermin/cshrc/lang/tr
 lib/usermin/cshrc/module.info
 lib/usermin/cshrc/module.info.ca
+lib/usermin/cshrc/module.info.ca.UTF-8
 lib/usermin/cshrc/module.info.cz
 lib/usermin/cshrc/module.info.cz.UTF-8
 lib/usermin/cshrc/module.info.de
+lib/usermin/cshrc/module.info.de.UTF-8
 lib/usermin/cshrc/module.info.hu
 lib/usermin/cshrc/module.info.hu.UTF-8
 lib/usermin/cshrc/module.info.ja_JP.UTF-8
 lib/usermin/cshrc/module.info.ja_JP.euc
 lib/usermin/cshrc/module.info.nl
+lib/usermin/cshrc/module.info.nl.UTF-8
 lib/usermin/cshrc/module.info.no
 lib/usermin/cshrc/module.info.no.UTF-8
 lib/usermin/cshrc/save_cshrc.cgi
@@ -2828,7 +2914,6 @@ lib/usermin/fetchmail/fetchmail-lib.pl
 lib/usermin/fetchmail/images/hand.png
 lib/usermin/fetchmail/images/icon.gif
 lib/usermin/fetchmail/images/old.gif
-lib/usermin/fetchmail/images/smallicon.gif
 lib/usermin/fetchmail/index.cgi
 lib/usermin/fetchmail/lang/bg
 lib/usermin/fetchmail/lang/bg.UTF-8
@@ -2868,14 +2953,17 @@ lib/usermin/fetchmail/lang/zh_TW.Big5
 lib/usermin/fetchmail/lang/zh_TW.UTF-8
 lib/usermin/fetchmail/module.info
 lib/usermin/fetchmail/module.info.ca
+lib/usermin/fetchmail/module.info.ca.UTF-8
 lib/usermin/fetchmail/module.info.cz
 lib/usermin/fetchmail/module.info.cz.UTF-8
 lib/usermin/fetchmail/module.info.de
+lib/usermin/fetchmail/module.info.de.UTF-8
 lib/usermin/fetchmail/module.info.hu
 lib/usermin/fetchmail/module.info.hu.UTF-8
 lib/usermin/fetchmail/module.info.ja_JP.UTF-8
 lib/usermin/fetchmail/module.info.ja_JP.euc
 lib/usermin/fetchmail/module.info.nl
+lib/usermin/fetchmail/module.info.nl.UTF-8
 lib/usermin/fetchmail/module.info.no
 lib/usermin/fetchmail/module.info.no.UTF-8
 lib/usermin/fetchmail/module.info.pl
@@ -2959,7 +3047,6 @@ lib/usermin/file/images/save.gif
 lib/usermin/file/images/sdir.gif
 lib/usermin/file/images/search.gif
 lib/usermin/file/images/share.gif
-lib/usermin/file/images/smallicon.gif
 lib/usermin/file/images/smdir.gif
 lib/usermin/file/images/sub.gif
 lib/usermin/file/images/sudir.gif
@@ -3027,12 +3114,16 @@ lib/usermin/file/makelink.cgi
 lib/usermin/file/mkdir.cgi
 lib/usermin/file/module.info
 lib/usermin/file/module.info.ca
+lib/usermin/file/module.info.ca.UTF-8
 lib/usermin/file/module.info.cz
 lib/usermin/file/module.info.cz.UTF-8
 lib/usermin/file/module.info.de
+lib/usermin/file/module.info.de.UTF-8
 lib/usermin/file/module.info.el
 lib/usermin/file/module.info.es
+lib/usermin/file/module.info.es.UTF-8
 lib/usermin/file/module.info.fr
+lib/usermin/file/module.info.fr.UTF-8
 lib/usermin/file/module.info.hu
 lib/usermin/file/module.info.hu.UTF-8
 lib/usermin/file/module.info.ja_JP.UTF-8
@@ -3040,16 +3131,19 @@ lib/usermin/file/module.info.ja_JP.euc
 lib/usermin/file/module.info.ko_KR.UTF-8
 lib/usermin/file/module.info.ko_KR.euc
 lib/usermin/file/module.info.nl
+lib/usermin/file/module.info.nl.UTF-8
 lib/usermin/file/module.info.no
 lib/usermin/file/module.info.no.UTF-8
 lib/usermin/file/module.info.pl
 lib/usermin/file/module.info.pl.UTF-8
 lib/usermin/file/module.info.pt
+lib/usermin/file/module.info.pt.UTF-8
 lib/usermin/file/module.info.ru.UTF-8
 lib/usermin/file/module.info.ru_RU
 lib/usermin/file/module.info.ru_RU.UTF-8
 lib/usermin/file/module.info.ru_SU
 lib/usermin/file/module.info.sv
+lib/usermin/file/module.info.sv.UTF-8
 lib/usermin/file/module.info.tr
 lib/usermin/file/module.info.zh_CN
 lib/usermin/file/module.info.zh_TW.Big5
@@ -3629,7 +3723,6 @@ lib/usermin/filemin/images/icons/quick/remove.png
 lib/usermin/filemin/images/icons/quick/rename.png
 lib/usermin/filemin/images/icons/quick/select-all.png
 lib/usermin/filemin/images/icons/quick/upload.png
-lib/usermin/filemin/images/smallicon.gif
 lib/usermin/filemin/index.cgi
 lib/usermin/filemin/lang/ar
 lib/usermin/filemin/lang/ca
@@ -3640,13 +3733,13 @@ lib/usermin/filemin/lang/en
 lib/usermin/filemin/lang/en.UTF-8
 lib/usermin/filemin/lang/no
 lib/usermin/filemin/lang/no.UTF-8
-lib/usermin/filemin/lang/ru.UTF-8
 lib/usermin/filemin/lib/File/BaseDir.pm
 lib/usermin/filemin/lib/File/Basename.pm
 lib/usermin/filemin/lib/File/MimeInfo.pm
 lib/usermin/filemin/module.info
 lib/usermin/filemin/module.info.ar
 lib/usermin/filemin/module.info.ca
+lib/usermin/filemin/module.info.ca.UTF-8
 lib/usermin/filemin/module.info.de
 lib/usermin/filemin/module.info.de.UTF-8
 lib/usermin/filemin/module.info.no
@@ -4070,7 +4163,6 @@ lib/usermin/filter/filter-lib.pl
 lib/usermin/filter/images/down.gif
 lib/usermin/filter/images/gap.gif
 lib/usermin/filter/images/icon.gif
-lib/usermin/filter/images/smallicon.gif
 lib/usermin/filter/images/up.gif
 lib/usermin/filter/index.cgi
 lib/usermin/filter/lang/ca
@@ -4094,6 +4186,7 @@ lib/usermin/filter/lang/pl
 lib/usermin/filter/lang/pl.UTF-8
 lib/usermin/filter/module.info
 lib/usermin/filter/module.info.ca
+lib/usermin/filter/module.info.ca.UTF-8
 lib/usermin/filter/module.info.cz
 lib/usermin/filter/module.info.cz.UTF-8
 lib/usermin/filter/module.info.de
@@ -4101,7 +4194,9 @@ lib/usermin/filter/module.info.de.UTF-8
 lib/usermin/filter/module.info.hu
 lib/usermin/filter/module.info.hu.UTF-8
 lib/usermin/filter/module.info.ms_MY
+lib/usermin/filter/module.info.ms_MY.UTF-8
 lib/usermin/filter/module.info.nl
+lib/usermin/filter/module.info.nl.UTF-8
 lib/usermin/filter/module.info.no
 lib/usermin/filter/module.info.no.UTF-8
 lib/usermin/filter/module.info.pl
@@ -4165,20 +4260,26 @@ lib/usermin/forward/lang/ru_RU.UTF-8
 lib/usermin/forward/lang/tr
 lib/usermin/forward/module.info
 lib/usermin/forward/module.info.ca
+lib/usermin/forward/module.info.ca.UTF-8
 lib/usermin/forward/module.info.cz
 lib/usermin/forward/module.info.cz.UTF-8
 lib/usermin/forward/module.info.de
+lib/usermin/forward/module.info.de.UTF-8
 lib/usermin/forward/module.info.el
 lib/usermin/forward/module.info.es
+lib/usermin/forward/module.info.es.UTF-8
 lib/usermin/forward/module.info.fr
+lib/usermin/forward/module.info.fr.UTF-8
 lib/usermin/forward/module.info.hu
 lib/usermin/forward/module.info.hu.UTF-8
 lib/usermin/forward/module.info.ja_JP.UTF-8
 lib/usermin/forward/module.info.ja_JP.euc
 lib/usermin/forward/module.info.nl
+lib/usermin/forward/module.info.nl.UTF-8
 lib/usermin/forward/module.info.no
 lib/usermin/forward/module.info.no.UTF-8
 lib/usermin/forward/module.info.pt_BR
+lib/usermin/forward/module.info.pt_BR.UTF-8
 lib/usermin/forward/module.info.ru.UTF-8
 lib/usermin/forward/module.info.ru_RU
 lib/usermin/forward/module.info.ru_RU.UTF-8
@@ -4242,14 +4343,19 @@ lib/usermin/gnupg/lang/tr
 lib/usermin/gnupg/list_keys.cgi
 lib/usermin/gnupg/module.info
 lib/usermin/gnupg/module.info.ca
+lib/usermin/gnupg/module.info.ca.UTF-8
 lib/usermin/gnupg/module.info.de
+lib/usermin/gnupg/module.info.de.UTF-8
 lib/usermin/gnupg/module.info.es
+lib/usermin/gnupg/module.info.es.UTF-8
 lib/usermin/gnupg/module.info.fr
+lib/usermin/gnupg/module.info.fr.UTF-8
 lib/usermin/gnupg/module.info.hu
 lib/usermin/gnupg/module.info.hu.UTF-8
 lib/usermin/gnupg/module.info.ja_JP.UTF-8
 lib/usermin/gnupg/module.info.ja_JP.euc
 lib/usermin/gnupg/module.info.nl
+lib/usermin/gnupg/module.info.nl.UTF-8
 lib/usermin/gnupg/module.info.no
 lib/usermin/gnupg/module.info.no.UTF-8
 lib/usermin/gnupg/recv.cgi
@@ -5063,7 +5169,6 @@ lib/usermin/htaccess-htpasswd/edit_user.cgi
 lib/usermin/htaccess-htpasswd/htaccess-lib.pl
 lib/usermin/htaccess-htpasswd/htpasswd-file-lib.pl
 lib/usermin/htaccess-htpasswd/images/icon.gif
-lib/usermin/htaccess-htpasswd/images/smallicon.gif
 lib/usermin/htaccess-htpasswd/index.cgi
 lib/usermin/htaccess-htpasswd/lang/bg
 lib/usermin/htaccess-htpasswd/lang/bg.UTF-8
@@ -5102,13 +5207,17 @@ lib/usermin/htaccess-htpasswd/log_parser.pl
 lib/usermin/htaccess-htpasswd/md5-lib.pl
 lib/usermin/htaccess-htpasswd/module.info
 lib/usermin/htaccess-htpasswd/module.info.ca
+lib/usermin/htaccess-htpasswd/module.info.ca.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.cz
 lib/usermin/htaccess-htpasswd/module.info.cz.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.de
+lib/usermin/htaccess-htpasswd/module.info.de.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.fr
+lib/usermin/htaccess-htpasswd/module.info.fr.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.hu
 lib/usermin/htaccess-htpasswd/module.info.hu.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.nl
+lib/usermin/htaccess-htpasswd/module.info.nl.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.no
 lib/usermin/htaccess-htpasswd/module.info.no.UTF-8
 lib/usermin/htaccess-htpasswd/module.info.pl
@@ -5295,12 +5404,15 @@ lib/usermin/htaccess/mod_userdir.pl
 lib/usermin/htaccess/mod_vhost_alias.pl
 lib/usermin/htaccess/module.info
 lib/usermin/htaccess/module.info.ca
+lib/usermin/htaccess/module.info.ca.UTF-8
 lib/usermin/htaccess/module.info.cz
 lib/usermin/htaccess/module.info.cz.UTF-8
 lib/usermin/htaccess/module.info.de
+lib/usermin/htaccess/module.info.de.UTF-8
 lib/usermin/htaccess/module.info.hu
 lib/usermin/htaccess/module.info.hu.UTF-8
 lib/usermin/htaccess/module.info.nl
+lib/usermin/htaccess/module.info.nl.UTF-8
 lib/usermin/htaccess/module.info.no
 lib/usermin/htaccess/module.info.no.UTF-8
 lib/usermin/htaccess/module.info.pl
@@ -5496,17 +5608,22 @@ lib/usermin/language/lang/tr
 lib/usermin/language/language-lib.pl
 lib/usermin/language/module.info
 lib/usermin/language/module.info.ca
+lib/usermin/language/module.info.ca.UTF-8
 lib/usermin/language/module.info.cz
 lib/usermin/language/module.info.cz.UTF-8
 lib/usermin/language/module.info.de
+lib/usermin/language/module.info.de.UTF-8
 lib/usermin/language/module.info.el
 lib/usermin/language/module.info.es
+lib/usermin/language/module.info.es.UTF-8
 lib/usermin/language/module.info.hu
 lib/usermin/language/module.info.hu.UTF-8
 lib/usermin/language/module.info.it
+lib/usermin/language/module.info.it.UTF-8
 lib/usermin/language/module.info.ja_JP.UTF-8
 lib/usermin/language/module.info.ja_JP.euc
 lib/usermin/language/module.info.nl
+lib/usermin/language/module.info.nl.UTF-8
 lib/usermin/language/module.info.no
 lib/usermin/language/module.info.no.UTF-8
 lib/usermin/language/module.info.ru.UTF-8
@@ -5637,15 +5754,20 @@ lib/usermin/mailbox/mail_search.cgi
 lib/usermin/mailbox/mailbox-lib.pl
 lib/usermin/mailbox/module.info
 lib/usermin/mailbox/module.info.ca
+lib/usermin/mailbox/module.info.ca.UTF-8
 lib/usermin/mailbox/module.info.cz
 lib/usermin/mailbox/module.info.cz.UTF-8
 lib/usermin/mailbox/module.info.de
+lib/usermin/mailbox/module.info.de.UTF-8
 lib/usermin/mailbox/module.info.el
 lib/usermin/mailbox/module.info.es
+lib/usermin/mailbox/module.info.es.UTF-8
 lib/usermin/mailbox/module.info.fr
+lib/usermin/mailbox/module.info.fr.UTF-8
 lib/usermin/mailbox/module.info.hu
 lib/usermin/mailbox/module.info.hu.UTF-8
 lib/usermin/mailbox/module.info.nl
+lib/usermin/mailbox/module.info.nl.UTF-8
 lib/usermin/mailbox/module.info.no
 lib/usermin/mailbox/module.info.no.UTF-8
 lib/usermin/mailbox/module.info.ru.UTF-8
@@ -5964,7 +6086,6 @@ lib/usermin/mailcap/defaultuconfig
 lib/usermin/mailcap/delete.cgi
 lib/usermin/mailcap/edit.cgi
 lib/usermin/mailcap/images/icon.gif
-lib/usermin/mailcap/images/smallicon.gif
 lib/usermin/mailcap/index.cgi
 lib/usermin/mailcap/lang/ca
 lib/usermin/mailcap/lang/ca.UTF-8
@@ -5987,12 +6108,15 @@ lib/usermin/mailcap/log_parser.pl
 lib/usermin/mailcap/mailcap-lib.pl
 lib/usermin/mailcap/module.info
 lib/usermin/mailcap/module.info.ca
+lib/usermin/mailcap/module.info.ca.UTF-8
 lib/usermin/mailcap/module.info.cz
 lib/usermin/mailcap/module.info.cz.UTF-8
 lib/usermin/mailcap/module.info.de
+lib/usermin/mailcap/module.info.de.UTF-8
 lib/usermin/mailcap/module.info.hu
 lib/usermin/mailcap/module.info.hu.UTF-8
 lib/usermin/mailcap/module.info.nl
+lib/usermin/mailcap/module.info.nl.UTF-8
 lib/usermin/mailcap/module.info.no
 lib/usermin/mailcap/module.info.no.UTF-8
 lib/usermin/mailcap/save.cgi
@@ -6091,7 +6215,6 @@ lib/usermin/man/help/intro.sk.html
 lib/usermin/man/help/intro.sv.UTF-8.html
 lib/usermin/man/help/intro.sv.html
 lib/usermin/man/images/icon.gif
-lib/usermin/man/images/smallicon.gif
 lib/usermin/man/index.cgi
 lib/usermin/man/lang/ar
 lib/usermin/man/lang/ca
@@ -6142,11 +6265,15 @@ lib/usermin/man/lang/zh_TW.UTF-8
 lib/usermin/man/man-lib.pl
 lib/usermin/man/module.info
 lib/usermin/man/module.info.ca
+lib/usermin/man/module.info.ca.UTF-8
 lib/usermin/man/module.info.cz
 lib/usermin/man/module.info.cz.UTF-8
 lib/usermin/man/module.info.de
+lib/usermin/man/module.info.de.UTF-8
 lib/usermin/man/module.info.es
+lib/usermin/man/module.info.es.UTF-8
 lib/usermin/man/module.info.fr
+lib/usermin/man/module.info.fr.UTF-8
 lib/usermin/man/module.info.hu
 lib/usermin/man/module.info.hu.UTF-8
 lib/usermin/man/module.info.ja_JP.UTF-8
@@ -6154,16 +6281,19 @@ lib/usermin/man/module.info.ja_JP.euc
 lib/usermin/man/module.info.ko_KR.UTF-8
 lib/usermin/man/module.info.ko_KR.euc
 lib/usermin/man/module.info.nl
+lib/usermin/man/module.info.nl.UTF-8
 lib/usermin/man/module.info.no
 lib/usermin/man/module.info.no.UTF-8
 lib/usermin/man/module.info.pl
 lib/usermin/man/module.info.pl.UTF-8
 lib/usermin/man/module.info.pt
+lib/usermin/man/module.info.pt.UTF-8
 lib/usermin/man/module.info.ru.UTF-8
 lib/usermin/man/module.info.ru_RU
 lib/usermin/man/module.info.ru_RU.UTF-8
 lib/usermin/man/module.info.ru_SU
 lib/usermin/man/module.info.sv
+lib/usermin/man/module.info.sv.UTF-8
 lib/usermin/man/module.info.tr
 lib/usermin/man/module.info.zh_CN
 lib/usermin/man/module.info.zh_TW.Big5
@@ -6667,7 +6797,6 @@ lib/usermin/mysql/images/manual.gif
 lib/usermin/mysql/images/mysql.gif
 lib/usermin/mysql/images/procs.gif
 lib/usermin/mysql/images/root.gif
-lib/usermin/mysql/images/smallicon.gif
 lib/usermin/mysql/images/table.gif
 lib/usermin/mysql/images/tprivs.gif
 lib/usermin/mysql/images/users.gif
@@ -6724,13 +6853,17 @@ lib/usermin/mysql/lang/zh_TW.UTF-8
 lib/usermin/mysql/login.cgi
 lib/usermin/mysql/module.info
 lib/usermin/mysql/module.info.ca
+lib/usermin/mysql/module.info.ca.UTF-8
 lib/usermin/mysql/module.info.cz
 lib/usermin/mysql/module.info.cz.UTF-8
 lib/usermin/mysql/module.info.de
+lib/usermin/mysql/module.info.de.UTF-8
 lib/usermin/mysql/module.info.fr
+lib/usermin/mysql/module.info.fr.UTF-8
 lib/usermin/mysql/module.info.hu
 lib/usermin/mysql/module.info.hu.UTF-8
 lib/usermin/mysql/module.info.nl
+lib/usermin/mysql/module.info.nl.UTF-8
 lib/usermin/mysql/module.info.no
 lib/usermin/mysql/module.info.no.UTF-8
 lib/usermin/mysql/mysql-lib.pl
@@ -6786,14 +6919,18 @@ lib/usermin/plan/lang/no.UTF-8
 lib/usermin/plan/lang/tr
 lib/usermin/plan/module.info
 lib/usermin/plan/module.info.ca
+lib/usermin/plan/module.info.ca.UTF-8
 lib/usermin/plan/module.info.cz
 lib/usermin/plan/module.info.cz.UTF-8
 lib/usermin/plan/module.info.de
+lib/usermin/plan/module.info.de.UTF-8
 lib/usermin/plan/module.info.el
 lib/usermin/plan/module.info.es
+lib/usermin/plan/module.info.es.UTF-8
 lib/usermin/plan/module.info.hu
 lib/usermin/plan/module.info.hu.UTF-8
 lib/usermin/plan/module.info.nl
+lib/usermin/plan/module.info.nl.UTF-8
 lib/usermin/plan/module.info.no
 lib/usermin/plan/module.info.no.UTF-8
 lib/usermin/plan/plan-lib.pl
@@ -7093,7 +7230,6 @@ lib/usermin/postgresql/images/hosts.gif
 lib/usermin/postgresql/images/icon.gif
 lib/usermin/postgresql/images/index.gif
 lib/usermin/postgresql/images/seq.gif
-lib/usermin/postgresql/images/smallicon.gif
 lib/usermin/postgresql/images/table.gif
 lib/usermin/postgresql/images/up.gif
 lib/usermin/postgresql/images/users.gif
@@ -7145,11 +7281,15 @@ lib/usermin/postgresql/log_parser.pl
 lib/usermin/postgresql/login.cgi
 lib/usermin/postgresql/module.info
 lib/usermin/postgresql/module.info.ca
+lib/usermin/postgresql/module.info.ca.UTF-8
 lib/usermin/postgresql/module.info.de
+lib/usermin/postgresql/module.info.de.UTF-8
 lib/usermin/postgresql/module.info.fr
+lib/usermin/postgresql/module.info.fr.UTF-8
 lib/usermin/postgresql/module.info.hu
 lib/usermin/postgresql/module.info.hu.UTF-8
 lib/usermin/postgresql/module.info.nl
+lib/usermin/postgresql/module.info.nl.UTF-8
 lib/usermin/postgresql/module.info.no
 lib/usermin/postgresql/module.info.no.UTF-8
 lib/usermin/postgresql/postgresql-lib.pl
@@ -7659,7 +7799,6 @@ lib/usermin/proc/help/zone.ru_RU.html
 lib/usermin/proc/help/zone.ru_SU.html
 lib/usermin/proc/hpux-lib.pl
 lib/usermin/proc/images/icon.gif
-lib/usermin/proc/images/smallicon.gif
 lib/usermin/proc/index.cgi
 lib/usermin/proc/index_cpu.cgi
 lib/usermin/proc/index_run.cgi
@@ -7720,15 +7859,19 @@ lib/usermin/proc/macos-lib.pl
 lib/usermin/proc/medium.risk
 lib/usermin/proc/module.info
 lib/usermin/proc/module.info.ca
+lib/usermin/proc/module.info.ca.UTF-8
 lib/usermin/proc/module.info.cz
 lib/usermin/proc/module.info.cz.UTF-8
 lib/usermin/proc/module.info.de
+lib/usermin/proc/module.info.de.UTF-8
 lib/usermin/proc/module.info.fr
+lib/usermin/proc/module.info.fr.UTF-8
 lib/usermin/proc/module.info.hu
 lib/usermin/proc/module.info.hu.UTF-8
 lib/usermin/proc/module.info.ja_JP.UTF-8
 lib/usermin/proc/module.info.ja_JP.euc
 lib/usermin/proc/module.info.nl
+lib/usermin/proc/module.info.nl.UTF-8
 lib/usermin/proc/module.info.no
 lib/usermin/proc/module.info.no.UTF-8
 lib/usermin/proc/old-proc-lib.pl
@@ -7751,7 +7894,6 @@ lib/usermin/procmail/images/before.gif
 lib/usermin/procmail/images/down.gif
 lib/usermin/procmail/images/gap.gif
 lib/usermin/procmail/images/icon.gif
-lib/usermin/procmail/images/smallicon.gif
 lib/usermin/procmail/images/up.gif
 lib/usermin/procmail/index.cgi
 lib/usermin/procmail/lang/ca
@@ -7788,14 +7930,19 @@ lib/usermin/procmail/manual_form.cgi
 lib/usermin/procmail/manual_save.cgi
 lib/usermin/procmail/module.info
 lib/usermin/procmail/module.info.ca
+lib/usermin/procmail/module.info.ca.UTF-8
 lib/usermin/procmail/module.info.cz
 lib/usermin/procmail/module.info.cz.UTF-8
 lib/usermin/procmail/module.info.de
+lib/usermin/procmail/module.info.de.UTF-8
 lib/usermin/procmail/module.info.es
+lib/usermin/procmail/module.info.es.UTF-8
 lib/usermin/procmail/module.info.fr
+lib/usermin/procmail/module.info.fr.UTF-8
 lib/usermin/procmail/module.info.hu
 lib/usermin/procmail/module.info.hu.UTF-8
 lib/usermin/procmail/module.info.nl
+lib/usermin/procmail/module.info.nl.UTF-8
 lib/usermin/procmail/module.info.no
 lib/usermin/procmail/module.info.no.UTF-8
 lib/usermin/procmail/module.info.ru.UTF-8
@@ -7842,7 +7989,6 @@ lib/usermin/quota/config.info.no.UTF-8
 lib/usermin/quota/freebsd-lib.pl
 lib/usermin/quota/hpux-lib.pl
 lib/usermin/quota/images/icon.gif
-lib/usermin/quota/images/smallicon.gif
 lib/usermin/quota/index.cgi
 lib/usermin/quota/index.cgi.old
 lib/usermin/quota/lang/ar
@@ -7897,14 +8043,18 @@ lib/usermin/quota/linux-lib.pl
 lib/usermin/quota/macos-lib.pl
 lib/usermin/quota/module.info
 lib/usermin/quota/module.info.ca
+lib/usermin/quota/module.info.ca.UTF-8
 lib/usermin/quota/module.info.cz
 lib/usermin/quota/module.info.cz.UTF-8
 lib/usermin/quota/module.info.de
+lib/usermin/quota/module.info.de.UTF-8
 lib/usermin/quota/module.info.el
 lib/usermin/quota/module.info.fr
+lib/usermin/quota/module.info.fr.UTF-8
 lib/usermin/quota/module.info.hu
 lib/usermin/quota/module.info.hu.UTF-8
 lib/usermin/quota/module.info.nl
+lib/usermin/quota/module.info.nl.UTF-8
 lib/usermin/quota/module.info.no
 lib/usermin/quota/module.info.no.UTF-8
 lib/usermin/quota/module.info.pl
@@ -7973,14 +8123,17 @@ lib/usermin/schedule/lang/ru_RU
 lib/usermin/schedule/lang/ru_RU.UTF-8
 lib/usermin/schedule/module.info
 lib/usermin/schedule/module.info.ca
+lib/usermin/schedule/module.info.ca.UTF-8
 lib/usermin/schedule/module.info.cz
 lib/usermin/schedule/module.info.cz.UTF-8
 lib/usermin/schedule/module.info.de
+lib/usermin/schedule/module.info.de.UTF-8
 lib/usermin/schedule/module.info.hu
 lib/usermin/schedule/module.info.hu.UTF-8
 lib/usermin/schedule/module.info.no
 lib/usermin/schedule/module.info.no.UTF-8
 lib/usermin/schedule/module.info.pt_BR
+lib/usermin/schedule/module.info.pt_BR.UTF-8
 lib/usermin/schedule/module.info.ru.UTF-8
 lib/usermin/schedule/module.info.ru_RU
 lib/usermin/schedule/module.info.ru_RU.UTF-8
@@ -8001,10 +8154,11 @@ lib/usermin/setup.sh
 lib/usermin/shell/config
 lib/usermin/shell/config.info
 lib/usermin/shell/config.info.ar
+lib/usermin/shell/config.info.ca
+lib/usermin/shell/config.info.ca.UTF-8
 lib/usermin/shell/defaultacl
 lib/usermin/shell/images/icon.gif
 lib/usermin/shell/images/shell.jpg
-lib/usermin/shell/images/smallicon.gif
 lib/usermin/shell/index.cgi
 lib/usermin/shell/lang/ar
 lib/usermin/shell/lang/bg
@@ -8051,11 +8205,14 @@ lib/usermin/shell/lang/zh_TW.Big5
 lib/usermin/shell/lang/zh_TW.UTF-8
 lib/usermin/shell/module.info
 lib/usermin/shell/module.info.ca
+lib/usermin/shell/module.info.ca.UTF-8
 lib/usermin/shell/module.info.cz
 lib/usermin/shell/module.info.cz.UTF-8
 lib/usermin/shell/module.info.de
+lib/usermin/shell/module.info.de.UTF-8
 lib/usermin/shell/module.info.el
 lib/usermin/shell/module.info.fr
+lib/usermin/shell/module.info.fr.UTF-8
 lib/usermin/shell/module.info.hu
 lib/usermin/shell/module.info.hu.UTF-8
 lib/usermin/shell/module.info.ja_JP.UTF-8
@@ -8063,6 +8220,7 @@ lib/usermin/shell/module.info.ja_JP.euc
 lib/usermin/shell/module.info.ko_KR.UTF-8
 lib/usermin/shell/module.info.ko_KR.euc
 lib/usermin/shell/module.info.nl
+lib/usermin/shell/module.info.nl.UTF-8
 lib/usermin/shell/module.info.no
 lib/usermin/shell/module.info.no.UTF-8
 lib/usermin/shell/module.info.pl
@@ -8111,7 +8269,6 @@ lib/usermin/spam/images/score.gif
 lib/usermin/spam/images/settings.gif
 lib/usermin/spam/images/setup.gif
 lib/usermin/spam/images/simple.gif
-lib/usermin/spam/images/smallicon.gif
 lib/usermin/spam/images/spam.gif
 lib/usermin/spam/images/user.gif
 lib/usermin/spam/images/white.gif
@@ -8143,14 +8300,17 @@ lib/usermin/spam/mail.cgi
 lib/usermin/spam/mail_search.cgi
 lib/usermin/spam/module.info
 lib/usermin/spam/module.info.ca
+lib/usermin/spam/module.info.ca.UTF-8
 lib/usermin/spam/module.info.cz
 lib/usermin/spam/module.info.cz.UTF-8
 lib/usermin/spam/module.info.de
+lib/usermin/spam/module.info.de.UTF-8
 lib/usermin/spam/module.info.fr
 lib/usermin/spam/module.info.fr.UTF-8
 lib/usermin/spam/module.info.hu
 lib/usermin/spam/module.info.hu.UTF-8
 lib/usermin/spam/module.info.nl
+lib/usermin/spam/module.info.nl.UTF-8
 lib/usermin/spam/module.info.no
 lib/usermin/spam/module.info.no.UTF-8
 lib/usermin/spam/module.info.pl
@@ -8250,12 +8410,15 @@ lib/usermin/ssh/list_keys.cgi
 lib/usermin/ssh/list_knowns.cgi
 lib/usermin/ssh/module.info
 lib/usermin/ssh/module.info.ca
+lib/usermin/ssh/module.info.ca.UTF-8
 lib/usermin/ssh/module.info.cz
 lib/usermin/ssh/module.info.cz.UTF-8
 lib/usermin/ssh/module.info.de
+lib/usermin/ssh/module.info.de.UTF-8
 lib/usermin/ssh/module.info.hu
 lib/usermin/ssh/module.info.hu.UTF-8
 lib/usermin/ssh/module.info.nl
+lib/usermin/ssh/module.info.nl.UTF-8
 lib/usermin/ssh/module.info.no
 lib/usermin/ssh/module.info.no.UTF-8
 lib/usermin/ssh/save_auth.cgi
@@ -8283,7 +8446,6 @@ lib/usermin/telnet/config.info.no
 lib/usermin/telnet/config.info.no.UTF-8
 lib/usermin/telnet/defaultuconfig
 lib/usermin/telnet/images/icon.gif
-lib/usermin/telnet/images/smallicon.gif
 lib/usermin/telnet/index.cgi
 lib/usermin/telnet/jta26.jar
 lib/usermin/telnet/lang/ca
@@ -8337,12 +8499,16 @@ lib/usermin/telnet/lang/zh_TW.Big5
 lib/usermin/telnet/lang/zh_TW.UTF-8
 lib/usermin/telnet/module.info
 lib/usermin/telnet/module.info.ca
+lib/usermin/telnet/module.info.ca.UTF-8
 lib/usermin/telnet/module.info.cz
 lib/usermin/telnet/module.info.cz.UTF-8
 lib/usermin/telnet/module.info.de
+lib/usermin/telnet/module.info.de.UTF-8
 lib/usermin/telnet/module.info.el
 lib/usermin/telnet/module.info.es
+lib/usermin/telnet/module.info.es.UTF-8
 lib/usermin/telnet/module.info.fr
+lib/usermin/telnet/module.info.fr.UTF-8
 lib/usermin/telnet/module.info.hu
 lib/usermin/telnet/module.info.hu.UTF-8
 lib/usermin/telnet/module.info.ja_JP.UTF-8
@@ -8350,16 +8516,19 @@ lib/usermin/telnet/module.info.ja_JP.euc
 lib/usermin/telnet/module.info.ko_KR.UTF-8
 lib/usermin/telnet/module.info.ko_KR.euc
 lib/usermin/telnet/module.info.nl
+lib/usermin/telnet/module.info.nl.UTF-8
 lib/usermin/telnet/module.info.no
 lib/usermin/telnet/module.info.no.UTF-8
 lib/usermin/telnet/module.info.pl
 lib/usermin/telnet/module.info.pl.UTF-8
 lib/usermin/telnet/module.info.pt
+lib/usermin/telnet/module.info.pt.UTF-8
 lib/usermin/telnet/module.info.ru.UTF-8
 lib/usermin/telnet/module.info.ru_RU
 lib/usermin/telnet/module.info.ru_RU.UTF-8
 lib/usermin/telnet/module.info.ru_SU
 lib/usermin/telnet/module.info.sv
+lib/usermin/telnet/module.info.sv.UTF-8
 lib/usermin/telnet/module.info.tr
 lib/usermin/telnet/module.info.zh_CN
 lib/usermin/telnet/module.info.zh_TW.Big5
@@ -8408,17 +8577,22 @@ lib/usermin/theme/lang/no.UTF-8
 lib/usermin/theme/lang/tr
 lib/usermin/theme/module.info
 lib/usermin/theme/module.info.ca
+lib/usermin/theme/module.info.ca.UTF-8
 lib/usermin/theme/module.info.cz
 lib/usermin/theme/module.info.cz.UTF-8
 lib/usermin/theme/module.info.de
+lib/usermin/theme/module.info.de.UTF-8
 lib/usermin/theme/module.info.el
 lib/usermin/theme/module.info.es
+lib/usermin/theme/module.info.es.UTF-8
 lib/usermin/theme/module.info.hu
 lib/usermin/theme/module.info.hu.UTF-8
 lib/usermin/theme/module.info.it
+lib/usermin/theme/module.info.it.UTF-8
 lib/usermin/theme/module.info.ja_JP.UTF-8
 lib/usermin/theme/module.info.ja_JP.euc
 lib/usermin/theme/module.info.nl
+lib/usermin/theme/module.info.nl.UTF-8
 lib/usermin/theme/module.info.no
 lib/usermin/theme/module.info.no.UTF-8
 lib/usermin/theme/theme-lib.pl
@@ -8446,11 +8620,15 @@ lib/usermin/tunnel/link.cgi
 lib/usermin/tunnel/login.cgi
 lib/usermin/tunnel/module.info
 lib/usermin/tunnel/module.info.ca
+lib/usermin/tunnel/module.info.ca.UTF-8
 lib/usermin/tunnel/module.info.de
+lib/usermin/tunnel/module.info.de.UTF-8
 lib/usermin/tunnel/module.info.fr
+lib/usermin/tunnel/module.info.fr.UTF-8
 lib/usermin/tunnel/module.info.hu
 lib/usermin/tunnel/module.info.hu.UTF-8
 lib/usermin/tunnel/module.info.nl
+lib/usermin/tunnel/module.info.nl.UTF-8
 lib/usermin/tunnel/tunnel-lib.pl
 lib/usermin/uconfig.cgi
 lib/usermin/uconfig_save.cgi
@@ -8486,7 +8664,6 @@ lib/usermin/updown/fetch.cgi
 lib/usermin/updown/images/icon.gif
 lib/usermin/updown/images/left.gif
 lib/usermin/updown/images/pack.gif
-lib/usermin/updown/images/smallicon.gif
 lib/usermin/updown/index.cgi
 lib/usermin/updown/lang/ca
 lib/usermin/updown/lang/ca.UTF-8
@@ -8532,11 +8709,15 @@ lib/usermin/updown/lang/zh_TW.UTF-8
 lib/usermin/updown/log_parser.pl
 lib/usermin/updown/module.info
 lib/usermin/updown/module.info.ca
+lib/usermin/updown/module.info.ca.UTF-8
 lib/usermin/updown/module.info.de
+lib/usermin/updown/module.info.de.UTF-8
 lib/usermin/updown/module.info.fr
+lib/usermin/updown/module.info.fr.UTF-8
 lib/usermin/updown/module.info.hu
 lib/usermin/updown/module.info.hu.UTF-8
 lib/usermin/updown/module.info.nl
+lib/usermin/updown/module.info.nl.UTF-8
 lib/usermin/updown/module.info.no
 lib/usermin/updown/module.info.no.UTF-8
 lib/usermin/updown/updown-lib.pl
@@ -8607,12 +8788,15 @@ lib/usermin/usermount/lang/zh_TW.UTF-8
 lib/usermin/usermount/linux-lib.pl
 lib/usermin/usermount/module.info
 lib/usermin/usermount/module.info.ca
+lib/usermin/usermount/module.info.ca.UTF-8
 lib/usermin/usermount/module.info.cz
 lib/usermin/usermount/module.info.cz.UTF-8
 lib/usermin/usermount/module.info.de
+lib/usermin/usermount/module.info.de.UTF-8
 lib/usermin/usermount/module.info.hu
 lib/usermin/usermount/module.info.hu.UTF-8
 lib/usermin/usermount/module.info.nl
+lib/usermin/usermount/module.info.nl.UTF-8
 lib/usermin/usermount/module.info.no
 lib/usermin/usermount/module.info.no.UTF-8
 lib/usermin/usermount/module.info.pl
diff --git a/sysutils/virtualmin/Makefile b/sysutils/virtualmin/Makefile
index c96390a4a88b..1171ff914556 100644
--- a/sysutils/virtualmin/Makefile
+++ b/sysutils/virtualmin/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	virtualmin
-PORTVERSION=	6.06
+PORTVERSION=	6.07
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/download/virtualmin/
diff --git a/sysutils/virtualmin/distinfo b/sysutils/virtualmin/distinfo
index 1e4dd749e09f..81ecc98880c9 100644
--- a/sysutils/virtualmin/distinfo
+++ b/sysutils/virtualmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1549876935
-SHA256 (virtual-server-6.06.gpl.wbm.gz) = bdfbc31382771d754740f449df5cd8830c6a635d842b12693ec50eca4e2321ce
-SIZE (virtual-server-6.06.gpl.wbm.gz) = 2597115
+TIMESTAMP = 1563809361
+SHA256 (virtual-server-6.07.gpl.wbm.gz) = 34136ab1e41d4768d8dcdfb70ba01e8bae1413eef061eb4973437e3ac41a50dd
+SIZE (virtual-server-6.07.gpl.wbm.gz) = 2598770
diff --git a/sysutils/virtualmin/pkg-plist b/sysutils/virtualmin/pkg-plist
index cfd0232ab60c..2337537ee81a 100644
--- a/sysutils/virtualmin/pkg-plist
+++ b/sysutils/virtualmin/pkg-plist
@@ -748,6 +748,7 @@ lib/webmin/virtual-server/help/config_pbzip2.nl.html
 lib/webmin/virtual-server/help/config_php_ini.html
 lib/webmin/virtual-server/help/config_php_ini.nl.html
 lib/webmin/virtual-server/help/config_php_paths.html
+lib/webmin/virtual-server/help/config_pigz.html
 lib/webmin/virtual-server/help/config_plan_auto.html
 lib/webmin/virtual-server/help/config_plan_auto.nl.html
 lib/webmin/virtual-server/help/config_post_check.html
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 8f6604e487ee..ab88212c9150 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	webmin
-PORTVERSION=	1.900
-PORTREVISION=	1
+PORTVERSION=	1.930
 CATEGORIES=	sysutils
 MASTER_SITES=	http://download.webmin.com/updates/:up \
 		SF/webadmin/${PORTNAME}/${PORTVERSION}:sf
diff --git a/sysutils/webmin/distinfo b/sysutils/webmin/distinfo
index 2ff2aa8963c2..344d8ad95dbb 100644
--- a/sysutils/webmin/distinfo
+++ b/sysutils/webmin/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1543262271
-SHA256 (webmin-1.900.tar.gz) = f2f252b116ec3a063440b4efe77fe89996d8d743aa6857db013ae6a34be7c62d
-SIZE (webmin-1.900.tar.gz) = 29309930
+TIMESTAMP = 1566166757
+SHA256 (webmin-1.930.tar.gz) = f5789f180852d8bd3510b342cc968fba928ece6c940763a89dc0d8f059bde682
+SIZE (webmin-1.930.tar.gz) = 30932910
diff --git a/sysutils/webmin/pkg-plist b/sysutils/webmin/pkg-plist
index 13a0314751e1..86c805a05ae4 100644
--- a/sysutils/webmin/pkg-plist
+++ b/sysutils/webmin/pkg-plist
@@ -1,7 +1,7 @@
 lib/webmin/JSON/PP.pm
 lib/webmin/LICENCE
 lib/webmin/LICENCE.ja
-lib/webmin/README
+lib/webmin/README.md
 lib/webmin/WebminCore.pm
 lib/webmin/WebminUI/All.pm
 lib/webmin/WebminUI/Button.pm
@@ -164,7 +164,6 @@ lib/webmin/acl/images/icon.gif
 lib/webmin/acl/images/pass.gif
 lib/webmin/acl/images/rbac.gif
 lib/webmin/acl/images/sessions.gif
-lib/webmin/acl/images/smallicon.gif
 lib/webmin/acl/images/sql.gif
 lib/webmin/acl/images/sync.gif
 lib/webmin/acl/images/tick.gif
@@ -238,28 +237,37 @@ lib/webmin/acl/module.info.ar
 lib/webmin/acl/module.info.bg
 lib/webmin/acl/module.info.bg.UTF-8
 lib/webmin/acl/module.info.ca
+lib/webmin/acl/module.info.ca.UTF-8
 lib/webmin/acl/module.info.cz
 lib/webmin/acl/module.info.cz.UTF-8
 lib/webmin/acl/module.info.da
+lib/webmin/acl/module.info.da.UTF-8
 lib/webmin/acl/module.info.de
+lib/webmin/acl/module.info.de.UTF-8
 lib/webmin/acl/module.info.es
+lib/webmin/acl/module.info.es.UTF-8
 lib/webmin/acl/module.info.fr
 lib/webmin/acl/module.info.fr.UTF-8
 lib/webmin/acl/module.info.hu
 lib/webmin/acl/module.info.hu.UTF-8
 lib/webmin/acl/module.info.it
+lib/webmin/acl/module.info.it.UTF-8
 lib/webmin/acl/module.info.ja_JP.UTF-8
 lib/webmin/acl/module.info.ja_JP.euc
 lib/webmin/acl/module.info.ko_KR.UTF-8
 lib/webmin/acl/module.info.ko_KR.euc
 lib/webmin/acl/module.info.ms_MY
+lib/webmin/acl/module.info.ms_MY.UTF-8
 lib/webmin/acl/module.info.nl
+lib/webmin/acl/module.info.nl.UTF-8
 lib/webmin/acl/module.info.no
 lib/webmin/acl/module.info.no.UTF-8
 lib/webmin/acl/module.info.pl
 lib/webmin/acl/module.info.pl.UTF-8
 lib/webmin/acl/module.info.pt
+lib/webmin/acl/module.info.pt.UTF-8
 lib/webmin/acl/module.info.pt_BR
+lib/webmin/acl/module.info.pt_BR.UTF-8
 lib/webmin/acl/module.info.ru.UTF-8
 lib/webmin/acl/module.info.ru_RU
 lib/webmin/acl/module.info.ru_RU.UTF-8
@@ -267,11 +275,10 @@ lib/webmin/acl/module.info.ru_SU
 lib/webmin/acl/module.info.sk
 lib/webmin/acl/module.info.sk.UTF-8
 lib/webmin/acl/module.info.sv
+lib/webmin/acl/module.info.sv.UTF-8
 lib/webmin/acl/module.info.tr
 lib/webmin/acl/module.info.zh_CN
-lib/webmin/acl/module.info.zh_CN.UTF-8
 lib/webmin/acl/module.info.zh_TW.Big5
-lib/webmin/acl/module.info.zh_TW.UTF-8
 lib/webmin/acl/negativeacl
 lib/webmin/acl/openssl.cnf
 lib/webmin/acl/postinstall.pl
@@ -474,7 +481,6 @@ lib/webmin/adsl-client/help/user.pl.html
 lib/webmin/adsl-client/ifcfg-ppp
 lib/webmin/adsl-client/images/icon.gif
 lib/webmin/adsl-client/images/logo-small.png
-lib/webmin/adsl-client/images/smallicon.gif
 lib/webmin/adsl-client/index.cgi
 lib/webmin/adsl-client/install_check.pl
 lib/webmin/adsl-client/lang/ar
@@ -519,23 +525,29 @@ lib/webmin/adsl-client/module.info.ar
 lib/webmin/adsl-client/module.info.bg
 lib/webmin/adsl-client/module.info.bg.UTF-8
 lib/webmin/adsl-client/module.info.ca
+lib/webmin/adsl-client/module.info.ca.UTF-8
 lib/webmin/adsl-client/module.info.cz
 lib/webmin/adsl-client/module.info.cz.UTF-8
 lib/webmin/adsl-client/module.info.de
+lib/webmin/adsl-client/module.info.de.UTF-8
 lib/webmin/adsl-client/module.info.es
+lib/webmin/adsl-client/module.info.es.UTF-8
 lib/webmin/adsl-client/module.info.it
+lib/webmin/adsl-client/module.info.it.UTF-8
 lib/webmin/adsl-client/module.info.ja_JP.UTF-8
 lib/webmin/adsl-client/module.info.ja_JP.euc
 lib/webmin/adsl-client/module.info.ms_MY
+lib/webmin/adsl-client/module.info.ms_MY.UTF-8
 lib/webmin/adsl-client/module.info.nl
+lib/webmin/adsl-client/module.info.nl.UTF-8
 lib/webmin/adsl-client/module.info.no
 lib/webmin/adsl-client/module.info.no.UTF-8
 lib/webmin/adsl-client/module.info.pl
 lib/webmin/adsl-client/module.info.pl.UTF-8
 lib/webmin/adsl-client/module.info.pt_BR
+lib/webmin/adsl-client/module.info.pt_BR.UTF-8
 lib/webmin/adsl-client/module.info.tr
 lib/webmin/adsl-client/module.info.zh_TW.Big5
-lib/webmin/adsl-client/module.info.zh_TW.UTF-8
 lib/webmin/adsl-client/rbootup.cgi
 lib/webmin/adsl-client/save.cgi
 lib/webmin/adsl-client/secrets-lib.pl
@@ -577,7 +589,6 @@ lib/webmin/ajaxterm/config.info.no.UTF-8
 lib/webmin/ajaxterm/config.info.pl
 lib/webmin/ajaxterm/config.info.pl.UTF-8
 lib/webmin/ajaxterm/images/icon.gif
-lib/webmin/ajaxterm/images/smallicon.gif
 lib/webmin/ajaxterm/index.cgi
 lib/webmin/ajaxterm/lang/ar
 lib/webmin/ajaxterm/lang/ca
@@ -600,10 +611,13 @@ lib/webmin/ajaxterm/lang/pl.UTF-8
 lib/webmin/ajaxterm/module.info
 lib/webmin/ajaxterm/module.info.ar
 lib/webmin/ajaxterm/module.info.ca
+lib/webmin/ajaxterm/module.info.ca.UTF-8
 lib/webmin/ajaxterm/module.info.hu
 lib/webmin/ajaxterm/module.info.hu.UTF-8
 lib/webmin/ajaxterm/module.info.ms_MY
+lib/webmin/ajaxterm/module.info.ms_MY.UTF-8
 lib/webmin/ajaxterm/module.info.nl
+lib/webmin/ajaxterm/module.info.nl.UTF-8
 lib/webmin/ajaxterm/module.info.no
 lib/webmin/ajaxterm/module.info.no.UTF-8
 lib/webmin/ajaxterm/module.info.pl
@@ -764,7 +778,6 @@ lib/webmin/apache/images/icon.gif
 lib/webmin/apache/images/mods.gif
 lib/webmin/apache/images/recon.gif
 lib/webmin/apache/images/show.gif
-lib/webmin/apache/images/smallicon.gif
 lib/webmin/apache/images/type_icon_0.gif
 lib/webmin/apache/images/type_icon_1.gif
 lib/webmin/apache/images/type_icon_10.gif
@@ -912,12 +925,17 @@ lib/webmin/apache/module.info.ar
 lib/webmin/apache/module.info.bg
 lib/webmin/apache/module.info.bg.UTF-8
 lib/webmin/apache/module.info.ca
+lib/webmin/apache/module.info.ca.UTF-8
 lib/webmin/apache/module.info.cz
 lib/webmin/apache/module.info.cz.UTF-8
 lib/webmin/apache/module.info.da
+lib/webmin/apache/module.info.da.UTF-8
 lib/webmin/apache/module.info.de
+lib/webmin/apache/module.info.de.UTF-8
 lib/webmin/apache/module.info.es
+lib/webmin/apache/module.info.es.UTF-8
 lib/webmin/apache/module.info.fr
+lib/webmin/apache/module.info.fr.UTF-8
 lib/webmin/apache/module.info.hu
 lib/webmin/apache/module.info.hu.UTF-8
 lib/webmin/apache/module.info.ja_JP.UTF-8
@@ -925,23 +943,26 @@ lib/webmin/apache/module.info.ja_JP.euc
 lib/webmin/apache/module.info.ko_KR.UTF-8
 lib/webmin/apache/module.info.ko_KR.euc
 lib/webmin/apache/module.info.ms_MY
+lib/webmin/apache/module.info.ms_MY.UTF-8
 lib/webmin/apache/module.info.nl
+lib/webmin/apache/module.info.nl.UTF-8
 lib/webmin/apache/module.info.no
 lib/webmin/apache/module.info.no.UTF-8
 lib/webmin/apache/module.info.pl
 lib/webmin/apache/module.info.pl.UTF-8
 lib/webmin/apache/module.info.pt
+lib/webmin/apache/module.info.pt.UTF-8
 lib/webmin/apache/module.info.pt_BR
+lib/webmin/apache/module.info.pt_BR.UTF-8
 lib/webmin/apache/module.info.ru.UTF-8
 lib/webmin/apache/module.info.ru_RU
 lib/webmin/apache/module.info.ru_RU.UTF-8
 lib/webmin/apache/module.info.ru_SU
 lib/webmin/apache/module.info.sv
+lib/webmin/apache/module.info.sv.UTF-8
 lib/webmin/apache/module.info.tr
 lib/webmin/apache/module.info.zh_CN
-lib/webmin/apache/module.info.zh_CN.UTF-8
 lib/webmin/apache/module.info.zh_TW.Big5
-lib/webmin/apache/module.info.zh_TW.UTF-8
 lib/webmin/apache/mpm_netware.pl
 lib/webmin/apache/mpm_winnt.pl
 lib/webmin/apache/notes
@@ -1055,7 +1076,6 @@ lib/webmin/at/delete_jobs.cgi
 lib/webmin/at/edit_job.cgi
 lib/webmin/at/freebsd-lib.pl
 lib/webmin/at/images/icon.gif
-lib/webmin/at/images/smallicon.gif
 lib/webmin/at/index.cgi
 lib/webmin/at/install_check.pl
 lib/webmin/at/irix-lib.pl
@@ -1111,21 +1131,29 @@ lib/webmin/at/log_parser.pl
 lib/webmin/at/macos-lib.pl
 lib/webmin/at/module.info
 lib/webmin/at/module.info.ca
+lib/webmin/at/module.info.ca.UTF-8
 lib/webmin/at/module.info.cz
 lib/webmin/at/module.info.cz.UTF-8
 lib/webmin/at/module.info.de
+lib/webmin/at/module.info.de.UTF-8
 lib/webmin/at/module.info.es
+lib/webmin/at/module.info.es.UTF-8
 lib/webmin/at/module.info.fr
+lib/webmin/at/module.info.fr.UTF-8
 lib/webmin/at/module.info.hu
 lib/webmin/at/module.info.hu.UTF-8
 lib/webmin/at/module.info.it
+lib/webmin/at/module.info.it.UTF-8
 lib/webmin/at/module.info.ms_MY
+lib/webmin/at/module.info.ms_MY.UTF-8
 lib/webmin/at/module.info.nl
+lib/webmin/at/module.info.nl.UTF-8
 lib/webmin/at/module.info.no
 lib/webmin/at/module.info.no.UTF-8
 lib/webmin/at/module.info.pl
 lib/webmin/at/module.info.pl.UTF-8
 lib/webmin/at/module.info.pt_BR
+lib/webmin/at/module.info.pt_BR.UTF-8
 lib/webmin/at/module.info.ru.UTF-8
 lib/webmin/at/module.info.ru_RU
 lib/webmin/at/module.info.ru_RU.UTF-8
@@ -1133,14 +1161,18 @@ lib/webmin/at/module.info.ru_SU
 lib/webmin/at/module.info.sk
 lib/webmin/at/module.info.sk.UTF-8
 lib/webmin/at/module.info.sv
+lib/webmin/at/module.info.sv.UTF-8
 lib/webmin/at/module.info.tr
 lib/webmin/at/module.info.zh_TW.Big5
-lib/webmin/at/module.info.zh_TW.UTF-8
 lib/webmin/at/openserver-lib.pl
 lib/webmin/at/rbac-mapping
 lib/webmin/at/save_allow.cgi
 lib/webmin/at/solaris-lib.pl
+lib/webmin/authentic-theme/401.cgi
+lib/webmin/authentic-theme/403.cgi
+lib/webmin/authentic-theme/404.cgi
 lib/webmin/authentic-theme/CHANGELOG.md
+lib/webmin/authentic-theme/FUNDING.yml
 lib/webmin/authentic-theme/LICENSE
 lib/webmin/authentic-theme/THEME.pgp
 lib/webmin/authentic-theme/authentic-funcs.pm
@@ -1150,8 +1182,11 @@ lib/webmin/authentic-theme/authentic.pm
 lib/webmin/authentic-theme/buttons.pm
 lib/webmin/authentic-theme/config
 lib/webmin/authentic-theme/extensions/csf.min.js
+lib/webmin/authentic-theme/extensions/csf/csf-lib.pm
 lib/webmin/authentic-theme/extensions/csf/csf.min.css
+lib/webmin/authentic-theme/extensions/csf/csf.min.css.gz
 lib/webmin/authentic-theme/extensions/csf/csf.min.js
+lib/webmin/authentic-theme/extensions/csf/csf.min.js.gz
 lib/webmin/authentic-theme/extensions/file-manager/bookmark.cgi
 lib/webmin/authentic-theme/extensions/file-manager/chattr.cgi
 lib/webmin/authentic-theme/extensions/file-manager/chcon.cgi
@@ -1169,7 +1204,12 @@ lib/webmin/authentic-theme/extensions/file-manager/extract.cgi
 lib/webmin/authentic-theme/extensions/file-manager/fetcher.cgi
 lib/webmin/authentic-theme/extensions/file-manager/file-manager-lib.pm
 lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js
+lib/webmin/authentic-theme/extensions/file-manager/file-manager-reinit.min.js.gz
 lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js
+lib/webmin/authentic-theme/extensions/file-manager/file-manager.min.js.gz
+lib/webmin/authentic-theme/extensions/file-manager/gpg.cgi
+lib/webmin/authentic-theme/extensions/file-manager/http_download.cgi
+lib/webmin/authentic-theme/extensions/file-manager/list-images.cgi
 lib/webmin/authentic-theme/extensions/file-manager/list.cgi
 lib/webmin/authentic-theme/extensions/file-manager/paste.cgi
 lib/webmin/authentic-theme/extensions/file-manager/rename.cgi
@@ -1178,14 +1218,18 @@ lib/webmin/authentic-theme/extensions/file-manager/tree.cgi
 lib/webmin/authentic-theme/extensions/mail/folders.cgi
 lib/webmin/authentic-theme/extensions/mail/mail-lib.pm
 lib/webmin/authentic-theme/extensions/mail/mail.min.css
+lib/webmin/authentic-theme/extensions/mail/mail.min.css.gz
 lib/webmin/authentic-theme/extensions/mail/mail.min.js
+lib/webmin/authentic-theme/extensions/mail/mail.min.js.gz
 lib/webmin/authentic-theme/extensions/mail/mail.src.js
 lib/webmin/authentic-theme/extensions/mail/message.cgi
 lib/webmin/authentic-theme/extensions/mail/messages.cgi
 lib/webmin/authentic-theme/extensions/mail/search.cgi
 lib/webmin/authentic-theme/extensions/sql.min.js
+lib/webmin/authentic-theme/extensions/sql.min.js.gz
 lib/webmin/authentic-theme/extensions/stats/stats.min.css
 lib/webmin/authentic-theme/extensions/stats/stats.min.js
+lib/webmin/authentic-theme/extensions/stats/stats.min.js.gz
 lib/webmin/authentic-theme/extensions/stats/stats.src.css
 lib/webmin/authentic-theme/extensions/stats/stats.src.js
 lib/webmin/authentic-theme/help/editor.ca.UTF-8.html
@@ -1245,13 +1289,13 @@ lib/webmin/authentic-theme/images/favicons/cloudmin/browserconfig.xml
 lib/webmin/authentic-theme/images/favicons/cloudmin/favicon-16x16.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/favicon-32x32.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/favicon.ico
+lib/webmin/authentic-theme/images/favicons/cloudmin/manifest.json
 lib/webmin/authentic-theme/images/favicons/cloudmin/mstile-144x144.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/mstile-150x150.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/mstile-310x150.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/mstile-310x310.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/mstile-70x70.png
 lib/webmin/authentic-theme/images/favicons/cloudmin/safari-pinned-tab.svg
-lib/webmin/authentic-theme/images/favicons/cloudmin/site.webmanifest
 lib/webmin/authentic-theme/images/favicons/usermin/android-chrome-144x144.png
 lib/webmin/authentic-theme/images/favicons/usermin/android-chrome-192x192.png
 lib/webmin/authentic-theme/images/favicons/usermin/android-chrome-256x256.png
@@ -1275,13 +1319,13 @@ lib/webmin/authentic-theme/images/favicons/usermin/browserconfig.xml
 lib/webmin/authentic-theme/images/favicons/usermin/favicon-16x16.png
 lib/webmin/authentic-theme/images/favicons/usermin/favicon-32x32.png
 lib/webmin/authentic-theme/images/favicons/usermin/favicon.ico
+lib/webmin/authentic-theme/images/favicons/usermin/manifest.json
 lib/webmin/authentic-theme/images/favicons/usermin/mstile-144x144.png
 lib/webmin/authentic-theme/images/favicons/usermin/mstile-150x150.png
 lib/webmin/authentic-theme/images/favicons/usermin/mstile-310x150.png
 lib/webmin/authentic-theme/images/favicons/usermin/mstile-310x310.png
 lib/webmin/authentic-theme/images/favicons/usermin/mstile-70x70.png
 lib/webmin/authentic-theme/images/favicons/usermin/safari-pinned-tab.svg
-lib/webmin/authentic-theme/images/favicons/usermin/site.webmanifest
 lib/webmin/authentic-theme/images/favicons/virtualmin/android-chrome-144x144.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/android-chrome-192x192.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/android-chrome-256x256.png
@@ -1305,13 +1349,13 @@ lib/webmin/authentic-theme/images/favicons/virtualmin/browserconfig.xml
 lib/webmin/authentic-theme/images/favicons/virtualmin/favicon-16x16.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/favicon-32x32.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/favicon.ico
+lib/webmin/authentic-theme/images/favicons/virtualmin/manifest.json
 lib/webmin/authentic-theme/images/favicons/virtualmin/mstile-144x144.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/mstile-150x150.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/mstile-310x150.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/mstile-310x310.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/mstile-70x70.png
 lib/webmin/authentic-theme/images/favicons/virtualmin/safari-pinned-tab.svg
-lib/webmin/authentic-theme/images/favicons/virtualmin/site.webmanifest
 lib/webmin/authentic-theme/images/favicons/webmin/android-chrome-144x144.png
 lib/webmin/authentic-theme/images/favicons/webmin/android-chrome-192x192.png
 lib/webmin/authentic-theme/images/favicons/webmin/android-chrome-256x256.png
@@ -1335,13 +1379,13 @@ lib/webmin/authentic-theme/images/favicons/webmin/browserconfig.xml
 lib/webmin/authentic-theme/images/favicons/webmin/favicon-16x16.png
 lib/webmin/authentic-theme/images/favicons/webmin/favicon-32x32.png
 lib/webmin/authentic-theme/images/favicons/webmin/favicon.ico
+lib/webmin/authentic-theme/images/favicons/webmin/manifest.json
 lib/webmin/authentic-theme/images/favicons/webmin/mstile-144x144.png
 lib/webmin/authentic-theme/images/favicons/webmin/mstile-150x150.png
 lib/webmin/authentic-theme/images/favicons/webmin/mstile-310x150.png
 lib/webmin/authentic-theme/images/favicons/webmin/mstile-310x310.png
 lib/webmin/authentic-theme/images/favicons/webmin/mstile-70x70.png
 lib/webmin/authentic-theme/images/favicons/webmin/safari-pinned-tab.svg
-lib/webmin/authentic-theme/images/favicons/webmin/site.webmanifest
 lib/webmin/authentic-theme/images/filter.gif
 lib/webmin/authentic-theme/images/first-grey.gif
 lib/webmin/authentic-theme/images/first.gif
@@ -2105,6 +2149,8 @@ lib/webmin/authentic-theme/images/notifications_authentic_remote_version.png
 lib/webmin/authentic-theme/images/notifications_csf_deny.png
 lib/webmin/authentic-theme/images/notifications_csf_remote_version.png
 lib/webmin/authentic-theme/images/notifications_package_message.png
+lib/webmin/authentic-theme/images/notifications_usermin.png
+lib/webmin/authentic-theme/images/notifications_webmin.png
 lib/webmin/authentic-theme/images/ok.gif
 lib/webmin/authentic-theme/images/open.gif
 lib/webmin/authentic-theme/images/p1.gif
@@ -2120,7 +2166,6 @@ lib/webmin/authentic-theme/images/right-grey.gif
 lib/webmin/authentic-theme/images/right.gif
 lib/webmin/authentic-theme/images/screenshot.png
 lib/webmin/authentic-theme/images/search.gif
-lib/webmin/authentic-theme/images/smallicon.gif
 lib/webmin/authentic-theme/images/sort_asc.png
 lib/webmin/authentic-theme/images/sort_asc_disabled.png
 lib/webmin/authentic-theme/images/sort_both.png
@@ -2195,6 +2240,8 @@ lib/webmin/authentic-theme/password_form.cgi
 lib/webmin/authentic-theme/session_login.cgi
 lib/webmin/authentic-theme/settings-backgrounds.cgi
 lib/webmin/authentic-theme/settings-backgrounds_save.cgi
+lib/webmin/authentic-theme/settings-editor_favorites_read.cgi
+lib/webmin/authentic-theme/settings-editor_favorites_write.cgi
 lib/webmin/authentic-theme/settings-editor_read.cgi
 lib/webmin/authentic-theme/settings-editor_write.cgi
 lib/webmin/authentic-theme/settings-favorites_save.cgi
@@ -2207,6 +2254,7 @@ lib/webmin/authentic-theme/sysinfo.cgi
 lib/webmin/authentic-theme/theme-update.sh
 lib/webmin/authentic-theme/theme.info
 lib/webmin/authentic-theme/unauthenticated/css/bundle.min.css
+lib/webmin/authentic-theme/unauthenticated/css/bundle.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/css/font-arial.min.css
 lib/webmin/authentic-theme/unauthenticated/css/font-helvetica-neue.min.css
 lib/webmin/authentic-theme/unauthenticated/css/font-open-sans-condensed.min.css
@@ -2217,9 +2265,12 @@ lib/webmin/authentic-theme/unauthenticated/css/font-system-default.min.css
 lib/webmin/authentic-theme/unauthenticated/css/font-tahoma.min.css
 lib/webmin/authentic-theme/unauthenticated/css/font-trebuchet-ms.min.css
 lib/webmin/authentic-theme/unauthenticated/css/fonts-roboto.min.css
+lib/webmin/authentic-theme/unauthenticated/css/fonts-roboto.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/css/high-contrast.min.css
 lib/webmin/authentic-theme/unauthenticated/css/jquery.fancytree.min.css
+lib/webmin/authentic-theme/unauthenticated/css/jquery.fancytree.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/css/jquery.jspanel.min.css
+lib/webmin/authentic-theme/unauthenticated/css/jquery.jspanel.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/css/palettes/brown.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/darkblue.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/darkgrey.min.css
@@ -2230,33 +2281,59 @@ lib/webmin/authentic-theme/unauthenticated/css/palettes/gunmetal.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/indianred.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/lightblue.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/nightrider.min.css
+lib/webmin/authentic-theme/unauthenticated/css/palettes/nightrider.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/css/palettes/noir.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/orange.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/purple.min.css
 lib/webmin/authentic-theme/unauthenticated/css/palettes/red.min.css
+lib/webmin/authentic-theme/unauthenticated/css/palettes/white.min.css
+lib/webmin/authentic-theme/unauthenticated/css/photoswipe.min.css
+lib/webmin/authentic-theme/unauthenticated/css/photoswipe.min.css.gz
 lib/webmin/authentic-theme/unauthenticated/js/bundle.min.js
+lib/webmin/authentic-theme/unauthenticated/js/bundle.min.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/adapters/jquery.js
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/ckeditor.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/ckeditor.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/config.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/config.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/contents.css
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/contents.css.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ca.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ca.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/cs.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/cs.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/da.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/da.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/de.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/de.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/en.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/en.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/es.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/es.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/fr.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/fr.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/id.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/id.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/it.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/it.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/nl.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/nl.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/no.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/no.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/pl.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/pl.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/pt.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/pt.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ro.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ro.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ru.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/ru.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/sq.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/sq.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/sv.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/sv.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/zh-cn.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/lang/zh-cn.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/base64image/dialogs/base64image.js
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/colordialog/dialogs/colordialog.css
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/colordialog/dialogs/colordialog.js
@@ -2311,7 +2388,9 @@ lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/table/dialogs/tab
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/tabletools/dialogs/tableCell.js
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/plugins/wordcount/css/wordcount.css
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/dialog.css
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/dialog.css.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/editor.css
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/editor.css.gz
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/icons.png
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/icons_hidpi.png
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/arrow.png
@@ -2324,6 +2403,7 @@ lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/l
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/lock.png
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/skins/moono-lisa/images/refresh.png
 lib/webmin/authentic-theme/unauthenticated/js/ckeditor/styles.js
+lib/webmin/authentic-theme/unauthenticated/js/ckeditor/styles.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/apl/apl.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/asciiarmor/asciiarmor.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/asn.1/asn.1.js
@@ -2332,6 +2412,7 @@ lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/brainfuck/brainfuc
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/clike/clike.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/clike/test.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/clojure/clojure.js
+lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/clojure/test.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/cmake/cmake.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/cobol/cobol.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/coffeescript/coffeescript.js
@@ -2350,6 +2431,7 @@ lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dart/dart.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/diff/diff.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/django/django.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dockerfile/dockerfile.js
+lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dockerfile/test.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dtd/dtd.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dylan/dylan.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/dylan/test.js
@@ -2390,7 +2472,6 @@ lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/markdown/markdown.
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/markdown/test.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/mathematica/mathematica.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/mbox/mbox.js
-lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/meta.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/mirc/mirc.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/mllike/mllike.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/modelica/modelica.js
@@ -2477,9 +2558,15 @@ lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/yacas/yacas.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/yaml-frontmatter/yaml-frontmatter.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/yaml/yaml.js
 lib/webmin/authentic-theme/unauthenticated/js/codemirror/mode/z80/z80.js
+lib/webmin/authentic-theme/unauthenticated/js/defaults.js
 lib/webmin/authentic-theme/unauthenticated/js/detector.min.js
+lib/webmin/authentic-theme/unauthenticated/js/detector.min.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/jquery.fancytree.min.js
+lib/webmin/authentic-theme/unauthenticated/js/jquery.fancytree.min.js.gz
 lib/webmin/authentic-theme/unauthenticated/js/jquery.jspanel.min.js
+lib/webmin/authentic-theme/unauthenticated/js/jquery.jspanel.min.js.gz
+lib/webmin/authentic-theme/unauthenticated/js/photoswipe.min.js
+lib/webmin/authentic-theme/unauthenticated/js/photoswipe.min.js.gz
 lib/webmin/backup-config/CHANGELOG
 lib/webmin/backup-config/backup-config-lib.pl
 lib/webmin/backup-config/backup.cgi
@@ -2536,7 +2623,6 @@ lib/webmin/backup-config/help/config_date_subs.pl.UTF-8.html
 lib/webmin/backup-config/help/config_date_subs.pl.html
 lib/webmin/backup-config/help/config_date_subs.ru.UTF-8.html
 lib/webmin/backup-config/images/icon.gif
-lib/webmin/backup-config/images/smallicon.gif
 lib/webmin/backup-config/index.cgi
 lib/webmin/backup-config/lang/ar
 lib/webmin/backup-config/lang/ca
@@ -2582,30 +2668,37 @@ lib/webmin/backup-config/log_parser.pl
 lib/webmin/backup-config/module.info
 lib/webmin/backup-config/module.info.ar
 lib/webmin/backup-config/module.info.ca
+lib/webmin/backup-config/module.info.ca.UTF-8
 lib/webmin/backup-config/module.info.cz
 lib/webmin/backup-config/module.info.cz.UTF-8
 lib/webmin/backup-config/module.info.de
+lib/webmin/backup-config/module.info.de.UTF-8
 lib/webmin/backup-config/module.info.es
+lib/webmin/backup-config/module.info.es.UTF-8
 lib/webmin/backup-config/module.info.fr
+lib/webmin/backup-config/module.info.fr.UTF-8
 lib/webmin/backup-config/module.info.hu
 lib/webmin/backup-config/module.info.hu.UTF-8
 lib/webmin/backup-config/module.info.it
+lib/webmin/backup-config/module.info.it.UTF-8
 lib/webmin/backup-config/module.info.ja_JP.UTF-8
 lib/webmin/backup-config/module.info.ja_JP.euc
 lib/webmin/backup-config/module.info.ko_KR.UTF-8
 lib/webmin/backup-config/module.info.ko_KR.euc
 lib/webmin/backup-config/module.info.ms_MY
+lib/webmin/backup-config/module.info.ms_MY.UTF-8
 lib/webmin/backup-config/module.info.nl
+lib/webmin/backup-config/module.info.nl.UTF-8
 lib/webmin/backup-config/module.info.no
 lib/webmin/backup-config/module.info.no.UTF-8
 lib/webmin/backup-config/module.info.pl
 lib/webmin/backup-config/module.info.pl.UTF-8
-lib/webmin/backup-config/module.info.ru.UTF-8
 lib/webmin/backup-config/module.info.ru_RU
 lib/webmin/backup-config/module.info.ru_RU.UTF-8
 lib/webmin/backup-config/module.info.sk
 lib/webmin/backup-config/module.info.sk.UTF-8
 lib/webmin/backup-config/module.info.sv
+lib/webmin/backup-config/module.info.sv.UTF-8
 lib/webmin/backup-config/module.info.tr
 lib/webmin/backup-config/restore.cgi
 lib/webmin/backup-config/save.cgi
@@ -2896,7 +2989,6 @@ lib/webmin/bacula-backup/images/rfile.gif
 lib/webmin/bacula-backup/images/schedules.gif
 lib/webmin/bacula-backup/images/sdir.gif
 lib/webmin/bacula-backup/images/sdirectors.gif
-lib/webmin/bacula-backup/images/smallicon.gif
 lib/webmin/bacula-backup/images/srfile.gif
 lib/webmin/bacula-backup/images/storagec.gif
 lib/webmin/bacula-backup/images/storages.gif
@@ -2946,9 +3038,13 @@ lib/webmin/bacula-backup/log_parser.pl
 lib/webmin/bacula-backup/manual.sxw
 lib/webmin/bacula-backup/module.info
 lib/webmin/bacula-backup/module.info.ca
+lib/webmin/bacula-backup/module.info.ca.UTF-8
 lib/webmin/bacula-backup/module.info.de
+lib/webmin/bacula-backup/module.info.de.UTF-8
 lib/webmin/bacula-backup/module.info.ms_MY
+lib/webmin/bacula-backup/module.info.ms_MY.UTF-8
 lib/webmin/bacula-backup/module.info.nl
+lib/webmin/bacula-backup/module.info.nl.UTF-8
 lib/webmin/bacula-backup/module.info.no
 lib/webmin/bacula-backup/module.info.no.UTF-8
 lib/webmin/bacula-backup/module.info.pl
@@ -3023,7 +3119,6 @@ lib/webmin/bandwidth/help/intro.pl.html
 lib/webmin/bandwidth/images/blue.gif
 lib/webmin/bandwidth/images/icon.gif
 lib/webmin/bandwidth/images/red.gif
-lib/webmin/bandwidth/images/smallicon.gif
 lib/webmin/bandwidth/index.cgi
 lib/webmin/bandwidth/lang/ca
 lib/webmin/bandwidth/lang/ca.UTF-8
@@ -3053,15 +3148,21 @@ lib/webmin/bandwidth/lang/sv.UTF-8
 lib/webmin/bandwidth/log_parser.pl
 lib/webmin/bandwidth/module.info
 lib/webmin/bandwidth/module.info.ca
+lib/webmin/bandwidth/module.info.ca.UTF-8
 lib/webmin/bandwidth/module.info.cz
 lib/webmin/bandwidth/module.info.cz.UTF-8
 lib/webmin/bandwidth/module.info.de
+lib/webmin/bandwidth/module.info.de.UTF-8
 lib/webmin/bandwidth/module.info.es
+lib/webmin/bandwidth/module.info.es.UTF-8
 lib/webmin/bandwidth/module.info.fr
+lib/webmin/bandwidth/module.info.fr.UTF-8
 lib/webmin/bandwidth/module.info.hu
 lib/webmin/bandwidth/module.info.hu.UTF-8
 lib/webmin/bandwidth/module.info.ms_MY
+lib/webmin/bandwidth/module.info.ms_MY.UTF-8
 lib/webmin/bandwidth/module.info.nl
+lib/webmin/bandwidth/module.info.nl.UTF-8
 lib/webmin/bandwidth/module.info.no
 lib/webmin/bandwidth/module.info.no.UTF-8
 lib/webmin/bandwidth/module.info.pl
@@ -3282,7 +3383,6 @@ lib/webmin/bind8/images/rndc.gif
 lib/webmin/bind8/images/servers.gif
 lib/webmin/bind8/images/slave.gif
 lib/webmin/bind8/images/slaves.gif
-lib/webmin/bind8/images/smallicon.gif
 lib/webmin/bind8/images/soa.gif
 lib/webmin/bind8/images/stub.gif
 lib/webmin/bind8/images/text.gif
@@ -3360,11 +3460,15 @@ lib/webmin/bind8/module.info
 lib/webmin/bind8/module.info.bg
 lib/webmin/bind8/module.info.bg.UTF-8
 lib/webmin/bind8/module.info.ca
+lib/webmin/bind8/module.info.ca.UTF-8
 lib/webmin/bind8/module.info.cz
 lib/webmin/bind8/module.info.cz.UTF-8
 lib/webmin/bind8/module.info.de
+lib/webmin/bind8/module.info.de.UTF-8
 lib/webmin/bind8/module.info.es
+lib/webmin/bind8/module.info.es.UTF-8
 lib/webmin/bind8/module.info.fr
+lib/webmin/bind8/module.info.fr.UTF-8
 lib/webmin/bind8/module.info.hu
 lib/webmin/bind8/module.info.hu.UTF-8
 lib/webmin/bind8/module.info.ja_JP.UTF-8
@@ -3372,23 +3476,26 @@ lib/webmin/bind8/module.info.ja_JP.euc
 lib/webmin/bind8/module.info.ko_KR.UTF-8
 lib/webmin/bind8/module.info.ko_KR.euc
 lib/webmin/bind8/module.info.ms_MY
+lib/webmin/bind8/module.info.ms_MY.UTF-8
 lib/webmin/bind8/module.info.nl
+lib/webmin/bind8/module.info.nl.UTF-8
 lib/webmin/bind8/module.info.no
 lib/webmin/bind8/module.info.no.UTF-8
 lib/webmin/bind8/module.info.pl
 lib/webmin/bind8/module.info.pl.UTF-8
 lib/webmin/bind8/module.info.pt
+lib/webmin/bind8/module.info.pt.UTF-8
 lib/webmin/bind8/module.info.pt_BR
+lib/webmin/bind8/module.info.pt_BR.UTF-8
 lib/webmin/bind8/module.info.ru.UTF-8
 lib/webmin/bind8/module.info.ru_RU
 lib/webmin/bind8/module.info.ru_RU.UTF-8
 lib/webmin/bind8/module.info.ru_SU
 lib/webmin/bind8/module.info.sv
+lib/webmin/bind8/module.info.sv.UTF-8
 lib/webmin/bind8/module.info.tr
 lib/webmin/bind8/module.info.zh_CN
-lib/webmin/bind8/module.info.zh_CN.UTF-8
 lib/webmin/bind8/module.info.zh_TW.Big5
-lib/webmin/bind8/module.info.zh_TW.UTF-8
 lib/webmin/bind8/move_zone.cgi
 lib/webmin/bind8/old_save_controls.cgi
 lib/webmin/bind8/open.cgi
@@ -4260,7 +4367,6 @@ lib/webmin/bsdexports/delete_export.cgi
 lib/webmin/bsdexports/delete_exports.cgi
 lib/webmin/bsdexports/edit_export.cgi
 lib/webmin/bsdexports/images/icon.gif
-lib/webmin/bsdexports/images/smallicon.gif
 lib/webmin/bsdexports/index.cgi
 lib/webmin/bsdexports/install_check.pl
 lib/webmin/bsdexports/lang/ca
@@ -4275,10 +4381,15 @@ lib/webmin/bsdexports/lang/nl
 lib/webmin/bsdexports/lang/nl.UTF-8
 lib/webmin/bsdexports/module.info
 lib/webmin/bsdexports/module.info.ca
+lib/webmin/bsdexports/module.info.ca.UTF-8
 lib/webmin/bsdexports/module.info.de
+lib/webmin/bsdexports/module.info.de.UTF-8
 lib/webmin/bsdexports/module.info.es
+lib/webmin/bsdexports/module.info.es.UTF-8
 lib/webmin/bsdexports/module.info.eu
+lib/webmin/bsdexports/module.info.eu.UTF-8
 lib/webmin/bsdexports/module.info.fr
+lib/webmin/bsdexports/module.info.fr.UTF-8
 lib/webmin/bsdexports/module.info.hu
 lib/webmin/bsdexports/module.info.hu.UTF-8
 lib/webmin/bsdexports/module.info.ja_JP.UTF-8
@@ -4286,16 +4397,18 @@ lib/webmin/bsdexports/module.info.ja_JP.euc
 lib/webmin/bsdexports/module.info.ko_KR.UTF-8
 lib/webmin/bsdexports/module.info.ko_KR.euc
 lib/webmin/bsdexports/module.info.nl
+lib/webmin/bsdexports/module.info.nl.UTF-8
 lib/webmin/bsdexports/module.info.pl
 lib/webmin/bsdexports/module.info.pl.UTF-8
 lib/webmin/bsdexports/module.info.pt
+lib/webmin/bsdexports/module.info.pt.UTF-8
 lib/webmin/bsdexports/module.info.pt_BR
+lib/webmin/bsdexports/module.info.pt_BR.UTF-8
 lib/webmin/bsdexports/module.info.sv
+lib/webmin/bsdexports/module.info.sv.UTF-8
 lib/webmin/bsdexports/module.info.tr
 lib/webmin/bsdexports/module.info.zh_CN
-lib/webmin/bsdexports/module.info.zh_CN.UTF-8
 lib/webmin/bsdexports/module.info.zh_TW.Big5
-lib/webmin/bsdexports/module.info.zh_TW.UTF-8
 lib/webmin/bsdexports/notes
 lib/webmin/bsdexports/restart_mountd.cgi
 lib/webmin/bsdexports/save_export.cgi
@@ -4329,7 +4442,9 @@ lib/webmin/bsdfdisk/lang/en.UTF-8
 lib/webmin/bsdfdisk/log_parser.pl
 lib/webmin/bsdfdisk/module.info
 lib/webmin/bsdfdisk/module.info.ca
+lib/webmin/bsdfdisk/module.info.ca.UTF-8
 lib/webmin/bsdfdisk/module.info.de
+lib/webmin/bsdfdisk/module.info.de.UTF-8
 lib/webmin/bsdfdisk/newfs.cgi
 lib/webmin/bsdfdisk/newfs_form.cgi
 lib/webmin/bsdfdisk/part_form.cgi
@@ -4353,7 +4468,6 @@ lib/webmin/burner/images/cdrom.gif
 lib/webmin/burner/images/dev.gif
 lib/webmin/burner/images/icon.gif
 lib/webmin/burner/images/mkisofs.gif
-lib/webmin/burner/images/smallicon.gif
 lib/webmin/burner/index.cgi
 lib/webmin/burner/install_check.pl
 lib/webmin/burner/lang/bg
@@ -4399,19 +4513,27 @@ lib/webmin/burner/lang/zh_TW.Big5
 lib/webmin/burner/lang/zh_TW.UTF-8
 lib/webmin/burner/module.info
 lib/webmin/burner/module.info.ca
+lib/webmin/burner/module.info.ca.UTF-8
 lib/webmin/burner/module.info.cz
 lib/webmin/burner/module.info.cz.UTF-8
 lib/webmin/burner/module.info.de
+lib/webmin/burner/module.info.de.UTF-8
 lib/webmin/burner/module.info.es
+lib/webmin/burner/module.info.es.UTF-8
 lib/webmin/burner/module.info.fr
+lib/webmin/burner/module.info.fr.UTF-8
 lib/webmin/burner/module.info.it
+lib/webmin/burner/module.info.it.UTF-8
 lib/webmin/burner/module.info.ms_MY
+lib/webmin/burner/module.info.ms_MY.UTF-8
 lib/webmin/burner/module.info.nl
+lib/webmin/burner/module.info.nl.UTF-8
 lib/webmin/burner/module.info.no
 lib/webmin/burner/module.info.no.UTF-8
 lib/webmin/burner/module.info.pl
 lib/webmin/burner/module.info.pl.UTF-8
 lib/webmin/burner/module.info.pt_BR
+lib/webmin/burner/module.info.pt_BR.UTF-8
 lib/webmin/burner/module.info.ru.UTF-8
 lib/webmin/burner/module.info.ru_RU
 lib/webmin/burner/module.info.ru_RU.UTF-8
@@ -4419,8 +4541,8 @@ lib/webmin/burner/module.info.ru_SU
 lib/webmin/burner/module.info.sk
 lib/webmin/burner/module.info.sk.UTF-8
 lib/webmin/burner/module.info.sv
+lib/webmin/burner/module.info.sv.UTF-8
 lib/webmin/burner/module.info.zh_TW.Big5
-lib/webmin/burner/module.info.zh_TW.UTF-8
 lib/webmin/burner/rbac-mapping
 lib/webmin/burner/save_dev.cgi
 lib/webmin/burner/save_mkisofs.cgi
@@ -4431,7 +4553,6 @@ lib/webmin/change-user/change-user-lib.pl
 lib/webmin/change-user/change.cgi
 lib/webmin/change-user/defaultacl
 lib/webmin/change-user/images/icon.gif
-lib/webmin/change-user/images/smallicon.gif
 lib/webmin/change-user/index.cgi
 lib/webmin/change-user/lang/ar
 lib/webmin/change-user/lang/ca
@@ -4485,27 +4606,37 @@ lib/webmin/change-user/lang/zh_TW.UTF-8
 lib/webmin/change-user/module.info
 lib/webmin/change-user/module.info.ar
 lib/webmin/change-user/module.info.ca
+lib/webmin/change-user/module.info.ca.UTF-8
 lib/webmin/change-user/module.info.cz
 lib/webmin/change-user/module.info.cz.UTF-8
 lib/webmin/change-user/module.info.de
+lib/webmin/change-user/module.info.de.UTF-8
 lib/webmin/change-user/module.info.es
+lib/webmin/change-user/module.info.es.UTF-8
 lib/webmin/change-user/module.info.eu
+lib/webmin/change-user/module.info.eu.UTF-8
 lib/webmin/change-user/module.info.fr
+lib/webmin/change-user/module.info.fr.UTF-8
 lib/webmin/change-user/module.info.hu
 lib/webmin/change-user/module.info.hu.UTF-8
 lib/webmin/change-user/module.info.it
+lib/webmin/change-user/module.info.it.UTF-8
 lib/webmin/change-user/module.info.ja_JP.UTF-8
 lib/webmin/change-user/module.info.ja_JP.euc
 lib/webmin/change-user/module.info.ko_KR.UTF-8
 lib/webmin/change-user/module.info.ko_KR.euc
 lib/webmin/change-user/module.info.ms
+lib/webmin/change-user/module.info.ms.UTF-8
 lib/webmin/change-user/module.info.ms_MY
+lib/webmin/change-user/module.info.ms_MY.UTF-8
 lib/webmin/change-user/module.info.nl
+lib/webmin/change-user/module.info.nl.UTF-8
 lib/webmin/change-user/module.info.no
 lib/webmin/change-user/module.info.no.UTF-8
 lib/webmin/change-user/module.info.pl
 lib/webmin/change-user/module.info.pl.UTF-8
 lib/webmin/change-user/module.info.pt_BR
+lib/webmin/change-user/module.info.pt_BR.UTF-8
 lib/webmin/change-user/module.info.ru.UTF-8
 lib/webmin/change-user/module.info.ru_RU
 lib/webmin/change-user/module.info.ru_RU.UTF-8
@@ -4514,7 +4645,6 @@ lib/webmin/change-user/module.info.sk
 lib/webmin/change-user/module.info.sk.UTF-8
 lib/webmin/change-user/module.info.tr
 lib/webmin/change-user/module.info.zh_TW.Big5
-lib/webmin/change-user/module.info.zh_TW.UTF-8
 lib/webmin/changepass.pl
 lib/webmin/chooser.cgi
 lib/webmin/cluster-copy/CHANGELOG
@@ -4547,7 +4677,6 @@ lib/webmin/cluster-copy/help/intro.nl.html
 lib/webmin/cluster-copy/help/intro.pl.UTF-8.html
 lib/webmin/cluster-copy/help/intro.pl.html
 lib/webmin/cluster-copy/images/icon.gif
-lib/webmin/cluster-copy/images/smallicon.gif
 lib/webmin/cluster-copy/index.cgi
 lib/webmin/cluster-copy/lang/ca
 lib/webmin/cluster-copy/lang/ca.UTF-8
@@ -4573,15 +4702,21 @@ lib/webmin/cluster-copy/lang/pl.UTF-8
 lib/webmin/cluster-copy/log_parser.pl
 lib/webmin/cluster-copy/module.info
 lib/webmin/cluster-copy/module.info.ca
+lib/webmin/cluster-copy/module.info.ca.UTF-8
 lib/webmin/cluster-copy/module.info.cz
 lib/webmin/cluster-copy/module.info.cz.UTF-8
 lib/webmin/cluster-copy/module.info.de
+lib/webmin/cluster-copy/module.info.de.UTF-8
 lib/webmin/cluster-copy/module.info.es
+lib/webmin/cluster-copy/module.info.es.UTF-8
 lib/webmin/cluster-copy/module.info.fr
+lib/webmin/cluster-copy/module.info.fr.UTF-8
 lib/webmin/cluster-copy/module.info.hu
 lib/webmin/cluster-copy/module.info.hu.UTF-8
 lib/webmin/cluster-copy/module.info.ms_MY
+lib/webmin/cluster-copy/module.info.ms_MY.UTF-8
 lib/webmin/cluster-copy/module.info.nl
+lib/webmin/cluster-copy/module.info.nl.UTF-8
 lib/webmin/cluster-copy/module.info.no
 lib/webmin/cluster-copy/module.info.no.UTF-8
 lib/webmin/cluster-copy/module.info.pl
@@ -4603,7 +4738,6 @@ lib/webmin/cluster-cron/help/intro.nl.html
 lib/webmin/cluster-cron/help/intro.pl.UTF-8.html
 lib/webmin/cluster-cron/help/intro.pl.html
 lib/webmin/cluster-cron/images/icon.gif
-lib/webmin/cluster-cron/images/smallicon.gif
 lib/webmin/cluster-cron/index.cgi
 lib/webmin/cluster-cron/lang/ca
 lib/webmin/cluster-cron/lang/ca.UTF-8
@@ -4629,15 +4763,21 @@ lib/webmin/cluster-cron/lang/pl.UTF-8
 lib/webmin/cluster-cron/log_parser.pl
 lib/webmin/cluster-cron/module.info
 lib/webmin/cluster-cron/module.info.ca
+lib/webmin/cluster-cron/module.info.ca.UTF-8
 lib/webmin/cluster-cron/module.info.cz
 lib/webmin/cluster-cron/module.info.cz.UTF-8
 lib/webmin/cluster-cron/module.info.de
+lib/webmin/cluster-cron/module.info.de.UTF-8
 lib/webmin/cluster-cron/module.info.es
+lib/webmin/cluster-cron/module.info.es.UTF-8
 lib/webmin/cluster-cron/module.info.fr
+lib/webmin/cluster-cron/module.info.fr.UTF-8
 lib/webmin/cluster-cron/module.info.hu
 lib/webmin/cluster-cron/module.info.hu.UTF-8
 lib/webmin/cluster-cron/module.info.ms_MY
+lib/webmin/cluster-cron/module.info.ms_MY.UTF-8
 lib/webmin/cluster-cron/module.info.nl
+lib/webmin/cluster-cron/module.info.nl.UTF-8
 lib/webmin/cluster-cron/module.info.no
 lib/webmin/cluster-cron/module.info.no.UTF-8
 lib/webmin/cluster-cron/module.info.pl
@@ -4676,7 +4816,6 @@ lib/webmin/cluster-passwd/config.info.pl.UTF-8
 lib/webmin/cluster-passwd/defaultacl
 lib/webmin/cluster-passwd/edit_passwd.cgi
 lib/webmin/cluster-passwd/images/icon.gif
-lib/webmin/cluster-passwd/images/smallicon.gif
 lib/webmin/cluster-passwd/index.cgi
 lib/webmin/cluster-passwd/lang/ca
 lib/webmin/cluster-passwd/lang/ca.UTF-8
@@ -4707,16 +4846,23 @@ lib/webmin/cluster-passwd/lang/pl.UTF-8
 lib/webmin/cluster-passwd/log_parser.pl
 lib/webmin/cluster-passwd/module.info
 lib/webmin/cluster-passwd/module.info.ca
+lib/webmin/cluster-passwd/module.info.ca.UTF-8
 lib/webmin/cluster-passwd/module.info.cz
 lib/webmin/cluster-passwd/module.info.cz.UTF-8
 lib/webmin/cluster-passwd/module.info.de
+lib/webmin/cluster-passwd/module.info.de.UTF-8
 lib/webmin/cluster-passwd/module.info.es
+lib/webmin/cluster-passwd/module.info.es.UTF-8
 lib/webmin/cluster-passwd/module.info.fr
+lib/webmin/cluster-passwd/module.info.fr.UTF-8
 lib/webmin/cluster-passwd/module.info.hu
 lib/webmin/cluster-passwd/module.info.hu.UTF-8
 lib/webmin/cluster-passwd/module.info.ms
+lib/webmin/cluster-passwd/module.info.ms.UTF-8
 lib/webmin/cluster-passwd/module.info.ms_MY
+lib/webmin/cluster-passwd/module.info.ms_MY.UTF-8
 lib/webmin/cluster-passwd/module.info.nl
+lib/webmin/cluster-passwd/module.info.nl.UTF-8
 lib/webmin/cluster-passwd/module.info.no
 lib/webmin/cluster-passwd/module.info.no.UTF-8
 lib/webmin/cluster-passwd/module.info.pl
@@ -4731,7 +4877,6 @@ lib/webmin/cluster-shell/help/intro.nl.html
 lib/webmin/cluster-shell/help/intro.pl.UTF-8.html
 lib/webmin/cluster-shell/help/intro.pl.html
 lib/webmin/cluster-shell/images/icon.gif
-lib/webmin/cluster-shell/images/smallicon.gif
 lib/webmin/cluster-shell/index.cgi
 lib/webmin/cluster-shell/lang/ca
 lib/webmin/cluster-shell/lang/ca.UTF-8
@@ -4757,15 +4902,21 @@ lib/webmin/cluster-shell/lang/pl.UTF-8
 lib/webmin/cluster-shell/log_parser.pl
 lib/webmin/cluster-shell/module.info
 lib/webmin/cluster-shell/module.info.ca
+lib/webmin/cluster-shell/module.info.ca.UTF-8
 lib/webmin/cluster-shell/module.info.cz
 lib/webmin/cluster-shell/module.info.cz.UTF-8
 lib/webmin/cluster-shell/module.info.de
+lib/webmin/cluster-shell/module.info.de.UTF-8
 lib/webmin/cluster-shell/module.info.es
+lib/webmin/cluster-shell/module.info.es.UTF-8
 lib/webmin/cluster-shell/module.info.fr
+lib/webmin/cluster-shell/module.info.fr.UTF-8
 lib/webmin/cluster-shell/module.info.hu
 lib/webmin/cluster-shell/module.info.hu.UTF-8
 lib/webmin/cluster-shell/module.info.ms_MY
+lib/webmin/cluster-shell/module.info.ms_MY.UTF-8
 lib/webmin/cluster-shell/module.info.nl
+lib/webmin/cluster-shell/module.info.nl.UTF-8
 lib/webmin/cluster-shell/module.info.no
 lib/webmin/cluster-shell/module.info.no.UTF-8
 lib/webmin/cluster-shell/module.info.pl
@@ -4875,7 +5026,6 @@ lib/webmin/cluster-software/images/close.gif
 lib/webmin/cluster-software/images/icon.gif
 lib/webmin/cluster-software/images/open.gif
 lib/webmin/cluster-software/images/pack.gif
-lib/webmin/cluster-software/images/smallicon.gif
 lib/webmin/cluster-software/images/template.gif
 lib/webmin/cluster-software/index.cgi
 lib/webmin/cluster-software/install_pack.cgi
@@ -4903,15 +5053,21 @@ lib/webmin/cluster-software/lang/pl.UTF-8
 lib/webmin/cluster-software/list_pack.cgi
 lib/webmin/cluster-software/module.info
 lib/webmin/cluster-software/module.info.ca
+lib/webmin/cluster-software/module.info.ca.UTF-8
 lib/webmin/cluster-software/module.info.cz
 lib/webmin/cluster-software/module.info.cz.UTF-8
 lib/webmin/cluster-software/module.info.de
+lib/webmin/cluster-software/module.info.de.UTF-8
 lib/webmin/cluster-software/module.info.es
+lib/webmin/cluster-software/module.info.es.UTF-8
 lib/webmin/cluster-software/module.info.fr
+lib/webmin/cluster-software/module.info.fr.UTF-8
 lib/webmin/cluster-software/module.info.hu
 lib/webmin/cluster-software/module.info.hu.UTF-8
 lib/webmin/cluster-software/module.info.ms_MY
+lib/webmin/cluster-software/module.info.ms_MY.UTF-8
 lib/webmin/cluster-software/module.info.nl
+lib/webmin/cluster-software/module.info.nl.UTF-8
 lib/webmin/cluster-software/module.info.no
 lib/webmin/cluster-software/module.info.no.UTF-8
 lib/webmin/cluster-software/module.info.pl
@@ -4964,7 +5120,6 @@ lib/webmin/cluster-useradmin/help/intro.nl.html
 lib/webmin/cluster-useradmin/help/intro.pl.UTF-8.html
 lib/webmin/cluster-useradmin/help/intro.pl.html
 lib/webmin/cluster-useradmin/images/icon.gif
-lib/webmin/cluster-useradmin/images/smallicon.gif
 lib/webmin/cluster-useradmin/index.cgi
 lib/webmin/cluster-useradmin/lang/ca
 lib/webmin/cluster-useradmin/lang/ca.UTF-8
@@ -4990,15 +5145,21 @@ lib/webmin/cluster-useradmin/lang/pl.UTF-8
 lib/webmin/cluster-useradmin/log_parser.pl
 lib/webmin/cluster-useradmin/module.info
 lib/webmin/cluster-useradmin/module.info.ca
+lib/webmin/cluster-useradmin/module.info.ca.UTF-8
 lib/webmin/cluster-useradmin/module.info.cz
 lib/webmin/cluster-useradmin/module.info.cz.UTF-8
 lib/webmin/cluster-useradmin/module.info.de
+lib/webmin/cluster-useradmin/module.info.de.UTF-8
 lib/webmin/cluster-useradmin/module.info.es
+lib/webmin/cluster-useradmin/module.info.es.UTF-8
 lib/webmin/cluster-useradmin/module.info.fr
+lib/webmin/cluster-useradmin/module.info.fr.UTF-8
 lib/webmin/cluster-useradmin/module.info.hu
 lib/webmin/cluster-useradmin/module.info.hu.UTF-8
 lib/webmin/cluster-useradmin/module.info.ms_MY
+lib/webmin/cluster-useradmin/module.info.ms_MY.UTF-8
 lib/webmin/cluster-useradmin/module.info.nl
+lib/webmin/cluster-useradmin/module.info.nl.UTF-8
 lib/webmin/cluster-useradmin/module.info.no
 lib/webmin/cluster-useradmin/module.info.no.UTF-8
 lib/webmin/cluster-useradmin/module.info.pl
@@ -5047,7 +5208,6 @@ lib/webmin/cluster-usermin/help/intro.html
 lib/webmin/cluster-usermin/help/intro.nl.UTF-8.html
 lib/webmin/cluster-usermin/help/intro.nl.html
 lib/webmin/cluster-usermin/images/icon.gif
-lib/webmin/cluster-usermin/images/smallicon.gif
 lib/webmin/cluster-usermin/index.cgi
 lib/webmin/cluster-usermin/install.cgi
 lib/webmin/cluster-usermin/lang/ca
@@ -5071,15 +5231,21 @@ lib/webmin/cluster-usermin/lang/pl
 lib/webmin/cluster-usermin/lang/pl.UTF-8
 lib/webmin/cluster-usermin/module.info
 lib/webmin/cluster-usermin/module.info.ca
+lib/webmin/cluster-usermin/module.info.ca.UTF-8
 lib/webmin/cluster-usermin/module.info.cz
 lib/webmin/cluster-usermin/module.info.cz.UTF-8
 lib/webmin/cluster-usermin/module.info.de
+lib/webmin/cluster-usermin/module.info.de.UTF-8
 lib/webmin/cluster-usermin/module.info.es
+lib/webmin/cluster-usermin/module.info.es.UTF-8
 lib/webmin/cluster-usermin/module.info.fr
+lib/webmin/cluster-usermin/module.info.fr.UTF-8
 lib/webmin/cluster-usermin/module.info.hu
 lib/webmin/cluster-usermin/module.info.hu.UTF-8
 lib/webmin/cluster-usermin/module.info.ms_MY
+lib/webmin/cluster-usermin/module.info.ms_MY.UTF-8
 lib/webmin/cluster-usermin/module.info.nl
+lib/webmin/cluster-usermin/module.info.nl.UTF-8
 lib/webmin/cluster-usermin/module.info.no
 lib/webmin/cluster-usermin/module.info.no.UTF-8
 lib/webmin/cluster-usermin/module.info.pl
@@ -5136,7 +5302,6 @@ lib/webmin/cluster-webmin/help/intro.nl.html
 lib/webmin/cluster-webmin/help/intro.pl.UTF-8.html
 lib/webmin/cluster-webmin/help/intro.pl.html
 lib/webmin/cluster-webmin/images/icon.gif
-lib/webmin/cluster-webmin/images/smallicon.gif
 lib/webmin/cluster-webmin/index.cgi
 lib/webmin/cluster-webmin/install.cgi
 lib/webmin/cluster-webmin/lang/ca
@@ -5162,15 +5327,21 @@ lib/webmin/cluster-webmin/lang/pl
 lib/webmin/cluster-webmin/lang/pl.UTF-8
 lib/webmin/cluster-webmin/module.info
 lib/webmin/cluster-webmin/module.info.ca
+lib/webmin/cluster-webmin/module.info.ca.UTF-8
 lib/webmin/cluster-webmin/module.info.cz
 lib/webmin/cluster-webmin/module.info.cz.UTF-8
 lib/webmin/cluster-webmin/module.info.de
+lib/webmin/cluster-webmin/module.info.de.UTF-8
 lib/webmin/cluster-webmin/module.info.es
+lib/webmin/cluster-webmin/module.info.es.UTF-8
 lib/webmin/cluster-webmin/module.info.fr
+lib/webmin/cluster-webmin/module.info.fr.UTF-8
 lib/webmin/cluster-webmin/module.info.hu
 lib/webmin/cluster-webmin/module.info.hu.UTF-8
 lib/webmin/cluster-webmin/module.info.ms_MY
+lib/webmin/cluster-webmin/module.info.ms_MY.UTF-8
 lib/webmin/cluster-webmin/module.info.nl
+lib/webmin/cluster-webmin/module.info.nl.UTF-8
 lib/webmin/cluster-webmin/module.info.no
 lib/webmin/cluster-webmin/module.info.no.UTF-8
 lib/webmin/cluster-webmin/module.info.pl
@@ -5274,7 +5445,6 @@ lib/webmin/cpan/edit_mod.cgi
 lib/webmin/cpan/images/cat.gif
 lib/webmin/cpan/images/icon.gif
 lib/webmin/cpan/images/mod.gif
-lib/webmin/cpan/images/smallicon.gif
 lib/webmin/cpan/index.cgi
 lib/webmin/cpan/install.cgi
 lib/webmin/cpan/lang/ca
@@ -5322,20 +5492,27 @@ lib/webmin/cpan/lang/zh_TW.Big5
 lib/webmin/cpan/lang/zh_TW.UTF-8
 lib/webmin/cpan/module.info
 lib/webmin/cpan/module.info.ca
+lib/webmin/cpan/module.info.ca.UTF-8
 lib/webmin/cpan/module.info.cz
 lib/webmin/cpan/module.info.cz.UTF-8
 lib/webmin/cpan/module.info.de
+lib/webmin/cpan/module.info.de.UTF-8
 lib/webmin/cpan/module.info.es
+lib/webmin/cpan/module.info.es.UTF-8
 lib/webmin/cpan/module.info.fr
+lib/webmin/cpan/module.info.fr.UTF-8
 lib/webmin/cpan/module.info.hu
 lib/webmin/cpan/module.info.hu.UTF-8
 lib/webmin/cpan/module.info.it
+lib/webmin/cpan/module.info.it.UTF-8
 lib/webmin/cpan/module.info.ja_JP.UTF-8
 lib/webmin/cpan/module.info.ja_JP.euc
 lib/webmin/cpan/module.info.ko_KR.UTF-8
 lib/webmin/cpan/module.info.ko_KR.euc
 lib/webmin/cpan/module.info.ms_MY
+lib/webmin/cpan/module.info.ms_MY.UTF-8
 lib/webmin/cpan/module.info.nl
+lib/webmin/cpan/module.info.nl.UTF-8
 lib/webmin/cpan/module.info.no
 lib/webmin/cpan/module.info.no.UTF-8
 lib/webmin/cpan/module.info.pl
@@ -5345,10 +5522,9 @@ lib/webmin/cpan/module.info.ru_RU
 lib/webmin/cpan/module.info.ru_RU.UTF-8
 lib/webmin/cpan/module.info.ru_SU
 lib/webmin/cpan/module.info.sv
+lib/webmin/cpan/module.info.sv.UTF-8
 lib/webmin/cpan/module.info.zh_CN
-lib/webmin/cpan/module.info.zh_CN.UTF-8
 lib/webmin/cpan/module.info.zh_TW.Big5
-lib/webmin/cpan/module.info.zh_TW.UTF-8
 lib/webmin/cpan/postinstall.pl
 lib/webmin/cpan/uninstall.cgi
 lib/webmin/cpan/uninstall_mods.cgi
@@ -5501,7 +5677,6 @@ lib/webmin/cron/images/bottom.gif
 lib/webmin/cron/images/down.gif
 lib/webmin/cron/images/gap.gif
 lib/webmin/cron/images/icon.gif
-lib/webmin/cron/images/smallicon.gif
 lib/webmin/cron/images/top.gif
 lib/webmin/cron/images/up.gif
 lib/webmin/cron/index.cgi
@@ -5563,36 +5738,40 @@ lib/webmin/cron/lang/zh_TW.UTF-8
 lib/webmin/cron/log_parser.pl
 lib/webmin/cron/module.info
 lib/webmin/cron/module.info.ca
+lib/webmin/cron/module.info.ca.UTF-8
 lib/webmin/cron/module.info.cz
 lib/webmin/cron/module.info.cz.UTF-8
 lib/webmin/cron/module.info.de
 lib/webmin/cron/module.info.de.UTF-8
 lib/webmin/cron/module.info.es
+lib/webmin/cron/module.info.es.UTF-8
 lib/webmin/cron/module.info.fr
 lib/webmin/cron/module.info.fr.UTF-8
 lib/webmin/cron/module.info.hu
 lib/webmin/cron/module.info.hu.UTF-8
 lib/webmin/cron/module.info.it
+lib/webmin/cron/module.info.it.UTF-8
 lib/webmin/cron/module.info.ja_JP.UTF-8
 lib/webmin/cron/module.info.ja_JP.euc
 lib/webmin/cron/module.info.ko_KR.UTF-8
 lib/webmin/cron/module.info.ko_KR.euc
 lib/webmin/cron/module.info.ms_MY
+lib/webmin/cron/module.info.ms_MY.UTF-8
 lib/webmin/cron/module.info.nl
+lib/webmin/cron/module.info.nl.UTF-8
 lib/webmin/cron/module.info.no
 lib/webmin/cron/module.info.no.UTF-8
 lib/webmin/cron/module.info.pl
 lib/webmin/cron/module.info.pl.UTF-8
 lib/webmin/cron/module.info.pt
-lib/webmin/cron/module.info.ru.UTF-8
+lib/webmin/cron/module.info.pt.UTF-8
 lib/webmin/cron/module.info.sk
 lib/webmin/cron/module.info.sk.UTF-8
 lib/webmin/cron/module.info.sv
+lib/webmin/cron/module.info.sv.UTF-8
 lib/webmin/cron/module.info.tr
 lib/webmin/cron/module.info.zh_CN
-lib/webmin/cron/module.info.zh_CN.UTF-8
 lib/webmin/cron/module.info.zh_TW.Big5
-lib/webmin/cron/module.info.zh_TW.UTF-8
 lib/webmin/cron/move.cgi
 lib/webmin/cron/postinstall.pl
 lib/webmin/cron/range.pl
@@ -6074,7 +6253,6 @@ lib/webmin/custom/help/usermin.nl.html
 lib/webmin/custom/help/usermin.pl.UTF-8.html
 lib/webmin/custom/help/usermin.pl.html
 lib/webmin/custom/images/icon.gif
-lib/webmin/custom/images/smallicon.gif
 lib/webmin/custom/index.cgi
 lib/webmin/custom/lang/ca
 lib/webmin/custom/lang/ca.UTF-8
@@ -6126,25 +6304,33 @@ lib/webmin/custom/lang/zh_TW.UTF-8
 lib/webmin/custom/log_parser.pl
 lib/webmin/custom/module.info
 lib/webmin/custom/module.info.ca
+lib/webmin/custom/module.info.ca.UTF-8
 lib/webmin/custom/module.info.cz
 lib/webmin/custom/module.info.cz.UTF-8
 lib/webmin/custom/module.info.de
+lib/webmin/custom/module.info.de.UTF-8
 lib/webmin/custom/module.info.es
+lib/webmin/custom/module.info.es.UTF-8
 lib/webmin/custom/module.info.fr
+lib/webmin/custom/module.info.fr.UTF-8
 lib/webmin/custom/module.info.hu
 lib/webmin/custom/module.info.hu.UTF-8
 lib/webmin/custom/module.info.it
+lib/webmin/custom/module.info.it.UTF-8
 lib/webmin/custom/module.info.ja_JP.UTF-8
 lib/webmin/custom/module.info.ja_JP.euc
 lib/webmin/custom/module.info.ko_KR.UTF-8
 lib/webmin/custom/module.info.ko_KR.euc
 lib/webmin/custom/module.info.ms_MY
+lib/webmin/custom/module.info.ms_MY.UTF-8
 lib/webmin/custom/module.info.nl
+lib/webmin/custom/module.info.nl.UTF-8
 lib/webmin/custom/module.info.no
 lib/webmin/custom/module.info.no.UTF-8
 lib/webmin/custom/module.info.pl
 lib/webmin/custom/module.info.pl.UTF-8
 lib/webmin/custom/module.info.pt
+lib/webmin/custom/module.info.pt.UTF-8
 lib/webmin/custom/module.info.ru.UTF-8
 lib/webmin/custom/module.info.ru_RU
 lib/webmin/custom/module.info.ru_RU.UTF-8
@@ -6152,11 +6338,10 @@ lib/webmin/custom/module.info.ru_SU
 lib/webmin/custom/module.info.sk
 lib/webmin/custom/module.info.sk.UTF-8
 lib/webmin/custom/module.info.sv
+lib/webmin/custom/module.info.sv.UTF-8
 lib/webmin/custom/module.info.tr
 lib/webmin/custom/module.info.zh_CN
-lib/webmin/custom/module.info.zh_CN.UTF-8
 lib/webmin/custom/module.info.zh_TW.Big5
-lib/webmin/custom/module.info.zh_TW.UTF-8
 lib/webmin/custom/run.cgi
 lib/webmin/custom/save.cgi
 lib/webmin/custom/save_cmd.cgi
@@ -6473,7 +6658,6 @@ lib/webmin/dfsadmin/help/suid.zh_TW.Big5.html
 lib/webmin/dfsadmin/help/suid.zh_TW.UTF-8.html
 lib/webmin/dfsadmin/images/icon.gif
 lib/webmin/dfsadmin/images/share.gif
-lib/webmin/dfsadmin/images/smallicon.gif
 lib/webmin/dfsadmin/index.cgi
 lib/webmin/dfsadmin/lang/ca
 lib/webmin/dfsadmin/lang/ca.UTF-8
@@ -6507,9 +6691,13 @@ lib/webmin/dfsadmin/low.risk
 lib/webmin/dfsadmin/medium.risk
 lib/webmin/dfsadmin/module.info
 lib/webmin/dfsadmin/module.info.ca
+lib/webmin/dfsadmin/module.info.ca.UTF-8
 lib/webmin/dfsadmin/module.info.de
+lib/webmin/dfsadmin/module.info.de.UTF-8
 lib/webmin/dfsadmin/module.info.es
+lib/webmin/dfsadmin/module.info.es.UTF-8
 lib/webmin/dfsadmin/module.info.fr
+lib/webmin/dfsadmin/module.info.fr.UTF-8
 lib/webmin/dfsadmin/module.info.hu
 lib/webmin/dfsadmin/module.info.hu.UTF-8
 lib/webmin/dfsadmin/module.info.ja_JP.UTF-8
@@ -6517,13 +6705,14 @@ lib/webmin/dfsadmin/module.info.ja_JP.euc
 lib/webmin/dfsadmin/module.info.ko_KR.UTF-8
 lib/webmin/dfsadmin/module.info.ko_KR.euc
 lib/webmin/dfsadmin/module.info.nl
+lib/webmin/dfsadmin/module.info.nl.UTF-8
 lib/webmin/dfsadmin/module.info.pt
+lib/webmin/dfsadmin/module.info.pt.UTF-8
 lib/webmin/dfsadmin/module.info.sv
+lib/webmin/dfsadmin/module.info.sv.UTF-8
 lib/webmin/dfsadmin/module.info.tr
 lib/webmin/dfsadmin/module.info.zh_CN
-lib/webmin/dfsadmin/module.info.zh_CN.UTF-8
 lib/webmin/dfsadmin/module.info.zh_TW.Big5
-lib/webmin/dfsadmin/module.info.zh_TW.UTF-8
 lib/webmin/dfsadmin/rbac-mapping
 lib/webmin/dfsadmin/restart_sharing.cgi
 lib/webmin/dfsadmin/save_share.cgi
@@ -6674,7 +6863,6 @@ lib/webmin/dhcpd/images/host.gif
 lib/webmin/dhcpd/images/icon.gif
 lib/webmin/dhcpd/images/pool.gif
 lib/webmin/dhcpd/images/shared.gif
-lib/webmin/dhcpd/images/smallicon.gif
 lib/webmin/dhcpd/images/subnet.gif
 lib/webmin/dhcpd/index.cgi
 lib/webmin/dhcpd/install_check.pl
@@ -6731,22 +6919,29 @@ lib/webmin/dhcpd/lookup_shared.cgi
 lib/webmin/dhcpd/lookup_subnet.cgi
 lib/webmin/dhcpd/module.info
 lib/webmin/dhcpd/module.info.ca
+lib/webmin/dhcpd/module.info.ca.UTF-8
 lib/webmin/dhcpd/module.info.cz
 lib/webmin/dhcpd/module.info.cz.UTF-8
 lib/webmin/dhcpd/module.info.de
+lib/webmin/dhcpd/module.info.de.UTF-8
 lib/webmin/dhcpd/module.info.es
+lib/webmin/dhcpd/module.info.es.UTF-8
 lib/webmin/dhcpd/module.info.fr
+lib/webmin/dhcpd/module.info.fr.UTF-8
 lib/webmin/dhcpd/module.info.ja_JP.UTF-8
 lib/webmin/dhcpd/module.info.ja_JP.euc
 lib/webmin/dhcpd/module.info.ko_KR.UTF-8
 lib/webmin/dhcpd/module.info.ko_KR.euc
 lib/webmin/dhcpd/module.info.ms_MY
+lib/webmin/dhcpd/module.info.ms_MY.UTF-8
 lib/webmin/dhcpd/module.info.nl
+lib/webmin/dhcpd/module.info.nl.UTF-8
 lib/webmin/dhcpd/module.info.no
 lib/webmin/dhcpd/module.info.no.UTF-8
 lib/webmin/dhcpd/module.info.pl
 lib/webmin/dhcpd/module.info.pl.UTF-8
 lib/webmin/dhcpd/module.info.pt
+lib/webmin/dhcpd/module.info.pt.UTF-8
 lib/webmin/dhcpd/module.info.ru.UTF-8
 lib/webmin/dhcpd/module.info.ru_RU
 lib/webmin/dhcpd/module.info.ru_RU.UTF-8
@@ -6754,11 +6949,10 @@ lib/webmin/dhcpd/module.info.ru_SU
 lib/webmin/dhcpd/module.info.sk
 lib/webmin/dhcpd/module.info.sk.UTF-8
 lib/webmin/dhcpd/module.info.sv
+lib/webmin/dhcpd/module.info.sv.UTF-8
 lib/webmin/dhcpd/module.info.tr
 lib/webmin/dhcpd/module.info.zh_CN
-lib/webmin/dhcpd/module.info.zh_CN.UTF-8
 lib/webmin/dhcpd/module.info.zh_TW.Big5
-lib/webmin/dhcpd/module.info.zh_TW.UTF-8
 lib/webmin/dhcpd/params-lib.pl
 lib/webmin/dhcpd/rbac-mapping
 lib/webmin/dhcpd/restart.cgi
@@ -6831,7 +7025,6 @@ lib/webmin/dovecot/images/manual.gif
 lib/webmin/dovecot/images/misc.gif
 lib/webmin/dovecot/images/net.gif
 lib/webmin/dovecot/images/pop3.gif
-lib/webmin/dovecot/images/smallicon.gif
 lib/webmin/dovecot/images/ssl.gif
 lib/webmin/dovecot/index.cgi
 lib/webmin/dovecot/install_check.pl
@@ -6867,22 +7060,27 @@ lib/webmin/dovecot/lang/zh_TW.UTF-8
 lib/webmin/dovecot/log_parser.pl
 lib/webmin/dovecot/module.info
 lib/webmin/dovecot/module.info.ca
+lib/webmin/dovecot/module.info.ca.UTF-8
 lib/webmin/dovecot/module.info.cz
 lib/webmin/dovecot/module.info.cz.UTF-8
 lib/webmin/dovecot/module.info.de
+lib/webmin/dovecot/module.info.de.UTF-8
 lib/webmin/dovecot/module.info.es
+lib/webmin/dovecot/module.info.es.UTF-8
 lib/webmin/dovecot/module.info.hu
 lib/webmin/dovecot/module.info.hu.UTF-8
 lib/webmin/dovecot/module.info.it
+lib/webmin/dovecot/module.info.it.UTF-8
 lib/webmin/dovecot/module.info.ms_MY
+lib/webmin/dovecot/module.info.ms_MY.UTF-8
 lib/webmin/dovecot/module.info.nl
+lib/webmin/dovecot/module.info.nl.UTF-8
 lib/webmin/dovecot/module.info.no
 lib/webmin/dovecot/module.info.no.UTF-8
 lib/webmin/dovecot/module.info.pl
 lib/webmin/dovecot/module.info.pl.UTF-8
 lib/webmin/dovecot/module.info.ru_RU
 lib/webmin/dovecot/module.info.ru_RU.UTF-8
-lib/webmin/dovecot/module.info.zh_TW.UTF-8
 lib/webmin/dovecot/save_login.cgi
 lib/webmin/dovecot/save_mail.cgi
 lib/webmin/dovecot/save_manual.cgi
@@ -6907,10 +7105,13 @@ lib/webmin/exim/exim-lib.pl
 lib/webmin/exim/install_check.pl
 lib/webmin/exim/module.info
 lib/webmin/exim/module.info.ca
+lib/webmin/exim/module.info.ca.UTF-8
 lib/webmin/exim/module.info.hu
 lib/webmin/exim/module.info.hu.UTF-8
 lib/webmin/exim/module.info.ms_MY
+lib/webmin/exim/module.info.ms_MY.UTF-8
 lib/webmin/exim/module.info.nl
+lib/webmin/exim/module.info.nl.UTF-8
 lib/webmin/exim/module.info.pl
 lib/webmin/exim/module.info.pl.UTF-8
 lib/webmin/exports/CHANGELOG
@@ -7297,7 +7498,6 @@ lib/webmin/exports/help/vers.pl.UTF-8.html
 lib/webmin/exports/help/vers.pl.html
 lib/webmin/exports/images/export.gif
 lib/webmin/exports/images/icon.gif
-lib/webmin/exports/images/smallicon.gif
 lib/webmin/exports/index.cgi
 lib/webmin/exports/install_check.pl
 lib/webmin/exports/lang/ca
@@ -7348,33 +7548,40 @@ lib/webmin/exports/low.risk
 lib/webmin/exports/medium.risk
 lib/webmin/exports/module.info
 lib/webmin/exports/module.info.ca
+lib/webmin/exports/module.info.ca.UTF-8
 lib/webmin/exports/module.info.cz
 lib/webmin/exports/module.info.cz.UTF-8
 lib/webmin/exports/module.info.de
+lib/webmin/exports/module.info.de.UTF-8
 lib/webmin/exports/module.info.es
+lib/webmin/exports/module.info.es.UTF-8
 lib/webmin/exports/module.info.fr
+lib/webmin/exports/module.info.fr.UTF-8
 lib/webmin/exports/module.info.it
+lib/webmin/exports/module.info.it.UTF-8
 lib/webmin/exports/module.info.ja_JP.UTF-8
 lib/webmin/exports/module.info.ja_JP.euc
 lib/webmin/exports/module.info.ko_KR.UTF-8
 lib/webmin/exports/module.info.ko_KR.euc
 lib/webmin/exports/module.info.ms_MY
+lib/webmin/exports/module.info.ms_MY.UTF-8
 lib/webmin/exports/module.info.nl
+lib/webmin/exports/module.info.nl.UTF-8
 lib/webmin/exports/module.info.no
 lib/webmin/exports/module.info.no.UTF-8
 lib/webmin/exports/module.info.pl
 lib/webmin/exports/module.info.pl.UTF-8
 lib/webmin/exports/module.info.pt
+lib/webmin/exports/module.info.pt.UTF-8
 lib/webmin/exports/module.info.ru.UTF-8
 lib/webmin/exports/module.info.ru_RU
 lib/webmin/exports/module.info.ru_RU.UTF-8
 lib/webmin/exports/module.info.ru_SU
 lib/webmin/exports/module.info.sv
+lib/webmin/exports/module.info.sv.UTF-8
 lib/webmin/exports/module.info.tr
 lib/webmin/exports/module.info.zh_CN
-lib/webmin/exports/module.info.zh_CN.UTF-8
 lib/webmin/exports/module.info.zh_TW.Big5
-lib/webmin/exports/module.info.zh_TW.UTF-8
 lib/webmin/exports/restart_mountd.cgi
 lib/webmin/exports/save_export.cgi
 lib/webmin/fail2ban/CHANGELOG
@@ -7441,8 +7648,11 @@ lib/webmin/fail2ban/list_jails.cgi
 lib/webmin/fail2ban/log_parser.pl
 lib/webmin/fail2ban/module.info
 lib/webmin/fail2ban/module.info.ca
+lib/webmin/fail2ban/module.info.ca.UTF-8
 lib/webmin/fail2ban/module.info.de
+lib/webmin/fail2ban/module.info.de.UTF-8
 lib/webmin/fail2ban/module.info.ms_MY
+lib/webmin/fail2ban/module.info.ms_MY.UTF-8
 lib/webmin/fail2ban/module.info.no
 lib/webmin/fail2ban/module.info.no.UTF-8
 lib/webmin/fail2ban/module.info.pl
@@ -7732,7 +7942,6 @@ lib/webmin/fdisk/help/u.zh_TW.UTF-8.html
 lib/webmin/fdisk/images/ext.gif
 lib/webmin/fdisk/images/gap.gif
 lib/webmin/fdisk/images/icon.gif
-lib/webmin/fdisk/images/smallicon.gif
 lib/webmin/fdisk/images/use.gif
 lib/webmin/fdisk/index.cgi
 lib/webmin/fdisk/lang/bg
@@ -7782,11 +7991,15 @@ lib/webmin/fdisk/mkfs.cgi
 lib/webmin/fdisk/mkfs_form.cgi
 lib/webmin/fdisk/module.info
 lib/webmin/fdisk/module.info.ca
+lib/webmin/fdisk/module.info.ca.UTF-8
 lib/webmin/fdisk/module.info.cz
 lib/webmin/fdisk/module.info.cz.UTF-8
 lib/webmin/fdisk/module.info.de
+lib/webmin/fdisk/module.info.de.UTF-8
 lib/webmin/fdisk/module.info.es
+lib/webmin/fdisk/module.info.es.UTF-8
 lib/webmin/fdisk/module.info.fr
+lib/webmin/fdisk/module.info.fr.UTF-8
 lib/webmin/fdisk/module.info.hu
 lib/webmin/fdisk/module.info.hu.UTF-8
 lib/webmin/fdisk/module.info.ja_JP.UTF-8
@@ -7794,22 +8007,24 @@ lib/webmin/fdisk/module.info.ja_JP.euc
 lib/webmin/fdisk/module.info.ko_KR.UTF-8
 lib/webmin/fdisk/module.info.ko_KR.euc
 lib/webmin/fdisk/module.info.ms_MY
+lib/webmin/fdisk/module.info.ms_MY.UTF-8
 lib/webmin/fdisk/module.info.nl
+lib/webmin/fdisk/module.info.nl.UTF-8
 lib/webmin/fdisk/module.info.no
 lib/webmin/fdisk/module.info.no.UTF-8
 lib/webmin/fdisk/module.info.pl
 lib/webmin/fdisk/module.info.pl.UTF-8
 lib/webmin/fdisk/module.info.pt
+lib/webmin/fdisk/module.info.pt.UTF-8
 lib/webmin/fdisk/module.info.ru.UTF-8
 lib/webmin/fdisk/module.info.ru_RU
 lib/webmin/fdisk/module.info.ru_RU.UTF-8
 lib/webmin/fdisk/module.info.ru_SU
 lib/webmin/fdisk/module.info.sv
+lib/webmin/fdisk/module.info.sv.UTF-8
 lib/webmin/fdisk/module.info.tr
 lib/webmin/fdisk/module.info.zh_CN
-lib/webmin/fdisk/module.info.zh_CN.UTF-8
 lib/webmin/fdisk/module.info.zh_TW.Big5
-lib/webmin/fdisk/module.info.zh_TW.UTF-8
 lib/webmin/fdisk/range.js
 lib/webmin/fdisk/reboot.cgi
 lib/webmin/fdisk/relabel.cgi
@@ -7882,7 +8097,6 @@ lib/webmin/fetchmail/fetchmail-lib.pl
 lib/webmin/fetchmail/images/hand.png
 lib/webmin/fetchmail/images/icon.gif
 lib/webmin/fetchmail/images/old.gif
-lib/webmin/fetchmail/images/smallicon.gif
 lib/webmin/fetchmail/index.cgi
 lib/webmin/fetchmail/install_check.pl
 lib/webmin/fetchmail/lang/bg
@@ -7924,19 +8138,25 @@ lib/webmin/fetchmail/lang/zh_TW.UTF-8
 lib/webmin/fetchmail/log_parser.pl
 lib/webmin/fetchmail/module.info
 lib/webmin/fetchmail/module.info.ca
+lib/webmin/fetchmail/module.info.ca.UTF-8
 lib/webmin/fetchmail/module.info.cz
 lib/webmin/fetchmail/module.info.cz.UTF-8
 lib/webmin/fetchmail/module.info.de
+lib/webmin/fetchmail/module.info.de.UTF-8
 lib/webmin/fetchmail/module.info.es
+lib/webmin/fetchmail/module.info.es.UTF-8
 lib/webmin/fetchmail/module.info.hu
 lib/webmin/fetchmail/module.info.hu.UTF-8
 lib/webmin/fetchmail/module.info.it
+lib/webmin/fetchmail/module.info.it.UTF-8
 lib/webmin/fetchmail/module.info.ja_JP.UTF-8
 lib/webmin/fetchmail/module.info.ja_JP.euc
 lib/webmin/fetchmail/module.info.ko_KR.UTF-8
 lib/webmin/fetchmail/module.info.ko_KR.euc
 lib/webmin/fetchmail/module.info.ms_MY
+lib/webmin/fetchmail/module.info.ms_MY.UTF-8
 lib/webmin/fetchmail/module.info.nl
+lib/webmin/fetchmail/module.info.nl.UTF-8
 lib/webmin/fetchmail/module.info.no
 lib/webmin/fetchmail/module.info.no.UTF-8
 lib/webmin/fetchmail/module.info.pl
@@ -7946,570 +8166,11 @@ lib/webmin/fetchmail/module.info.ru_RU
 lib/webmin/fetchmail/module.info.ru_RU.UTF-8
 lib/webmin/fetchmail/module.info.ru_SU
 lib/webmin/fetchmail/module.info.zh_TW.Big5
-lib/webmin/fetchmail/module.info.zh_TW.UTF-8
 lib/webmin/fetchmail/save_cron.cgi
 lib/webmin/fetchmail/save_global.cgi
 lib/webmin/fetchmail/save_poll.cgi
 lib/webmin/fetchmail/start.cgi
 lib/webmin/fetchmail/stop.cgi
-lib/webmin/file/ACLEditor.class
-lib/webmin/file/ACLEntry.class
-lib/webmin/file/ACLWindow.class
-lib/webmin/file/AttributeEditor.class
-lib/webmin/file/AttributesWindow.class
-lib/webmin/file/BorderPanel.class
-lib/webmin/file/BorderPanel.java
-lib/webmin/file/CHANGELOG
-lib/webmin/file/CbButton.class
-lib/webmin/file/CbButton.java
-lib/webmin/file/CbButtonCallback.class
-lib/webmin/file/CbButtonGroup.class
-lib/webmin/file/CbColorButton.class
-lib/webmin/file/CbColorButton.java
-lib/webmin/file/CbColorWindow.class
-lib/webmin/file/CbColorWindow.java
-lib/webmin/file/CbColorWindowCallback.class
-lib/webmin/file/CbColorWindowCube.class
-lib/webmin/file/CbColorWindowSwatch.class
-lib/webmin/file/CbImageChooser.class
-lib/webmin/file/CbImageChooser.java
-lib/webmin/file/CbImageFileWindow.class
-lib/webmin/file/CbScrollbar.class
-lib/webmin/file/CbScrollbar.java
-lib/webmin/file/CbScrollbarArrow.class
-lib/webmin/file/CbScrollbarCallback.class
-lib/webmin/file/CbSlider.class
-lib/webmin/file/CbSlider.java
-lib/webmin/file/CbSliderCallback.class
-lib/webmin/file/ContentsWindow.class
-lib/webmin/file/DFSAdminExport.class
-lib/webmin/file/DeleteWindow.class
-lib/webmin/file/DownloadDirWindow.class
-lib/webmin/file/EXTWindow.class
-lib/webmin/file/EditorWindow.class
-lib/webmin/file/ErrorWindow.class
-lib/webmin/file/ErrorWindow.java
-lib/webmin/file/ExtractWindow.class
-lib/webmin/file/FileAttribute.class
-lib/webmin/file/FileManager.class
-lib/webmin/file/FileManager.java
-lib/webmin/file/FileNode.class
-lib/webmin/file/FileSystem.class
-lib/webmin/file/FindReplaceWindow.class
-lib/webmin/file/FixedFrame.class
-lib/webmin/file/FixedFrame.java
-lib/webmin/file/GotoWindow.class
-lib/webmin/file/GrayPanel.class
-lib/webmin/file/GrayPanel.java
-lib/webmin/file/Hierarchy.class
-lib/webmin/file/Hierarchy.java
-lib/webmin/file/HierarchyCallback.class
-lib/webmin/file/HierarchyNode.class
-lib/webmin/file/HistoryWindow.class
-lib/webmin/file/ImagePanel.class
-lib/webmin/file/LinedPanel.class
-lib/webmin/file/LinedPanel.java
-lib/webmin/file/LinkWindow.class
-lib/webmin/file/LinuxExport.class
-lib/webmin/file/Makefile
-lib/webmin/file/MkdirWindow.class
-lib/webmin/file/MountWindow.class
-lib/webmin/file/MultiColumn.class
-lib/webmin/file/MultiColumn.java
-lib/webmin/file/MultiColumnCallback.class
-lib/webmin/file/MultiLabel.class
-lib/webmin/file/OverwriteWindow.class
-lib/webmin/file/PermissionsPanel.class
-lib/webmin/file/PreviewWindow.class
-lib/webmin/file/PropertiesWindow.class
-lib/webmin/file/QuickSort.class
-lib/webmin/file/QuickSort.java
-lib/webmin/file/RemoteFile.class
-lib/webmin/file/RenameWindow.class
-lib/webmin/file/ResizePanel.class
-lib/webmin/file/ResizePanel.java
-lib/webmin/file/SambaShare.class
-lib/webmin/file/ScrollImage.class
-lib/webmin/file/SearchWindow.class
-lib/webmin/file/SharingWindow.class
-lib/webmin/file/StaticTextField.class
-lib/webmin/file/StaticTextField.java
-lib/webmin/file/StringJoiner.class
-lib/webmin/file/StringSplitter.class
-lib/webmin/file/StringSplitter.java
-lib/webmin/file/TabSelector.class
-lib/webmin/file/TabbedDisplayPanel.class
-lib/webmin/file/TabbedPanel.class
-lib/webmin/file/TabbedPanel.java
-lib/webmin/file/ToolbarLayout.class
-lib/webmin/file/ToolbarLayout.java
-lib/webmin/file/Util.class
-lib/webmin/file/Util.java
-lib/webmin/file/acl_security.pl
-lib/webmin/file/cgi_args.pl
-lib/webmin/file/chmod.cgi
-lib/webmin/file/config
-lib/webmin/file/config-ALL-linux
-lib/webmin/file/config-freebsd
-lib/webmin/file/config-irix
-lib/webmin/file/config-solaris
-lib/webmin/file/config-syno-linux
-lib/webmin/file/config.info
-lib/webmin/file/config.info.bg
-lib/webmin/file/config.info.bg.UTF-8
-lib/webmin/file/config.info.ca
-lib/webmin/file/config.info.ca.UTF-8
-lib/webmin/file/config.info.cz
-lib/webmin/file/config.info.cz.UTF-8
-lib/webmin/file/config.info.de
-lib/webmin/file/config.info.de.UTF-8
-lib/webmin/file/config.info.el
-lib/webmin/file/config.info.es
-lib/webmin/file/config.info.es.UTF-8
-lib/webmin/file/config.info.fa
-lib/webmin/file/config.info.hu
-lib/webmin/file/config.info.it
-lib/webmin/file/config.info.it.UTF-8
-lib/webmin/file/config.info.ko_KR.UTF-8
-lib/webmin/file/config.info.ko_KR.euc
-lib/webmin/file/config.info.nl
-lib/webmin/file/config.info.nl.UTF-8
-lib/webmin/file/config.info.no
-lib/webmin/file/config.info.no.UTF-8
-lib/webmin/file/config.info.pl
-lib/webmin/file/config.info.pl.UTF-8
-lib/webmin/file/config.info.tr
-lib/webmin/file/contents.cgi
-lib/webmin/file/copy.cgi
-lib/webmin/file/defaultacl
-lib/webmin/file/delete.cgi
-lib/webmin/file/edit_html.cgi
-lib/webmin/file/extract.cgi
-lib/webmin/file/file-lib.pl
-lib/webmin/file/file.jar
-lib/webmin/file/filesystems.cgi
-lib/webmin/file/getattrs.cgi
-lib/webmin/file/getext.cgi
-lib/webmin/file/getfacl.cgi
-lib/webmin/file/images/acl.gif
-lib/webmin/file/images/add.gif
-lib/webmin/file/images/all.gif
-lib/webmin/file/images/attr.gif
-lib/webmin/file/images/binary.gif
-lib/webmin/file/images/cancel.gif
-lib/webmin/file/images/config.gif
-lib/webmin/file/images/copy.gif
-lib/webmin/file/images/cut.gif
-lib/webmin/file/images/delete.gif
-lib/webmin/file/images/device.gif
-lib/webmin/file/images/dir.gif
-lib/webmin/file/images/down.gif
-lib/webmin/file/images/edit.gif
-lib/webmin/file/images/ext.gif
-lib/webmin/file/images/extract.gif
-lib/webmin/file/images/file.gif
-lib/webmin/file/images/find.gif
-lib/webmin/file/images/goto.gif
-lib/webmin/file/images/html.gif
-lib/webmin/file/images/icon.gif
-lib/webmin/file/images/image.gif
-lib/webmin/file/images/makelink.gif
-lib/webmin/file/images/mdir.gif
-lib/webmin/file/images/mkdir.gif
-lib/webmin/file/images/mount.gif
-lib/webmin/file/images/new.gif
-lib/webmin/file/images/open.gif
-lib/webmin/file/images/paste.gif
-lib/webmin/file/images/pipe.gif
-lib/webmin/file/images/preview.gif
-lib/webmin/file/images/props.gif
-lib/webmin/file/images/refresh.gif
-lib/webmin/file/images/rename.gif
-lib/webmin/file/images/replace.gif
-lib/webmin/file/images/ret.gif
-lib/webmin/file/images/run.gif
-lib/webmin/file/images/save.gif
-lib/webmin/file/images/sdir.gif
-lib/webmin/file/images/search.gif
-lib/webmin/file/images/share.gif
-lib/webmin/file/images/smallicon.gif
-lib/webmin/file/images/smdir.gif
-lib/webmin/file/images/sub.gif
-lib/webmin/file/images/sudir.gif
-lib/webmin/file/images/symlink.gif
-lib/webmin/file/images/text.gif
-lib/webmin/file/images/udir.gif
-lib/webmin/file/images/unknown.gif
-lib/webmin/file/images/upload.gif
-lib/webmin/file/images/view.gif
-lib/webmin/file/index.cgi
-lib/webmin/file/irix-getfacl.pl
-lib/webmin/file/irix-setfacl.pl
-lib/webmin/file/lang.cgi
-lib/webmin/file/lang/bg
-lib/webmin/file/lang/bg.UTF-8
-lib/webmin/file/lang/ca
-lib/webmin/file/lang/ca.UTF-8
-lib/webmin/file/lang/cz
-lib/webmin/file/lang/cz.UTF-8
-lib/webmin/file/lang/de
-lib/webmin/file/lang/de.UTF-8
-lib/webmin/file/lang/el
-lib/webmin/file/lang/en
-lib/webmin/file/lang/en.UTF-8
-lib/webmin/file/lang/es
-lib/webmin/file/lang/es.UTF-8
-lib/webmin/file/lang/fa
-lib/webmin/file/lang/fr
-lib/webmin/file/lang/fr.UTF-8
-lib/webmin/file/lang/hu
-lib/webmin/file/lang/hu.UTF-8
-lib/webmin/file/lang/it
-lib/webmin/file/lang/it.UTF-8
-lib/webmin/file/lang/ja_JP.UTF-8
-lib/webmin/file/lang/ja_JP.euc
-lib/webmin/file/lang/ko_KR.UTF-8
-lib/webmin/file/lang/ko_KR.euc
-lib/webmin/file/lang/nl
-lib/webmin/file/lang/nl.UTF-8
-lib/webmin/file/lang/no
-lib/webmin/file/lang/no.UTF-8
-lib/webmin/file/lang/pl
-lib/webmin/file/lang/pl.UTF-8
-lib/webmin/file/lang/pt
-lib/webmin/file/lang/pt.UTF-8
-lib/webmin/file/lang/pt_BR
-lib/webmin/file/lang/pt_BR.UTF-8
-lib/webmin/file/lang/ru.UTF-8
-lib/webmin/file/lang/ru_RU
-lib/webmin/file/lang/ru_RU.UTF-8
-lib/webmin/file/lang/ru_SU
-lib/webmin/file/lang/sk
-lib/webmin/file/lang/sk.UTF-8
-lib/webmin/file/lang/sv
-lib/webmin/file/lang/sv.UTF-8
-lib/webmin/file/lang/tr
-lib/webmin/file/lang/uk_UA
-lib/webmin/file/lang/uk_UA.UTF-8
-lib/webmin/file/lang/zh_CN
-lib/webmin/file/lang/zh_CN.UTF-8
-lib/webmin/file/lang/zh_TW.Big5
-lib/webmin/file/lang/zh_TW.UTF-8
-lib/webmin/file/list.cgi
-lib/webmin/file/list_exports.cgi
-lib/webmin/file/list_shares.cgi
-lib/webmin/file/log_parser.pl
-lib/webmin/file/makelink.cgi
-lib/webmin/file/manifest.txt
-lib/webmin/file/mkdir.cgi
-lib/webmin/file/module.info
-lib/webmin/file/module.info.ca
-lib/webmin/file/module.info.cz
-lib/webmin/file/module.info.cz.UTF-8
-lib/webmin/file/module.info.de
-lib/webmin/file/module.info.es
-lib/webmin/file/module.info.fr
-lib/webmin/file/module.info.hu
-lib/webmin/file/module.info.hu.UTF-8
-lib/webmin/file/module.info.it
-lib/webmin/file/module.info.ja_JP.UTF-8
-lib/webmin/file/module.info.ja_JP.euc
-lib/webmin/file/module.info.ko_KR.UTF-8
-lib/webmin/file/module.info.ko_KR.euc
-lib/webmin/file/module.info.ms_MY
-lib/webmin/file/module.info.nl
-lib/webmin/file/module.info.no
-lib/webmin/file/module.info.no.UTF-8
-lib/webmin/file/module.info.pl
-lib/webmin/file/module.info.pl.UTF-8
-lib/webmin/file/module.info.pt
-lib/webmin/file/module.info.pt_BR
-lib/webmin/file/module.info.ru.UTF-8
-lib/webmin/file/module.info.ru_RU
-lib/webmin/file/module.info.ru_RU.UTF-8
-lib/webmin/file/module.info.ru_SU
-lib/webmin/file/module.info.sk
-lib/webmin/file/module.info.sk.UTF-8
-lib/webmin/file/module.info.sv
-lib/webmin/file/module.info.tr
-lib/webmin/file/module.info.zh_CN
-lib/webmin/file/module.info.zh_CN.UTF-8
-lib/webmin/file/module.info.zh_TW.Big5
-lib/webmin/file/module.info.zh_TW.UTF-8
-lib/webmin/file/mount.cgi
-lib/webmin/file/move.cgi
-lib/webmin/file/preview.cgi
-lib/webmin/file/rename.cgi
-lib/webmin/file/root.cgi
-lib/webmin/file/save.cgi
-lib/webmin/file/save_export.cgi
-lib/webmin/file/save_html.cgi
-lib/webmin/file/save_share.cgi
-lib/webmin/file/search.cgi
-lib/webmin/file/setattrs.cgi
-lib/webmin/file/setext.cgi
-lib/webmin/file/setfacl.cgi
-lib/webmin/file/show.cgi
-lib/webmin/file/size.cgi
-lib/webmin/file/unicode.pl
-lib/webmin/file/unicode/zh_TW.Big5
-lib/webmin/file/upform.cgi
-lib/webmin/file/upload.cgi
-lib/webmin/file/upload2.cgi
-lib/webmin/file/xinha/Xinha.css
-lib/webmin/file/xinha/XinhaCore.js
-lib/webmin/file/xinha/contrib/php-xinha.php
-lib/webmin/file/xinha/examples/ExtendedDemo.html
-lib/webmin/file/xinha/examples/Newbie.html
-lib/webmin/file/xinha/examples/XinhaConfig.js
-lib/webmin/file/xinha/examples/files/Extended.html
-lib/webmin/file/xinha/examples/files/custom.css
-lib/webmin/file/xinha/examples/files/dynamic.css
-lib/webmin/file/xinha/examples/files/ext_example-body.html
-lib/webmin/file/xinha/examples/files/ext_example-dest.php
-lib/webmin/file/xinha/examples/files/ext_example-menu.php
-lib/webmin/file/xinha/examples/files/full_example.css
-lib/webmin/file/xinha/examples/files/stylist.css
-lib/webmin/file/xinha/examples/simple_example.html
-lib/webmin/file/xinha/examples/testbed.html
-lib/webmin/file/xinha/htmlarea.js
-lib/webmin/file/xinha/iconsets/Classic/de/bold.gif
-lib/webmin/file/xinha/iconsets/Classic/de/italic.gif
-lib/webmin/file/xinha/iconsets/Classic/de/underline.gif
-lib/webmin/file/xinha/iconsets/Classic/ed_buttons_main.gif
-lib/webmin/file/xinha/iconsets/Classic/ed_charmap.gif
-lib/webmin/file/xinha/iconsets/Classic/ed_selectall.gif
-lib/webmin/file/xinha/iconsets/Classic/fr/bold.gif
-lib/webmin/file/xinha/iconsets/Classic/fr/strikethrough.gif
-lib/webmin/file/xinha/iconsets/Classic/fr/underline.gif
-lib/webmin/file/xinha/iconsets/Classic/iconset.xml
-lib/webmin/file/xinha/images/de/bold.gif
-lib/webmin/file/xinha/images/de/italic.gif
-lib/webmin/file/xinha/images/de/underline.gif
-lib/webmin/file/xinha/images/ed_about.gif
-lib/webmin/file/xinha/images/ed_align.gif
-lib/webmin/file/xinha/images/ed_align_center.gif
-lib/webmin/file/xinha/images/ed_align_justify.gif
-lib/webmin/file/xinha/images/ed_align_left.gif
-lib/webmin/file/xinha/images/ed_align_right.gif
-lib/webmin/file/xinha/images/ed_blank.gif
-lib/webmin/file/xinha/images/ed_buttons_main.gif
-lib/webmin/file/xinha/images/ed_buttons_main.png
-lib/webmin/file/xinha/images/ed_charmap.gif
-lib/webmin/file/xinha/images/ed_clearfonts.gif
-lib/webmin/file/xinha/images/ed_color_bg.gif
-lib/webmin/file/xinha/images/ed_color_fg.gif
-lib/webmin/file/xinha/images/ed_copy.gif
-lib/webmin/file/xinha/images/ed_custom.gif
-lib/webmin/file/xinha/images/ed_cut.gif
-lib/webmin/file/xinha/images/ed_delete.gif
-lib/webmin/file/xinha/images/ed_format_bold.gif
-lib/webmin/file/xinha/images/ed_format_italic.gif
-lib/webmin/file/xinha/images/ed_format_strike.gif
-lib/webmin/file/xinha/images/ed_format_sub.gif
-lib/webmin/file/xinha/images/ed_format_sup.gif
-lib/webmin/file/xinha/images/ed_format_underline.gif
-lib/webmin/file/xinha/images/ed_help.gif
-lib/webmin/file/xinha/images/ed_hr.gif
-lib/webmin/file/xinha/images/ed_html.gif
-lib/webmin/file/xinha/images/ed_image.gif
-lib/webmin/file/xinha/images/ed_indent_less.gif
-lib/webmin/file/xinha/images/ed_indent_more.gif
-lib/webmin/file/xinha/images/ed_killword.gif
-lib/webmin/file/xinha/images/ed_left_to_right.gif
-lib/webmin/file/xinha/images/ed_link.gif
-lib/webmin/file/xinha/images/ed_list_bullet.gif
-lib/webmin/file/xinha/images/ed_list_num.gif
-lib/webmin/file/xinha/images/ed_overwrite.gif
-lib/webmin/file/xinha/images/ed_paste.gif
-lib/webmin/file/xinha/images/ed_print.gif
-lib/webmin/file/xinha/images/ed_redo.gif
-lib/webmin/file/xinha/images/ed_right_to_left.gif
-lib/webmin/file/xinha/images/ed_rmformat.gif
-lib/webmin/file/xinha/images/ed_save.gif
-lib/webmin/file/xinha/images/ed_save.png
-lib/webmin/file/xinha/images/ed_saveas.gif
-lib/webmin/file/xinha/images/ed_selectall.gif
-lib/webmin/file/xinha/images/ed_show_border.gif
-lib/webmin/file/xinha/images/ed_splitblock.gif
-lib/webmin/file/xinha/images/ed_splitcel.gif
-lib/webmin/file/xinha/images/ed_undo.gif
-lib/webmin/file/xinha/images/ed_word_cleaner.gif
-lib/webmin/file/xinha/images/fr/bold.gif
-lib/webmin/file/xinha/images/fr/strikethrough.gif
-lib/webmin/file/xinha/images/fr/underline.gif
-lib/webmin/file/xinha/images/fullscreen_maximize.gif
-lib/webmin/file/xinha/images/fullscreen_minimize.gif
-lib/webmin/file/xinha/images/insert_table.gif
-lib/webmin/file/xinha/images/insertfilelink.gif
-lib/webmin/file/xinha/images/insertmacro.png
-lib/webmin/file/xinha/images/tango/16x16/actions/document-new.png
-lib/webmin/file/xinha/images/tango/16x16/actions/document-open.png
-lib/webmin/file/xinha/images/tango/16x16/actions/document-print.png
-lib/webmin/file/xinha/images/tango/16x16/actions/document-save.png
-lib/webmin/file/xinha/images/tango/16x16/actions/edit-copy.png
-lib/webmin/file/xinha/images/tango/16x16/actions/edit-redo.png
-lib/webmin/file/xinha/images/tango/16x16/actions/edit-select-all.png
-lib/webmin/file/xinha/images/tango/16x16/actions/edit-undo.png
-lib/webmin/file/xinha/images/tango/16x16/actions/folder-new.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-direction-left-to-right.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-direction-right-to-left.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-indent-less.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-indent-more.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-justify-center.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-justify-fill.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-justify-left.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-justify-right.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-background-color.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-bold.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-color.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-italic.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-strikethrough.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-subscript.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-superscript.png
-lib/webmin/file/xinha/images/tango/16x16/actions/format-text-underline.png
-lib/webmin/file/xinha/images/tango/16x16/actions/go-up.png
-lib/webmin/file/xinha/images/tango/16x16/actions/insert-link.png
-lib/webmin/file/xinha/images/tango/16x16/actions/insert-table.png
-lib/webmin/file/xinha/images/tango/16x16/actions/toggle-borders.png
-lib/webmin/file/xinha/images/tango/16x16/actions/view-fullscreen.png
-lib/webmin/file/xinha/images/tango/16x16/actions/view-restore.png
-lib/webmin/file/xinha/images/tango/16x16/apps/accessories-character-map.png
-lib/webmin/file/xinha/images/tango/16x16/apps/help-browser.png
-lib/webmin/file/xinha/images/tango/16x16/mimetypes/image-x-generic.png
-lib/webmin/file/xinha/images/tango/16x16/places/user-trash.png
-lib/webmin/file/xinha/images/tango/32x32/apps/internet-web-browser.png
-lib/webmin/file/xinha/images/tango/32x32/mimetypes/text-html.png
-lib/webmin/file/xinha/images/tango/32x32/mimetypes/text-x-generic.png
-lib/webmin/file/xinha/images/tango/32x32/mimetypes/x-office-document.png
-lib/webmin/file/xinha/images/tango/32x32/places/folder.png
-lib/webmin/file/xinha/images/tango/32x32/places/network-server.png
-lib/webmin/file/xinha/images/tango/COPYING
-lib/webmin/file/xinha/images/tidy.gif
-lib/webmin/file/xinha/images/toggle_borders.gif
-lib/webmin/file/xinha/images/xinha-small-icon.gif
-lib/webmin/file/xinha/images/xinha_logo.gif
-lib/webmin/file/xinha/lang/b5.js
-lib/webmin/file/xinha/lang/ch.js
-lib/webmin/file/xinha/lang/cz.js
-lib/webmin/file/xinha/lang/da.js
-lib/webmin/file/xinha/lang/de.js
-lib/webmin/file/xinha/lang/ee.js
-lib/webmin/file/xinha/lang/el.js
-lib/webmin/file/xinha/lang/es.js
-lib/webmin/file/xinha/lang/eu.js
-lib/webmin/file/xinha/lang/fa.js
-lib/webmin/file/xinha/lang/fi.js
-lib/webmin/file/xinha/lang/fr.js
-lib/webmin/file/xinha/lang/gb.js
-lib/webmin/file/xinha/lang/he.js
-lib/webmin/file/xinha/lang/hu.js
-lib/webmin/file/xinha/lang/it.js
-lib/webmin/file/xinha/lang/ja.js
-lib/webmin/file/xinha/lang/lt.js
-lib/webmin/file/xinha/lang/lv.js
-lib/webmin/file/xinha/lang/nb.js
-lib/webmin/file/xinha/lang/nl.js
-lib/webmin/file/xinha/lang/pl.js
-lib/webmin/file/xinha/lang/pt_br.js
-lib/webmin/file/xinha/lang/ro.js
-lib/webmin/file/xinha/lang/ru.js
-lib/webmin/file/xinha/lang/sh.js
-lib/webmin/file/xinha/lang/si.js
-lib/webmin/file/xinha/lang/sr.js
-lib/webmin/file/xinha/lang/sv.js
-lib/webmin/file/xinha/lang/th.js
-lib/webmin/file/xinha/lang/vn.js
-lib/webmin/file/xinha/license.txt
-lib/webmin/file/xinha/modules/AboutBox/AboutBox.js
-lib/webmin/file/xinha/modules/AboutBox/about.css
-lib/webmin/file/xinha/modules/AboutBox/dialog.html
-lib/webmin/file/xinha/modules/ColorPicker/ColorPicker.js
-lib/webmin/file/xinha/modules/ColorPicker/lang/pt_br.js
-lib/webmin/file/xinha/modules/CreateLink/dialog.html
-lib/webmin/file/xinha/modules/CreateLink/lang/pt_br.js
-lib/webmin/file/xinha/modules/CreateLink/link.html
-lib/webmin/file/xinha/modules/CreateLink/link.js
-lib/webmin/file/xinha/modules/CreateLink/pluginMethods.js
-lib/webmin/file/xinha/modules/Dialogs/XinhaDialog.js
-lib/webmin/file/xinha/modules/Dialogs/dialog.js
-lib/webmin/file/xinha/modules/Dialogs/panel-dialog.js
-lib/webmin/file/xinha/modules/Dialogs/popupwin.js
-lib/webmin/file/xinha/modules/FullScreen/full-screen.js
-lib/webmin/file/xinha/modules/FullScreen/lang/de.js
-lib/webmin/file/xinha/modules/FullScreen/lang/es.js
-lib/webmin/file/xinha/modules/FullScreen/lang/fr.js
-lib/webmin/file/xinha/modules/FullScreen/lang/ja.js
-lib/webmin/file/xinha/modules/FullScreen/lang/nb.js
-lib/webmin/file/xinha/modules/FullScreen/lang/nl.js
-lib/webmin/file/xinha/modules/FullScreen/lang/pl.js
-lib/webmin/file/xinha/modules/FullScreen/lang/pt_br.js
-lib/webmin/file/xinha/modules/FullScreen/lang/ru.js
-lib/webmin/file/xinha/modules/FullScreen/lang/sv.js
-lib/webmin/file/xinha/modules/Gecko/Gecko.js
-lib/webmin/file/xinha/modules/Gecko/paraHandlerBest.js
-lib/webmin/file/xinha/modules/GetHtml/DOMwalk.js
-lib/webmin/file/xinha/modules/GetHtml/TransformInnerHTML.js
-lib/webmin/file/xinha/modules/GetHtml/lang/pt_br.js
-lib/webmin/file/xinha/modules/InlineStyler/InlineStyler.js
-lib/webmin/file/xinha/modules/InsertImage/dialog.html
-lib/webmin/file/xinha/modules/InsertImage/insert_image.html
-lib/webmin/file/xinha/modules/InsertImage/insert_image.js
-lib/webmin/file/xinha/modules/InsertImage/pluginMethods.js
-lib/webmin/file/xinha/modules/InsertTable/dialog.html
-lib/webmin/file/xinha/modules/InsertTable/insert_table.html
-lib/webmin/file/xinha/modules/InsertTable/insert_table.js
-lib/webmin/file/xinha/modules/InsertTable/pluginMethods.js
-lib/webmin/file/xinha/modules/InternetExplorer/InternetExplorer.js
-lib/webmin/file/xinha/modules/Opera/Opera.js
-lib/webmin/file/xinha/modules/WebKit/WebKit.js
-lib/webmin/file/xinha/popups/blank.html
-lib/webmin/file/xinha/popups/editor_help.html
-lib/webmin/file/xinha/popups/popup.css
-lib/webmin/file/xinha/popups/popup.js
-lib/webmin/file/xinha/popups/select_color.html
-lib/webmin/file/xinha/release-notes.txt
-lib/webmin/file/xinha/skins/blue-look/button-background.png
-lib/webmin/file/xinha/skins/blue-look/separator.gif
-lib/webmin/file/xinha/skins/blue-look/skin.css
-lib/webmin/file/xinha/skins/blue-metallic/button-background.png
-lib/webmin/file/xinha/skins/blue-metallic/separator.gif
-lib/webmin/file/xinha/skins/blue-metallic/skin.css
-lib/webmin/file/xinha/skins/green-look/button-background.gif
-lib/webmin/file/xinha/skins/green-look/separator.gif
-lib/webmin/file/xinha/skins/green-look/skin.css
-lib/webmin/file/xinha/skins/inditreuse/README
-lib/webmin/file/xinha/skins/inditreuse/back.png
-lib/webmin/file/xinha/skins/inditreuse/button-background.png
-lib/webmin/file/xinha/skins/inditreuse/hover.png
-lib/webmin/file/xinha/skins/inditreuse/selected.png
-lib/webmin/file/xinha/skins/inditreuse/separator.png
-lib/webmin/file/xinha/skins/inditreuse/skin.css
-lib/webmin/file/xinha/skins/silva/dialog.jpg
-lib/webmin/file/xinha/skins/silva/html.gif
-lib/webmin/file/xinha/skins/silva/skin.css
-lib/webmin/file/xinha/skins/silva/skin.xml
-lib/webmin/file/xinha/skins/silva/statusbar.png
-lib/webmin/file/xinha/skins/silva/toolbar.png
-lib/webmin/file/xinha/skins/titan/README
-lib/webmin/file/xinha/skins/titan/back.png
-lib/webmin/file/xinha/skins/titan/button-background.png
-lib/webmin/file/xinha/skins/titan/hover.png
-lib/webmin/file/xinha/skins/titan/selected.png
-lib/webmin/file/xinha/skins/titan/separator.png
-lib/webmin/file/xinha/skins/titan/skin.css
-lib/webmin/file/xinha/skins/xp-blue/back.png
-lib/webmin/file/xinha/skins/xp-blue/button-background.png
-lib/webmin/file/xinha/skins/xp-blue/hover.png
-lib/webmin/file/xinha/skins/xp-blue/selected.png
-lib/webmin/file/xinha/skins/xp-blue/separator.png
-lib/webmin/file/xinha/skins/xp-blue/skin.css
-lib/webmin/file/xinha/skins/xp-green/back.png
-lib/webmin/file/xinha/skins/xp-green/button-background.png
-lib/webmin/file/xinha/skins/xp-green/hover.png
-lib/webmin/file/xinha/skins/xp-green/selected.png
-lib/webmin/file/xinha/skins/xp-green/separator.png
-lib/webmin/file/xinha/skins/xp-green/skin.css
 lib/webmin/filemin/CHANGELOG
 lib/webmin/filemin/acl_security.pl
 lib/webmin/filemin/bookmark.cgi
@@ -8811,7 +8472,6 @@ lib/webmin/filemin/images/icons/quick/remove.png
 lib/webmin/filemin/images/icons/quick/rename.png
 lib/webmin/filemin/images/icons/quick/select-all.png
 lib/webmin/filemin/images/icons/quick/upload.png
-lib/webmin/filemin/images/smallicon.gif
 lib/webmin/filemin/index.cgi
 lib/webmin/filemin/lang/ar
 lib/webmin/filemin/lang/ca
@@ -8822,13 +8482,13 @@ lib/webmin/filemin/lang/en
 lib/webmin/filemin/lang/en.UTF-8
 lib/webmin/filemin/lang/no
 lib/webmin/filemin/lang/no.UTF-8
-lib/webmin/filemin/lang/ru.UTF-8
 lib/webmin/filemin/lib/File/BaseDir.pm
 lib/webmin/filemin/lib/File/Basename.pm
 lib/webmin/filemin/lib/File/MimeInfo.pm
 lib/webmin/filemin/module.info
 lib/webmin/filemin/module.info.ar
 lib/webmin/filemin/module.info.ca
+lib/webmin/filemin/module.info.ca.UTF-8
 lib/webmin/filemin/module.info.de
 lib/webmin/filemin/module.info.de.UTF-8
 lib/webmin/filemin/module.info.no
@@ -9252,7 +8912,6 @@ lib/webmin/filter/filter-lib.pl
 lib/webmin/filter/images/down.gif
 lib/webmin/filter/images/gap.gif
 lib/webmin/filter/images/icon.gif
-lib/webmin/filter/images/smallicon.gif
 lib/webmin/filter/images/up.gif
 lib/webmin/filter/index.cgi
 lib/webmin/filter/lang/ca
@@ -9276,6 +8935,7 @@ lib/webmin/filter/lang/pl
 lib/webmin/filter/lang/pl.UTF-8
 lib/webmin/filter/module.info
 lib/webmin/filter/module.info.ca
+lib/webmin/filter/module.info.ca.UTF-8
 lib/webmin/filter/module.info.cz
 lib/webmin/filter/module.info.cz.UTF-8
 lib/webmin/filter/module.info.de
@@ -9283,7 +8943,9 @@ lib/webmin/filter/module.info.de.UTF-8
 lib/webmin/filter/module.info.hu
 lib/webmin/filter/module.info.hu.UTF-8
 lib/webmin/filter/module.info.ms_MY
+lib/webmin/filter/module.info.ms_MY.UTF-8
 lib/webmin/filter/module.info.nl
+lib/webmin/filter/module.info.nl.UTF-8
 lib/webmin/filter/module.info.no
 lib/webmin/filter/module.info.no.UTF-8
 lib/webmin/filter/module.info.pl
@@ -9371,7 +9033,6 @@ lib/webmin/firewall/images/before.gif
 lib/webmin/firewall/images/down.gif
 lib/webmin/firewall/images/gap.gif
 lib/webmin/firewall/images/icon.gif
-lib/webmin/firewall/images/smallicon.gif
 lib/webmin/firewall/images/up.gif
 lib/webmin/firewall/index.cgi
 lib/webmin/firewall/install_check.pl
@@ -9417,21 +9078,27 @@ lib/webmin/firewall/log_parser.pl
 lib/webmin/firewall/mandrake-linux-lib.pl
 lib/webmin/firewall/module.info
 lib/webmin/firewall/module.info.ca
+lib/webmin/firewall/module.info.ca.UTF-8
 lib/webmin/firewall/module.info.cz
 lib/webmin/firewall/module.info.cz.UTF-8
 lib/webmin/firewall/module.info.de
+lib/webmin/firewall/module.info.de.UTF-8
 lib/webmin/firewall/module.info.es
+lib/webmin/firewall/module.info.es.UTF-8
 lib/webmin/firewall/module.info.hu
 lib/webmin/firewall/module.info.hu.UTF-8
 lib/webmin/firewall/module.info.ja_JP.UTF-8
 lib/webmin/firewall/module.info.ja_JP.euc
 lib/webmin/firewall/module.info.ms_MY
+lib/webmin/firewall/module.info.ms_MY.UTF-8
 lib/webmin/firewall/module.info.nl
+lib/webmin/firewall/module.info.nl.UTF-8
 lib/webmin/firewall/module.info.no
 lib/webmin/firewall/module.info.no.UTF-8
 lib/webmin/firewall/module.info.pl
 lib/webmin/firewall/module.info.pl.UTF-8
 lib/webmin/firewall/module.info.pt_BR
+lib/webmin/firewall/module.info.pt_BR.UTF-8
 lib/webmin/firewall/module.info.ru.UTF-8
 lib/webmin/firewall/module.info.ru_RU
 lib/webmin/firewall/module.info.ru_RU.UTF-8
@@ -9524,7 +9191,6 @@ lib/webmin/firewall6/images/before.gif
 lib/webmin/firewall6/images/down.gif
 lib/webmin/firewall6/images/gap.gif
 lib/webmin/firewall6/images/icon.gif
-lib/webmin/firewall6/images/smallicon.gif
 lib/webmin/firewall6/images/up.gif
 lib/webmin/firewall6/index.cgi
 lib/webmin/firewall6/install_check.pl
@@ -9570,7 +9236,9 @@ lib/webmin/firewall6/log_parser.pl
 lib/webmin/firewall6/mandrake-linux-lib.pl
 lib/webmin/firewall6/module.info
 lib/webmin/firewall6/module.info.ca
+lib/webmin/firewall6/module.info.ca.UTF-8
 lib/webmin/firewall6/module.info.de
+lib/webmin/firewall6/module.info.de.UTF-8
 lib/webmin/firewall6/move.cgi
 lib/webmin/firewall6/newchain.cgi
 lib/webmin/firewall6/open-ports.pl
@@ -9619,7 +9287,9 @@ lib/webmin/firewalld/lang/pl.UTF-8
 lib/webmin/firewalld/log_parser.pl
 lib/webmin/firewalld/module.info
 lib/webmin/firewalld/module.info.ca
+lib/webmin/firewalld/module.info.ca.UTF-8
 lib/webmin/firewalld/module.info.de
+lib/webmin/firewalld/module.info.de.UTF-8
 lib/webmin/firewalld/module.info.pl
 lib/webmin/firewalld/module.info.pl.UTF-8
 lib/webmin/firewalld/open-ports.pl
@@ -9677,7 +9347,6 @@ lib/webmin/format/help/help.zh_TW.Big5.html
 lib/webmin/format/help/help.zh_TW.UTF-8.html
 lib/webmin/format/images/gap.gif
 lib/webmin/format/images/icon.gif
-lib/webmin/format/images/smallicon.gif
 lib/webmin/format/images/use.gif
 lib/webmin/format/index.cgi
 lib/webmin/format/lang/ca
@@ -9709,9 +9378,13 @@ lib/webmin/format/lang/zh_TW.Big5
 lib/webmin/format/lang/zh_TW.UTF-8
 lib/webmin/format/module.info
 lib/webmin/format/module.info.ca
+lib/webmin/format/module.info.ca.UTF-8
 lib/webmin/format/module.info.de
+lib/webmin/format/module.info.de.UTF-8
 lib/webmin/format/module.info.es
+lib/webmin/format/module.info.es.UTF-8
 lib/webmin/format/module.info.fr
+lib/webmin/format/module.info.fr.UTF-8
 lib/webmin/format/module.info.hu
 lib/webmin/format/module.info.hu.UTF-8
 lib/webmin/format/module.info.ja_JP.UTF-8
@@ -9719,15 +9392,16 @@ lib/webmin/format/module.info.ja_JP.euc
 lib/webmin/format/module.info.ko_KR.UTF-8
 lib/webmin/format/module.info.ko_KR.euc
 lib/webmin/format/module.info.nl
+lib/webmin/format/module.info.nl.UTF-8
 lib/webmin/format/module.info.pl
 lib/webmin/format/module.info.pl.UTF-8
 lib/webmin/format/module.info.pt
+lib/webmin/format/module.info.pt.UTF-8
 lib/webmin/format/module.info.sv
+lib/webmin/format/module.info.sv.UTF-8
 lib/webmin/format/module.info.tr
 lib/webmin/format/module.info.zh_CN
-lib/webmin/format/module.info.zh_CN.UTF-8
 lib/webmin/format/module.info.zh_TW.Big5
-lib/webmin/format/module.info.zh_TW.UTF-8
 lib/webmin/format/newfs.cgi
 lib/webmin/format/newfs_form.cgi
 lib/webmin/format/rbac-mapping
@@ -10268,7 +9942,6 @@ lib/webmin/fsdump/help/xdev.nl.html
 lib/webmin/fsdump/help/xdev.pl.UTF-8.html
 lib/webmin/fsdump/help/xdev.pl.html
 lib/webmin/fsdump/images/icon.gif
-lib/webmin/fsdump/images/smallicon.gif
 lib/webmin/fsdump/index.cgi
 lib/webmin/fsdump/install_check.pl
 lib/webmin/fsdump/irix-lib.pl
@@ -10314,27 +9987,32 @@ lib/webmin/fsdump/macos-lib.pl
 lib/webmin/fsdump/module.info
 lib/webmin/fsdump/module.info.ar
 lib/webmin/fsdump/module.info.ca
+lib/webmin/fsdump/module.info.ca.UTF-8
 lib/webmin/fsdump/module.info.cz
 lib/webmin/fsdump/module.info.cz.UTF-8
 lib/webmin/fsdump/module.info.de
+lib/webmin/fsdump/module.info.de.UTF-8
 lib/webmin/fsdump/module.info.es
+lib/webmin/fsdump/module.info.es.UTF-8
 lib/webmin/fsdump/module.info.hu
 lib/webmin/fsdump/module.info.hu.UTF-8
 lib/webmin/fsdump/module.info.ko_KR.UTF-8
 lib/webmin/fsdump/module.info.ko_KR.euc
 lib/webmin/fsdump/module.info.ms_MY
+lib/webmin/fsdump/module.info.ms_MY.UTF-8
 lib/webmin/fsdump/module.info.nl
+lib/webmin/fsdump/module.info.nl.UTF-8
 lib/webmin/fsdump/module.info.no
 lib/webmin/fsdump/module.info.no.UTF-8
 lib/webmin/fsdump/module.info.pl
 lib/webmin/fsdump/module.info.pl.UTF-8
 lib/webmin/fsdump/module.info.pt_BR
+lib/webmin/fsdump/module.info.pt_BR.UTF-8
 lib/webmin/fsdump/module.info.ru.UTF-8
 lib/webmin/fsdump/module.info.ru_RU
 lib/webmin/fsdump/module.info.ru_RU.UTF-8
 lib/webmin/fsdump/module.info.ru_SU
 lib/webmin/fsdump/module.info.zh_TW.Big5
-lib/webmin/fsdump/module.info.zh_TW.UTF-8
 lib/webmin/fsdump/multi.pl
 lib/webmin/fsdump/newtape.cgi
 lib/webmin/fsdump/newtape.pl
@@ -11188,7 +10866,6 @@ lib/webmin/grub/images/chain.gif
 lib/webmin/grub/images/grub.gif
 lib/webmin/grub/images/icon.gif
 lib/webmin/grub/images/kernel.gif
-lib/webmin/grub/images/smallicon.gif
 lib/webmin/grub/index.cgi
 lib/webmin/grub/install.cgi
 lib/webmin/grub/install_check.pl
@@ -11237,19 +10914,27 @@ lib/webmin/grub/lang/zh_TW.UTF-8
 lib/webmin/grub/log_parser.pl
 lib/webmin/grub/module.info
 lib/webmin/grub/module.info.ca
+lib/webmin/grub/module.info.ca.UTF-8
 lib/webmin/grub/module.info.cz
 lib/webmin/grub/module.info.cz.UTF-8
 lib/webmin/grub/module.info.de
+lib/webmin/grub/module.info.de.UTF-8
 lib/webmin/grub/module.info.es
+lib/webmin/grub/module.info.es.UTF-8
 lib/webmin/grub/module.info.fr
+lib/webmin/grub/module.info.fr.UTF-8
 lib/webmin/grub/module.info.it
+lib/webmin/grub/module.info.it.UTF-8
 lib/webmin/grub/module.info.ja_JP.UTF-8
 lib/webmin/grub/module.info.ja_JP.euc
 lib/webmin/grub/module.info.ko_KR.UTF-8
 lib/webmin/grub/module.info.ko_KR.euc
 lib/webmin/grub/module.info.ms
+lib/webmin/grub/module.info.ms.UTF-8
 lib/webmin/grub/module.info.ms_MY
+lib/webmin/grub/module.info.ms_MY.UTF-8
 lib/webmin/grub/module.info.nl
+lib/webmin/grub/module.info.nl.UTF-8
 lib/webmin/grub/module.info.no
 lib/webmin/grub/module.info.no.UTF-8
 lib/webmin/grub/module.info.pl
@@ -11259,7 +10944,6 @@ lib/webmin/grub/module.info.ru_RU
 lib/webmin/grub/module.info.ru_RU.UTF-8
 lib/webmin/grub/module.info.ru_SU
 lib/webmin/grub/module.info.zh_TW.Big5
-lib/webmin/grub/module.info.zh_TW.UTF-8
 lib/webmin/grub/save_global.cgi
 lib/webmin/grub/save_title.cgi
 lib/webmin/grub/up.cgi
@@ -11298,7 +10982,6 @@ lib/webmin/heartbeat/images/auth.gif
 lib/webmin/heartbeat/images/conf.gif
 lib/webmin/heartbeat/images/icon.gif
 lib/webmin/heartbeat/images/res.gif
-lib/webmin/heartbeat/images/smallicon.gif
 lib/webmin/heartbeat/index.cgi
 lib/webmin/heartbeat/install_check.pl
 lib/webmin/heartbeat/lang/bg
@@ -11321,12 +11004,17 @@ lib/webmin/heartbeat/lang/no
 lib/webmin/heartbeat/lang/no.UTF-8
 lib/webmin/heartbeat/module.info
 lib/webmin/heartbeat/module.info.ca
+lib/webmin/heartbeat/module.info.ca.UTF-8
 lib/webmin/heartbeat/module.info.cz
 lib/webmin/heartbeat/module.info.cz.UTF-8
 lib/webmin/heartbeat/module.info.de
+lib/webmin/heartbeat/module.info.de.UTF-8
 lib/webmin/heartbeat/module.info.es
+lib/webmin/heartbeat/module.info.es.UTF-8
 lib/webmin/heartbeat/module.info.ms_MY
+lib/webmin/heartbeat/module.info.ms_MY.UTF-8
 lib/webmin/heartbeat/module.info.nl
+lib/webmin/heartbeat/module.info.nl.UTF-8
 lib/webmin/heartbeat/module.info.no
 lib/webmin/heartbeat/module.info.no.UTF-8
 lib/webmin/heartbeat/save_auth.cgi
@@ -11537,7 +11225,6 @@ lib/webmin/hpuxexports/hpux-lib.pl
 lib/webmin/hpuxexports/hpuxexports-lib.pl
 lib/webmin/hpuxexports/images/export.gif
 lib/webmin/hpuxexports/images/icon.gif
-lib/webmin/hpuxexports/images/smallicon.gif
 lib/webmin/hpuxexports/index.cgi
 lib/webmin/hpuxexports/install_check.pl
 lib/webmin/hpuxexports/lang/ca
@@ -11572,9 +11259,13 @@ lib/webmin/hpuxexports/low.risk
 lib/webmin/hpuxexports/medium.risk
 lib/webmin/hpuxexports/module.info
 lib/webmin/hpuxexports/module.info.ca
+lib/webmin/hpuxexports/module.info.ca.UTF-8
 lib/webmin/hpuxexports/module.info.de
+lib/webmin/hpuxexports/module.info.de.UTF-8
 lib/webmin/hpuxexports/module.info.es
+lib/webmin/hpuxexports/module.info.es.UTF-8
 lib/webmin/hpuxexports/module.info.fr
+lib/webmin/hpuxexports/module.info.fr.UTF-8
 lib/webmin/hpuxexports/module.info.ja_JP.UTF-8
 lib/webmin/hpuxexports/module.info.ja_JP.euc
 lib/webmin/hpuxexports/module.info.ko_KR.UTF-8
@@ -11582,16 +11273,16 @@ lib/webmin/hpuxexports/module.info.ko_KR.euc
 lib/webmin/hpuxexports/module.info.pl
 lib/webmin/hpuxexports/module.info.pl.UTF-8
 lib/webmin/hpuxexports/module.info.pt
+lib/webmin/hpuxexports/module.info.pt.UTF-8
 lib/webmin/hpuxexports/module.info.ru.UTF-8
 lib/webmin/hpuxexports/module.info.ru_RU
 lib/webmin/hpuxexports/module.info.ru_RU.UTF-8
 lib/webmin/hpuxexports/module.info.ru_SU
 lib/webmin/hpuxexports/module.info.sv
+lib/webmin/hpuxexports/module.info.sv.UTF-8
 lib/webmin/hpuxexports/module.info.tr
 lib/webmin/hpuxexports/module.info.zh_CN
-lib/webmin/hpuxexports/module.info.zh_CN.UTF-8
 lib/webmin/hpuxexports/module.info.zh_TW.Big5
-lib/webmin/hpuxexports/module.info.zh_TW.UTF-8
 lib/webmin/hpuxexports/restart_exporting.cgi
 lib/webmin/hpuxexports/restart_mountd.cgi
 lib/webmin/hpuxexports/save_export.cgi
@@ -11636,7 +11327,6 @@ lib/webmin/htaccess-htpasswd/edit_user.cgi
 lib/webmin/htaccess-htpasswd/htaccess-lib.pl
 lib/webmin/htaccess-htpasswd/htpasswd-file-lib.pl
 lib/webmin/htaccess-htpasswd/images/icon.gif
-lib/webmin/htaccess-htpasswd/images/smallicon.gif
 lib/webmin/htaccess-htpasswd/index.cgi
 lib/webmin/htaccess-htpasswd/lang/bg
 lib/webmin/htaccess-htpasswd/lang/bg.UTF-8
@@ -11675,12 +11365,17 @@ lib/webmin/htaccess-htpasswd/log_parser.pl
 lib/webmin/htaccess-htpasswd/md5-lib.pl
 lib/webmin/htaccess-htpasswd/module.info
 lib/webmin/htaccess-htpasswd/module.info.ca
+lib/webmin/htaccess-htpasswd/module.info.ca.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.cz
 lib/webmin/htaccess-htpasswd/module.info.cz.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.de
+lib/webmin/htaccess-htpasswd/module.info.de.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.es
+lib/webmin/htaccess-htpasswd/module.info.es.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.fi
+lib/webmin/htaccess-htpasswd/module.info.fi.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.fr
+lib/webmin/htaccess-htpasswd/module.info.fr.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.hu
 lib/webmin/htaccess-htpasswd/module.info.hu.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.ja_JP.UTF-8
@@ -11688,12 +11383,14 @@ lib/webmin/htaccess-htpasswd/module.info.ja_JP.euc
 lib/webmin/htaccess-htpasswd/module.info.ko_KR.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.ko_KR.euc
 lib/webmin/htaccess-htpasswd/module.info.ms
+lib/webmin/htaccess-htpasswd/module.info.ms.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.ms_MY
+lib/webmin/htaccess-htpasswd/module.info.ms_MY.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.nl
+lib/webmin/htaccess-htpasswd/module.info.nl.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.no
 lib/webmin/htaccess-htpasswd/module.info.no.UTF-8
 lib/webmin/htaccess-htpasswd/module.info.zh_TW.Big5
-lib/webmin/htaccess-htpasswd/module.info.zh_TW.UTF-8
 lib/webmin/htaccess-htpasswd/save_dir.cgi
 lib/webmin/htaccess-htpasswd/save_group.cgi
 lib/webmin/htaccess-htpasswd/save_user.cgi
@@ -11743,7 +11440,6 @@ lib/webmin/idmapd/help/pipefsdir.nl.UTF-8.html
 lib/webmin/idmapd/help/pipefsdir.nl.html
 lib/webmin/idmapd/idmapd-lib.pl
 lib/webmin/idmapd/images/icon.gif
-lib/webmin/idmapd/images/smallicon.gif
 lib/webmin/idmapd/index.cgi
 lib/webmin/idmapd/install_check.pl
 lib/webmin/idmapd/lang/ca
@@ -11761,12 +11457,17 @@ lib/webmin/idmapd/lang/no.UTF-8
 lib/webmin/idmapd/log_parser.pl
 lib/webmin/idmapd/module.info
 lib/webmin/idmapd/module.info.ca
+lib/webmin/idmapd/module.info.ca.UTF-8
 lib/webmin/idmapd/module.info.cz
 lib/webmin/idmapd/module.info.cz.UTF-8
 lib/webmin/idmapd/module.info.de
+lib/webmin/idmapd/module.info.de.UTF-8
 lib/webmin/idmapd/module.info.fr
+lib/webmin/idmapd/module.info.fr.UTF-8
 lib/webmin/idmapd/module.info.ms_MY
+lib/webmin/idmapd/module.info.ms_MY.UTF-8
 lib/webmin/idmapd/module.info.nl
+lib/webmin/idmapd/module.info.nl.UTF-8
 lib/webmin/idmapd/module.info.no
 lib/webmin/idmapd/module.info.no.UTF-8
 lib/webmin/idmapd/save.cgi
@@ -11909,7 +11610,6 @@ lib/webmin/inetd/help/help.sv.html
 lib/webmin/inetd/help/help.zh_TW.Big5.html
 lib/webmin/inetd/help/help.zh_TW.UTF-8.html
 lib/webmin/inetd/images/icon.gif
-lib/webmin/inetd/images/smallicon.gif
 lib/webmin/inetd/index.cgi
 lib/webmin/inetd/inetd-generic-lib.pl
 lib/webmin/inetd/inetd-lib.pl
@@ -11951,11 +11651,15 @@ lib/webmin/inetd/lang/zh_TW.UTF-8
 lib/webmin/inetd/log_parser.pl
 lib/webmin/inetd/module.info
 lib/webmin/inetd/module.info.ca
+lib/webmin/inetd/module.info.ca.UTF-8
 lib/webmin/inetd/module.info.de
+lib/webmin/inetd/module.info.de.UTF-8
 lib/webmin/inetd/module.info.hu
 lib/webmin/inetd/module.info.hu.UTF-8
 lib/webmin/inetd/module.info.ms_MY
+lib/webmin/inetd/module.info.ms_MY.UTF-8
 lib/webmin/inetd/module.info.nl
+lib/webmin/inetd/module.info.nl.UTF-8
 lib/webmin/inetd/module.info.no
 lib/webmin/inetd/module.info.no.UTF-8
 lib/webmin/inetd/restart_inetd.cgi
@@ -12086,7 +11790,6 @@ lib/webmin/init/help/proc.sv.UTF-8.html
 lib/webmin/init/help/proc.sv.html
 lib/webmin/init/hostconfig-lib.pl
 lib/webmin/init/images/icon.gif
-lib/webmin/init/images/smallicon.gif
 lib/webmin/init/index.cgi
 lib/webmin/init/init-lib.pl
 lib/webmin/init/lang/ar
@@ -12148,12 +11851,17 @@ lib/webmin/init/modifyhostconfig.cgi
 lib/webmin/init/module.info
 lib/webmin/init/module.info.ar
 lib/webmin/init/module.info.ca
+lib/webmin/init/module.info.ca.UTF-8
 lib/webmin/init/module.info.cz
 lib/webmin/init/module.info.cz.UTF-8
 lib/webmin/init/module.info.de
+lib/webmin/init/module.info.de.UTF-8
 lib/webmin/init/module.info.es
+lib/webmin/init/module.info.es.UTF-8
 lib/webmin/init/module.info.eu
+lib/webmin/init/module.info.eu.UTF-8
 lib/webmin/init/module.info.fr
+lib/webmin/init/module.info.fr.UTF-8
 lib/webmin/init/module.info.hu
 lib/webmin/init/module.info.hu.UTF-8
 lib/webmin/init/module.info.ja_JP.UTF-8
@@ -12161,12 +11869,15 @@ lib/webmin/init/module.info.ja_JP.euc
 lib/webmin/init/module.info.ko_KR.UTF-8
 lib/webmin/init/module.info.ko_KR.euc
 lib/webmin/init/module.info.ms_MY
+lib/webmin/init/module.info.ms_MY.UTF-8
 lib/webmin/init/module.info.nl
+lib/webmin/init/module.info.nl.UTF-8
 lib/webmin/init/module.info.no
 lib/webmin/init/module.info.no.UTF-8
 lib/webmin/init/module.info.pl
 lib/webmin/init/module.info.pl.UTF-8
 lib/webmin/init/module.info.pt
+lib/webmin/init/module.info.pt.UTF-8
 lib/webmin/init/module.info.ru.UTF-8
 lib/webmin/init/module.info.ru_RU
 lib/webmin/init/module.info.ru_RU.UTF-8
@@ -12174,11 +11885,10 @@ lib/webmin/init/module.info.ru_SU
 lib/webmin/init/module.info.sk
 lib/webmin/init/module.info.sk.UTF-8
 lib/webmin/init/module.info.sv
+lib/webmin/init/module.info.sv.UTF-8
 lib/webmin/init/module.info.tr
 lib/webmin/init/module.info.zh_CN
-lib/webmin/init/module.info.zh_CN.UTF-8
 lib/webmin/init/module.info.zh_TW.Big5
-lib/webmin/init/module.info.zh_TW.UTF-8
 lib/webmin/init/rbac-mapping
 lib/webmin/init/reboot.cgi
 lib/webmin/init/save_action.cgi
@@ -12323,7 +12033,6 @@ lib/webmin/inittab/help/runlevels.ru_SU.html
 lib/webmin/inittab/help/runlevels.sv.UTF-8.html
 lib/webmin/inittab/help/runlevels.sv.html
 lib/webmin/inittab/images/icon.gif
-lib/webmin/inittab/images/smallicon.gif
 lib/webmin/inittab/index.cgi
 lib/webmin/inittab/inittab-lib.pl
 lib/webmin/inittab/install_check.pl
@@ -12369,11 +12078,15 @@ lib/webmin/inittab/lang/zh_TW.UTF-8
 lib/webmin/inittab/log_parser.pl
 lib/webmin/inittab/module.info
 lib/webmin/inittab/module.info.ca
+lib/webmin/inittab/module.info.ca.UTF-8
 lib/webmin/inittab/module.info.cz
 lib/webmin/inittab/module.info.cz.UTF-8
 lib/webmin/inittab/module.info.de
+lib/webmin/inittab/module.info.de.UTF-8
 lib/webmin/inittab/module.info.es
+lib/webmin/inittab/module.info.es.UTF-8
 lib/webmin/inittab/module.info.fr
+lib/webmin/inittab/module.info.fr.UTF-8
 lib/webmin/inittab/module.info.hu
 lib/webmin/inittab/module.info.hu.UTF-8
 lib/webmin/inittab/module.info.ja_JP.UTF-8
@@ -12381,21 +12094,24 @@ lib/webmin/inittab/module.info.ja_JP.euc
 lib/webmin/inittab/module.info.ko_KR.UTF-8
 lib/webmin/inittab/module.info.ko_KR.euc
 lib/webmin/inittab/module.info.ms
+lib/webmin/inittab/module.info.ms.UTF-8
 lib/webmin/inittab/module.info.ms_MY
+lib/webmin/inittab/module.info.ms_MY.UTF-8
 lib/webmin/inittab/module.info.nl
+lib/webmin/inittab/module.info.nl.UTF-8
 lib/webmin/inittab/module.info.pl
 lib/webmin/inittab/module.info.pl.UTF-8
 lib/webmin/inittab/module.info.pt
+lib/webmin/inittab/module.info.pt.UTF-8
 lib/webmin/inittab/module.info.ru.UTF-8
 lib/webmin/inittab/module.info.ru_RU
 lib/webmin/inittab/module.info.ru_RU.UTF-8
 lib/webmin/inittab/module.info.ru_SU
 lib/webmin/inittab/module.info.sv
+lib/webmin/inittab/module.info.sv.UTF-8
 lib/webmin/inittab/module.info.tr
 lib/webmin/inittab/module.info.zh_CN
-lib/webmin/inittab/module.info.zh_CN.UTF-8
 lib/webmin/inittab/module.info.zh_TW.Big5
-lib/webmin/inittab/module.info.zh_TW.UTF-8
 lib/webmin/inittab/save_inittab.cgi
 lib/webmin/install-module.pl
 lib/webmin/install-type
@@ -12424,7 +12140,6 @@ lib/webmin/ipfilter/images/before.gif
 lib/webmin/ipfilter/images/down.gif
 lib/webmin/ipfilter/images/gap.gif
 lib/webmin/ipfilter/images/icon.gif
-lib/webmin/ipfilter/images/smallicon.gif
 lib/webmin/ipfilter/images/up.gif
 lib/webmin/ipfilter/index.cgi
 lib/webmin/ipfilter/install_check.pl
@@ -12440,8 +12155,11 @@ lib/webmin/ipfilter/lang/nl.UTF-8
 lib/webmin/ipfilter/log_parser.pl
 lib/webmin/ipfilter/module.info
 lib/webmin/ipfilter/module.info.ca
+lib/webmin/ipfilter/module.info.ca.UTF-8
 lib/webmin/ipfilter/module.info.de
+lib/webmin/ipfilter/module.info.de.UTF-8
 lib/webmin/ipfilter/module.info.nl
+lib/webmin/ipfilter/module.info.nl.UTF-8
 lib/webmin/ipfilter/move.cgi
 lib/webmin/ipfilter/natmove.cgi
 lib/webmin/ipfilter/save_nat.cgi
@@ -12469,7 +12187,6 @@ lib/webmin/ipfw/images/before.gif
 lib/webmin/ipfw/images/down.gif
 lib/webmin/ipfw/images/gap.gif
 lib/webmin/ipfw/images/icon.gif
-lib/webmin/ipfw/images/smallicon.gif
 lib/webmin/ipfw/images/up.gif
 lib/webmin/ipfw/index.cgi
 lib/webmin/ipfw/install_check.pl
@@ -12485,8 +12202,11 @@ lib/webmin/ipfw/lang/nl.UTF-8
 lib/webmin/ipfw/log_parser.pl
 lib/webmin/ipfw/module.info
 lib/webmin/ipfw/module.info.ca
+lib/webmin/ipfw/module.info.ca.UTF-8
 lib/webmin/ipfw/module.info.de
+lib/webmin/ipfw/module.info.de.UTF-8
 lib/webmin/ipfw/module.info.nl
+lib/webmin/ipfw/module.info.nl.UTF-8
 lib/webmin/ipfw/move.cgi
 lib/webmin/ipfw/save_rule.cgi
 lib/webmin/ipfw/setup.cgi
@@ -12544,7 +12264,6 @@ lib/webmin/ipsec/images/icon.gif
 lib/webmin/ipsec/images/policy.gif
 lib/webmin/ipsec/images/secrets.gif
 lib/webmin/ipsec/images/showkey.gif
-lib/webmin/ipsec/images/smallicon.gif
 lib/webmin/ipsec/import.cgi
 lib/webmin/ipsec/import_form.cgi
 lib/webmin/ipsec/index.cgi
@@ -12570,12 +12289,17 @@ lib/webmin/ipsec/list_secrets.cgi
 lib/webmin/ipsec/log_parser.pl
 lib/webmin/ipsec/module.info
 lib/webmin/ipsec/module.info.ca
+lib/webmin/ipsec/module.info.ca.UTF-8
 lib/webmin/ipsec/module.info.cz
 lib/webmin/ipsec/module.info.cz.UTF-8
 lib/webmin/ipsec/module.info.de
+lib/webmin/ipsec/module.info.de.UTF-8
 lib/webmin/ipsec/module.info.es
+lib/webmin/ipsec/module.info.es.UTF-8
 lib/webmin/ipsec/module.info.ms_MY
+lib/webmin/ipsec/module.info.ms_MY.UTF-8
 lib/webmin/ipsec/module.info.nl
+lib/webmin/ipsec/module.info.nl.UTF-8
 lib/webmin/ipsec/module.info.no
 lib/webmin/ipsec/module.info.no.UTF-8
 lib/webmin/ipsec/newkey.cgi
@@ -12618,7 +12342,6 @@ lib/webmin/iscsi-client/images/conns.gif
 lib/webmin/iscsi-client/images/icon.gif
 lib/webmin/iscsi-client/images/ifaces.gif
 lib/webmin/iscsi-client/images/iscsi.gif
-lib/webmin/iscsi-client/images/smallicon.gif
 lib/webmin/iscsi-client/images/timeout.gif
 lib/webmin/iscsi-client/index.cgi
 lib/webmin/iscsi-client/install_check.pl
@@ -12636,8 +12359,11 @@ lib/webmin/iscsi-client/list_ifaces.cgi
 lib/webmin/iscsi-client/log_parser.pl
 lib/webmin/iscsi-client/module.info
 lib/webmin/iscsi-client/module.info.ca
+lib/webmin/iscsi-client/module.info.ca.UTF-8
 lib/webmin/iscsi-client/module.info.de
+lib/webmin/iscsi-client/module.info.de.UTF-8
 lib/webmin/iscsi-client/module.info.ms_MY
+lib/webmin/iscsi-client/module.info.ms_MY.UTF-8
 lib/webmin/iscsi-client/module.info.no
 lib/webmin/iscsi-client/module.info.no.UTF-8
 lib/webmin/iscsi-client/save_auth.cgi
@@ -12695,8 +12421,11 @@ lib/webmin/iscsi-server/list_users.cgi
 lib/webmin/iscsi-server/log_parser.pl
 lib/webmin/iscsi-server/module.info
 lib/webmin/iscsi-server/module.info.ca
+lib/webmin/iscsi-server/module.info.ca.UTF-8
 lib/webmin/iscsi-server/module.info.de
+lib/webmin/iscsi-server/module.info.de.UTF-8
 lib/webmin/iscsi-server/module.info.ms_MY
+lib/webmin/iscsi-server/module.info.ms_MY.UTF-8
 lib/webmin/iscsi-server/module.info.no
 lib/webmin/iscsi-server/module.info.no.UTF-8
 lib/webmin/iscsi-server/restart.cgi
@@ -12739,7 +12468,6 @@ lib/webmin/iscsi-target/images/conn.gif
 lib/webmin/iscsi-target/images/icon.gif
 lib/webmin/iscsi-target/images/initiators.gif
 lib/webmin/iscsi-target/images/manual.gif
-lib/webmin/iscsi-target/images/smallicon.gif
 lib/webmin/iscsi-target/images/targets.gif
 lib/webmin/iscsi-target/images/timeout.gif
 lib/webmin/iscsi-target/index.cgi
@@ -12757,8 +12485,11 @@ lib/webmin/iscsi-target/list_allow.cgi
 lib/webmin/iscsi-target/log_parser.pl
 lib/webmin/iscsi-target/module.info
 lib/webmin/iscsi-target/module.info.ca
+lib/webmin/iscsi-target/module.info.ca.UTF-8
 lib/webmin/iscsi-target/module.info.de
+lib/webmin/iscsi-target/module.info.de.UTF-8
 lib/webmin/iscsi-target/module.info.ms_MY
+lib/webmin/iscsi-target/module.info.ms_MY.UTF-8
 lib/webmin/iscsi-target/module.info.no
 lib/webmin/iscsi-target/module.info.no.UTF-8
 lib/webmin/iscsi-target/restart.cgi
@@ -12808,7 +12539,9 @@ lib/webmin/iscsi-tgtd/lang/no.UTF-8
 lib/webmin/iscsi-tgtd/log_parser.pl
 lib/webmin/iscsi-tgtd/module.info
 lib/webmin/iscsi-tgtd/module.info.ca
+lib/webmin/iscsi-tgtd/module.info.ca.UTF-8
 lib/webmin/iscsi-tgtd/module.info.de
+lib/webmin/iscsi-tgtd/module.info.de.UTF-8
 lib/webmin/iscsi-tgtd/restart.cgi
 lib/webmin/iscsi-tgtd/save_manual.cgi
 lib/webmin/iscsi-tgtd/save_target.cgi
@@ -12932,7 +12665,6 @@ lib/webmin/jabber/images/karma.gif
 lib/webmin/jabber/images/messages.gif
 lib/webmin/jabber/images/misc.gif
 lib/webmin/jabber/images/modules.gif
-lib/webmin/jabber/images/smallicon.gif
 lib/webmin/jabber/index.cgi
 lib/webmin/jabber/install_check.pl
 lib/webmin/jabber/jabber-lib.pl
@@ -12962,12 +12694,17 @@ lib/webmin/jabber/lang/zh_CN
 lib/webmin/jabber/lang/zh_CN.UTF-8
 lib/webmin/jabber/module.info
 lib/webmin/jabber/module.info.ca
+lib/webmin/jabber/module.info.ca.UTF-8
 lib/webmin/jabber/module.info.cz
 lib/webmin/jabber/module.info.cz.UTF-8
 lib/webmin/jabber/module.info.de
+lib/webmin/jabber/module.info.de.UTF-8
 lib/webmin/jabber/module.info.es
+lib/webmin/jabber/module.info.es.UTF-8
 lib/webmin/jabber/module.info.ms_MY
+lib/webmin/jabber/module.info.ms_MY.UTF-8
 lib/webmin/jabber/module.info.nl
+lib/webmin/jabber/module.info.nl.UTF-8
 lib/webmin/jabber/module.info.no
 lib/webmin/jabber/module.info.no.UTF-8
 lib/webmin/jabber/module.info.pl
@@ -13068,7 +12805,6 @@ lib/webmin/krb5/help/kdc_log.nl.html
 lib/webmin/krb5/help/kdc_log.no.UTF-8.html
 lib/webmin/krb5/help/kdc_log.no.html
 lib/webmin/krb5/images/icon.gif
-lib/webmin/krb5/images/smallicon.gif
 lib/webmin/krb5/index.cgi
 lib/webmin/krb5/install_check.pl
 lib/webmin/krb5/krb5-lib.pl
@@ -13087,12 +12823,17 @@ lib/webmin/krb5/lang/no.UTF-8
 lib/webmin/krb5/log_parser.pl
 lib/webmin/krb5/module.info
 lib/webmin/krb5/module.info.ca
+lib/webmin/krb5/module.info.ca.UTF-8
 lib/webmin/krb5/module.info.cz
 lib/webmin/krb5/module.info.cz.UTF-8
 lib/webmin/krb5/module.info.de
+lib/webmin/krb5/module.info.de.UTF-8
 lib/webmin/krb5/module.info.fr
+lib/webmin/krb5/module.info.fr.UTF-8
 lib/webmin/krb5/module.info.ms_MY
+lib/webmin/krb5/module.info.ms_MY.UTF-8
 lib/webmin/krb5/module.info.nl
+lib/webmin/krb5/module.info.nl.UTF-8
 lib/webmin/krb5/module.info.no
 lib/webmin/krb5/module.info.no.UTF-8
 lib/webmin/krb5/save.cgi
@@ -13239,7 +12980,6 @@ lib/webmin/ldap-client/images/icon.gif
 lib/webmin/ldap-client/images/open.gif
 lib/webmin/ldap-client/images/pam.gif
 lib/webmin/ldap-client/images/server.gif
-lib/webmin/ldap-client/images/smallicon.gif
 lib/webmin/ldap-client/images/switch.gif
 lib/webmin/ldap-client/images/up.gif
 lib/webmin/ldap-client/index.cgi
@@ -13261,12 +13001,17 @@ lib/webmin/ldap-client/list_switches.cgi
 lib/webmin/ldap-client/log_parser.pl
 lib/webmin/ldap-client/module.info
 lib/webmin/ldap-client/module.info.ca
+lib/webmin/ldap-client/module.info.ca.UTF-8
 lib/webmin/ldap-client/module.info.de
+lib/webmin/ldap-client/module.info.de.UTF-8
 lib/webmin/ldap-client/module.info.ms_MY
+lib/webmin/ldap-client/module.info.ms_MY.UTF-8
 lib/webmin/ldap-client/module.info.nl
+lib/webmin/ldap-client/module.info.nl.UTF-8
 lib/webmin/ldap-client/module.info.no
 lib/webmin/ldap-client/module.info.no.UTF-8
 lib/webmin/ldap-client/module.info.pt_BR
+lib/webmin/ldap-client/module.info.pt_BR.UTF-8
 lib/webmin/ldap-client/popup_browser.cgi
 lib/webmin/ldap-client/restart.cgi
 lib/webmin/ldap-client/save_base.cgi
@@ -13379,7 +13124,6 @@ lib/webmin/ldap-server/images/icon.gif
 lib/webmin/ldap-server/images/ldif.gif
 lib/webmin/ldap-server/images/schema.gif
 lib/webmin/ldap-server/images/slapd.gif
-lib/webmin/ldap-server/images/smallicon.gif
 lib/webmin/ldap-server/index.cgi
 lib/webmin/ldap-server/install_check.pl
 lib/webmin/ldap-server/lang/ca
@@ -13402,12 +13146,17 @@ lib/webmin/ldap-server/ldap-server-lib.pl
 lib/webmin/ldap-server/log_parser.pl
 lib/webmin/ldap-server/module.info
 lib/webmin/ldap-server/module.info.ca
+lib/webmin/ldap-server/module.info.ca.UTF-8
 lib/webmin/ldap-server/module.info.de
+lib/webmin/ldap-server/module.info.de.UTF-8
 lib/webmin/ldap-server/module.info.ms_MY
+lib/webmin/ldap-server/module.info.ms_MY.UTF-8
 lib/webmin/ldap-server/module.info.nl
+lib/webmin/ldap-server/module.info.nl.UTF-8
 lib/webmin/ldap-server/module.info.no
 lib/webmin/ldap-server/module.info.no.UTF-8
 lib/webmin/ldap-server/module.info.pt_BR
+lib/webmin/ldap-server/module.info.pt_BR.UTF-8
 lib/webmin/ldap-server/module.info.ru_RU
 lib/webmin/ldap-server/module.info.ru_RU.UTF-8
 lib/webmin/ldap-server/perms.cgi
@@ -13484,7 +13233,6 @@ lib/webmin/ldap-useradmin/help/intro.html
 lib/webmin/ldap-useradmin/help/intro.nl.UTF-8.html
 lib/webmin/ldap-useradmin/help/intro.nl.html
 lib/webmin/ldap-useradmin/images/icon.gif
-lib/webmin/ldap-useradmin/images/smallicon.gif
 lib/webmin/ldap-useradmin/index.cgi
 lib/webmin/ldap-useradmin/install_check.pl
 lib/webmin/ldap-useradmin/lang/ca
@@ -13509,15 +13257,21 @@ lib/webmin/ldap-useradmin/mass_delete_group.cgi
 lib/webmin/ldap-useradmin/mass_delete_user.cgi
 lib/webmin/ldap-useradmin/module.info
 lib/webmin/ldap-useradmin/module.info.ca
+lib/webmin/ldap-useradmin/module.info.ca.UTF-8
 lib/webmin/ldap-useradmin/module.info.cz
 lib/webmin/ldap-useradmin/module.info.cz.UTF-8
 lib/webmin/ldap-useradmin/module.info.de
+lib/webmin/ldap-useradmin/module.info.de.UTF-8
 lib/webmin/ldap-useradmin/module.info.es
+lib/webmin/ldap-useradmin/module.info.es.UTF-8
 lib/webmin/ldap-useradmin/module.info.ms_MY
+lib/webmin/ldap-useradmin/module.info.ms_MY.UTF-8
 lib/webmin/ldap-useradmin/module.info.nl
+lib/webmin/ldap-useradmin/module.info.nl.UTF-8
 lib/webmin/ldap-useradmin/module.info.no
 lib/webmin/ldap-useradmin/module.info.no.UTF-8
 lib/webmin/ldap-useradmin/module.info.pt_BR
+lib/webmin/ldap-useradmin/module.info.pt_BR.UTF-8
 lib/webmin/ldap-useradmin/postinstall.pl
 lib/webmin/ldap-useradmin/raw.cgi
 lib/webmin/ldap-useradmin/save_group.cgi
@@ -13608,7 +13362,6 @@ lib/webmin/logrotate/help/log.html
 lib/webmin/logrotate/help/log.nl.UTF-8.html
 lib/webmin/logrotate/help/log.nl.html
 lib/webmin/logrotate/images/icon.gif
-lib/webmin/logrotate/images/smallicon.gif
 lib/webmin/logrotate/index.cgi
 lib/webmin/logrotate/install_check.pl
 lib/webmin/logrotate/lang/ca
@@ -13641,18 +13394,23 @@ lib/webmin/logrotate/log_parser.pl
 lib/webmin/logrotate/logrotate-lib.pl
 lib/webmin/logrotate/module.info
 lib/webmin/logrotate/module.info.ca
+lib/webmin/logrotate/module.info.ca.UTF-8
 lib/webmin/logrotate/module.info.cz
 lib/webmin/logrotate/module.info.cz.UTF-8
 lib/webmin/logrotate/module.info.de
+lib/webmin/logrotate/module.info.de.UTF-8
 lib/webmin/logrotate/module.info.es
+lib/webmin/logrotate/module.info.es.UTF-8
 lib/webmin/logrotate/module.info.fr
+lib/webmin/logrotate/module.info.fr.UTF-8
 lib/webmin/logrotate/module.info.hu
 lib/webmin/logrotate/module.info.hu.UTF-8
-lib/webmin/logrotate/module.info.ja_JP.UTF-8
 lib/webmin/logrotate/module.info.ko_KR.UTF-8
 lib/webmin/logrotate/module.info.ko_KR.euc
 lib/webmin/logrotate/module.info.ms_MY
+lib/webmin/logrotate/module.info.ms_MY.UTF-8
 lib/webmin/logrotate/module.info.nl
+lib/webmin/logrotate/module.info.nl.UTF-8
 lib/webmin/logrotate/module.info.no
 lib/webmin/logrotate/module.info.no.UTF-8
 lib/webmin/logrotate/module.info.pl
@@ -13766,7 +13524,6 @@ lib/webmin/lpadmin/freebsd-lib.pl
 lib/webmin/lpadmin/hpux-driver.pl
 lib/webmin/lpadmin/hpux-lib.pl
 lib/webmin/lpadmin/images/icon.gif
-lib/webmin/lpadmin/images/smallicon.gif
 lib/webmin/lpadmin/index.cgi
 lib/webmin/lpadmin/irix-driver.pl
 lib/webmin/lpadmin/irix-lib.pl
@@ -13822,11 +13579,15 @@ lib/webmin/lpadmin/lpadmin-lib.pl
 lib/webmin/lpadmin/lprng-lib.pl
 lib/webmin/lpadmin/module.info
 lib/webmin/lpadmin/module.info.ca
+lib/webmin/lpadmin/module.info.ca.UTF-8
 lib/webmin/lpadmin/module.info.cz
 lib/webmin/lpadmin/module.info.cz.UTF-8
 lib/webmin/lpadmin/module.info.de
+lib/webmin/lpadmin/module.info.de.UTF-8
 lib/webmin/lpadmin/module.info.es
+lib/webmin/lpadmin/module.info.es.UTF-8
 lib/webmin/lpadmin/module.info.fr
+lib/webmin/lpadmin/module.info.fr.UTF-8
 lib/webmin/lpadmin/module.info.hu
 lib/webmin/lpadmin/module.info.hu.UTF-8
 lib/webmin/lpadmin/module.info.ja_JP.UTF-8
@@ -13834,23 +13595,26 @@ lib/webmin/lpadmin/module.info.ja_JP.euc
 lib/webmin/lpadmin/module.info.ko_KR.UTF-8
 lib/webmin/lpadmin/module.info.ko_KR.euc
 lib/webmin/lpadmin/module.info.ms_MY
+lib/webmin/lpadmin/module.info.ms_MY.UTF-8
 lib/webmin/lpadmin/module.info.nl
+lib/webmin/lpadmin/module.info.nl.UTF-8
 lib/webmin/lpadmin/module.info.no
 lib/webmin/lpadmin/module.info.no.UTF-8
 lib/webmin/lpadmin/module.info.pl
 lib/webmin/lpadmin/module.info.pl.UTF-8
 lib/webmin/lpadmin/module.info.pt
+lib/webmin/lpadmin/module.info.pt.UTF-8
 lib/webmin/lpadmin/module.info.pt_BR
+lib/webmin/lpadmin/module.info.pt_BR.UTF-8
 lib/webmin/lpadmin/module.info.ru.UTF-8
 lib/webmin/lpadmin/module.info.ru_RU
 lib/webmin/lpadmin/module.info.ru_RU.UTF-8
 lib/webmin/lpadmin/module.info.ru_SU
 lib/webmin/lpadmin/module.info.sv
+lib/webmin/lpadmin/module.info.sv.UTF-8
 lib/webmin/lpadmin/module.info.tr
 lib/webmin/lpadmin/module.info.zh_CN
-lib/webmin/lpadmin/module.info.zh_CN.UTF-8
 lib/webmin/lpadmin/module.info.zh_TW.Big5
-lib/webmin/lpadmin/module.info.zh_TW.UTF-8
 lib/webmin/lpadmin/old-caldera-driver.pl
 lib/webmin/lpadmin/openbsd-lib.pl
 lib/webmin/lpadmin/printconf-driver.pl
@@ -13894,7 +13658,6 @@ lib/webmin/lvm/images/hdd_unmount.png
 lib/webmin/lvm/images/icon.gif
 lib/webmin/lvm/images/lv.gif
 lib/webmin/lvm/images/pv.gif
-lib/webmin/lvm/images/smallicon.gif
 lib/webmin/lvm/images/snap.gif
 lib/webmin/lvm/images/vg.gif
 lib/webmin/lvm/index.cgi
@@ -13932,12 +13695,17 @@ lib/webmin/lvm/mkfs.cgi
 lib/webmin/lvm/mkfs_form.cgi
 lib/webmin/lvm/module.info
 lib/webmin/lvm/module.info.ca
+lib/webmin/lvm/module.info.ca.UTF-8
 lib/webmin/lvm/module.info.cz
 lib/webmin/lvm/module.info.cz.UTF-8
 lib/webmin/lvm/module.info.de
+lib/webmin/lvm/module.info.de.UTF-8
 lib/webmin/lvm/module.info.es
+lib/webmin/lvm/module.info.es.UTF-8
 lib/webmin/lvm/module.info.ms_MY
+lib/webmin/lvm/module.info.ms_MY.UTF-8
 lib/webmin/lvm/module.info.nl
+lib/webmin/lvm/module.info.nl.UTF-8
 lib/webmin/lvm/module.info.no
 lib/webmin/lvm/module.info.no.UTF-8
 lib/webmin/lvm/module.info.ru.UTF-8
@@ -13945,7 +13713,6 @@ lib/webmin/lvm/module.info.ru_RU
 lib/webmin/lvm/module.info.ru_RU.UTF-8
 lib/webmin/lvm/module.info.ru_SU
 lib/webmin/lvm/module.info.zh_TW.Big5
-lib/webmin/lvm/module.info.zh_TW.UTF-8
 lib/webmin/lvm/pvmove.cgi
 lib/webmin/lvm/save_lv.cgi
 lib/webmin/lvm/save_pv.cgi
@@ -13995,7 +13762,6 @@ lib/webmin/mailboxes/images/icon.gif
 lib/webmin/mailboxes/images/p1.gif
 lib/webmin/mailboxes/images/p2.gif
 lib/webmin/mailboxes/images/read.gif
-lib/webmin/mailboxes/images/smallicon.gif
 lib/webmin/mailboxes/images/special.gif
 lib/webmin/mailboxes/index.cgi
 lib/webmin/mailboxes/lang/ca
@@ -14048,31 +13814,39 @@ lib/webmin/mailboxes/mailboxes-lib.pl
 lib/webmin/mailboxes/makelang.pl
 lib/webmin/mailboxes/module.info
 lib/webmin/mailboxes/module.info.ca
+lib/webmin/mailboxes/module.info.ca.UTF-8
 lib/webmin/mailboxes/module.info.cz
 lib/webmin/mailboxes/module.info.cz.UTF-8
 lib/webmin/mailboxes/module.info.de
+lib/webmin/mailboxes/module.info.de.UTF-8
 lib/webmin/mailboxes/module.info.es
+lib/webmin/mailboxes/module.info.es.UTF-8
 lib/webmin/mailboxes/module.info.fi
+lib/webmin/mailboxes/module.info.fi.UTF-8
 lib/webmin/mailboxes/module.info.fr
+lib/webmin/mailboxes/module.info.fr.UTF-8
 lib/webmin/mailboxes/module.info.hu
 lib/webmin/mailboxes/module.info.hu.UTF-8
 lib/webmin/mailboxes/module.info.it
+lib/webmin/mailboxes/module.info.it.UTF-8
 lib/webmin/mailboxes/module.info.ja_JP.UTF-8
 lib/webmin/mailboxes/module.info.ja_JP.euc
 lib/webmin/mailboxes/module.info.ko_KR.UTF-8
 lib/webmin/mailboxes/module.info.ko_KR.euc
 lib/webmin/mailboxes/module.info.ms_MY
+lib/webmin/mailboxes/module.info.ms_MY.UTF-8
 lib/webmin/mailboxes/module.info.nl
+lib/webmin/mailboxes/module.info.nl.UTF-8
 lib/webmin/mailboxes/module.info.no
 lib/webmin/mailboxes/module.info.no.UTF-8
 lib/webmin/mailboxes/module.info.pl
 lib/webmin/mailboxes/module.info.pl.UTF-8
 lib/webmin/mailboxes/module.info.pt_BR
+lib/webmin/mailboxes/module.info.pt_BR.UTF-8
 lib/webmin/mailboxes/module.info.ru_RU
 lib/webmin/mailboxes/module.info.ru_RU.UTF-8
 lib/webmin/mailboxes/module.info.tr
 lib/webmin/mailboxes/module.info.zh_TW.Big5
-lib/webmin/mailboxes/module.info.zh_TW.UTF-8
 lib/webmin/mailboxes/reply_mail.cgi
 lib/webmin/mailboxes/search_form.cgi
 lib/webmin/mailboxes/send_mail.cgi
@@ -14357,7 +14131,6 @@ lib/webmin/mailcap/config.info.pl.UTF-8
 lib/webmin/mailcap/delete.cgi
 lib/webmin/mailcap/edit.cgi
 lib/webmin/mailcap/images/icon.gif
-lib/webmin/mailcap/images/smallicon.gif
 lib/webmin/mailcap/index.cgi
 lib/webmin/mailcap/lang/ca
 lib/webmin/mailcap/lang/ca.UTF-8
@@ -14380,16 +14153,19 @@ lib/webmin/mailcap/log_parser.pl
 lib/webmin/mailcap/mailcap-lib.pl
 lib/webmin/mailcap/module.info
 lib/webmin/mailcap/module.info.ca
+lib/webmin/mailcap/module.info.ca.UTF-8
 lib/webmin/mailcap/module.info.cz
 lib/webmin/mailcap/module.info.cz.UTF-8
 lib/webmin/mailcap/module.info.de
+lib/webmin/mailcap/module.info.de.UTF-8
 lib/webmin/mailcap/module.info.hu
 lib/webmin/mailcap/module.info.hu.UTF-8
-lib/webmin/mailcap/module.info.ja_JP.UTF-8
 lib/webmin/mailcap/module.info.ko_KR.UTF-8
 lib/webmin/mailcap/module.info.ko_KR.euc
 lib/webmin/mailcap/module.info.ms_MY
+lib/webmin/mailcap/module.info.ms_MY.UTF-8
 lib/webmin/mailcap/module.info.nl
+lib/webmin/mailcap/module.info.nl.UTF-8
 lib/webmin/mailcap/module.info.no
 lib/webmin/mailcap/module.info.no.UTF-8
 lib/webmin/mailcap/module.info.pl
@@ -14502,7 +14278,6 @@ lib/webmin/man/help/intro.sk.html
 lib/webmin/man/help/intro.sv.UTF-8.html
 lib/webmin/man/help/intro.sv.html
 lib/webmin/man/images/icon.gif
-lib/webmin/man/images/smallicon.gif
 lib/webmin/man/index.cgi
 lib/webmin/man/lang/ar
 lib/webmin/man/lang/ca
@@ -14554,26 +14329,35 @@ lib/webmin/man/man-lib.pl
 lib/webmin/man/module.info
 lib/webmin/man/module.info.ar
 lib/webmin/man/module.info.ca
+lib/webmin/man/module.info.ca.UTF-8
 lib/webmin/man/module.info.cz
 lib/webmin/man/module.info.cz.UTF-8
 lib/webmin/man/module.info.de
+lib/webmin/man/module.info.de.UTF-8
 lib/webmin/man/module.info.es
+lib/webmin/man/module.info.es.UTF-8
 lib/webmin/man/module.info.fr
+lib/webmin/man/module.info.fr.UTF-8
 lib/webmin/man/module.info.hu
 lib/webmin/man/module.info.hu.UTF-8
 lib/webmin/man/module.info.it
+lib/webmin/man/module.info.it.UTF-8
 lib/webmin/man/module.info.ja_JP.UTF-8
 lib/webmin/man/module.info.ja_JP.euc
 lib/webmin/man/module.info.ko_KR.UTF-8
 lib/webmin/man/module.info.ko_KR.euc
 lib/webmin/man/module.info.ms
+lib/webmin/man/module.info.ms.UTF-8
 lib/webmin/man/module.info.ms_MY
+lib/webmin/man/module.info.ms_MY.UTF-8
 lib/webmin/man/module.info.nl
+lib/webmin/man/module.info.nl.UTF-8
 lib/webmin/man/module.info.no
 lib/webmin/man/module.info.no.UTF-8
 lib/webmin/man/module.info.pl
 lib/webmin/man/module.info.pl.UTF-8
 lib/webmin/man/module.info.pt
+lib/webmin/man/module.info.pt.UTF-8
 lib/webmin/man/module.info.ru.UTF-8
 lib/webmin/man/module.info.ru_RU
 lib/webmin/man/module.info.ru_RU.UTF-8
@@ -14581,11 +14365,10 @@ lib/webmin/man/module.info.ru_SU
 lib/webmin/man/module.info.sk
 lib/webmin/man/module.info.sk.UTF-8
 lib/webmin/man/module.info.sv
+lib/webmin/man/module.info.sv.UTF-8
 lib/webmin/man/module.info.tr
 lib/webmin/man/module.info.zh_CN
-lib/webmin/man/module.info.zh_CN.UTF-8
 lib/webmin/man/module.info.zh_TW.Big5
-lib/webmin/man/module.info.zh_TW.UTF-8
 lib/webmin/man/save_check.cgi
 lib/webmin/man/search.cgi
 lib/webmin/man/view_doc.cgi
@@ -14667,7 +14450,6 @@ lib/webmin/mon/images/mon_global.gif
 lib/webmin/mon/images/mon_status.gif
 lib/webmin/mon/images/periods.gif
 lib/webmin/mon/images/show.gif
-lib/webmin/mon/images/smallicon.gif
 lib/webmin/mon/images/status.gif
 lib/webmin/mon/images/users.gif
 lib/webmin/mon/images/watches.gif
@@ -14699,12 +14481,17 @@ lib/webmin/mon/list_users.cgi
 lib/webmin/mon/list_watches.cgi
 lib/webmin/mon/module.info
 lib/webmin/mon/module.info.ca
+lib/webmin/mon/module.info.ca.UTF-8
 lib/webmin/mon/module.info.cz
 lib/webmin/mon/module.info.cz.UTF-8
 lib/webmin/mon/module.info.de
+lib/webmin/mon/module.info.de.UTF-8
 lib/webmin/mon/module.info.es
+lib/webmin/mon/module.info.es.UTF-8
 lib/webmin/mon/module.info.ms_MY
+lib/webmin/mon/module.info.ms_MY.UTF-8
 lib/webmin/mon/module.info.nl
+lib/webmin/mon/module.info.nl.UTF-8
 lib/webmin/mon/module.info.no
 lib/webmin/mon/module.info.no.UTF-8
 lib/webmin/mon/module.info.ru.UTF-8
@@ -15012,7 +14799,6 @@ lib/webmin/mount/images/nfs.gif
 lib/webmin/mount/images/pcfs.gif
 lib/webmin/mount/images/reiserfs.gif
 lib/webmin/mount/images/rumba.gif
-lib/webmin/mount/images/smallicon.gif
 lib/webmin/mount/images/smbfs.gif
 lib/webmin/mount/images/star.gif
 lib/webmin/mount/images/swap.gif
@@ -15077,36 +14863,44 @@ lib/webmin/mount/macos-mounts.c
 lib/webmin/mount/module.info
 lib/webmin/mount/module.info.ar
 lib/webmin/mount/module.info.ca
+lib/webmin/mount/module.info.ca.UTF-8
 lib/webmin/mount/module.info.cz
 lib/webmin/mount/module.info.cz.UTF-8
 lib/webmin/mount/module.info.de
+lib/webmin/mount/module.info.de.UTF-8
 lib/webmin/mount/module.info.es
+lib/webmin/mount/module.info.es.UTF-8
 lib/webmin/mount/module.info.fr
+lib/webmin/mount/module.info.fr.UTF-8
 lib/webmin/mount/module.info.hu
 lib/webmin/mount/module.info.hu.UTF-8
 lib/webmin/mount/module.info.it
+lib/webmin/mount/module.info.it.UTF-8
 lib/webmin/mount/module.info.ja_JP.UTF-8
 lib/webmin/mount/module.info.ja_JP.euc
 lib/webmin/mount/module.info.ko_KR.UTF-8
 lib/webmin/mount/module.info.ko_KR.euc
 lib/webmin/mount/module.info.ms_MY
+lib/webmin/mount/module.info.ms_MY.UTF-8
 lib/webmin/mount/module.info.nl
+lib/webmin/mount/module.info.nl.UTF-8
 lib/webmin/mount/module.info.no
 lib/webmin/mount/module.info.no.UTF-8
 lib/webmin/mount/module.info.pl
 lib/webmin/mount/module.info.pl.UTF-8
 lib/webmin/mount/module.info.pt
+lib/webmin/mount/module.info.pt.UTF-8
 lib/webmin/mount/module.info.pt_BR
+lib/webmin/mount/module.info.pt_BR.UTF-8
 lib/webmin/mount/module.info.ru.UTF-8
 lib/webmin/mount/module.info.ru_RU
 lib/webmin/mount/module.info.ru_RU.UTF-8
 lib/webmin/mount/module.info.ru_SU
 lib/webmin/mount/module.info.sv
+lib/webmin/mount/module.info.sv.UTF-8
 lib/webmin/mount/module.info.tr
 lib/webmin/mount/module.info.zh_CN
-lib/webmin/mount/module.info.zh_CN.UTF-8
 lib/webmin/mount/module.info.zh_TW.Big5
-lib/webmin/mount/module.info.zh_TW.UTF-8
 lib/webmin/mount/mount-lib.pl
 lib/webmin/mount/mount.cgi
 lib/webmin/mount/netbsd-lib.pl
@@ -15128,6 +14922,7 @@ lib/webmin/mount/save_mount.cgi
 lib/webmin/mount/smb_server.cgi
 lib/webmin/mount/smb_share.cgi
 lib/webmin/mount/solaris-lib.pl
+lib/webmin/mount/system_info.pl
 lib/webmin/mount/unmount.cgi
 lib/webmin/mysql/CHANGELOG
 lib/webmin/mysql/acl_security.pl
@@ -15678,7 +15473,6 @@ lib/webmin/mysql/images/manual.gif
 lib/webmin/mysql/images/mysql.gif
 lib/webmin/mysql/images/procs.gif
 lib/webmin/mysql/images/root.gif
-lib/webmin/mysql/images/smallicon.gif
 lib/webmin/mysql/images/table.gif
 lib/webmin/mysql/images/tprivs.gif
 lib/webmin/mysql/images/users.gif
@@ -15745,38 +15539,46 @@ lib/webmin/mysql/log_parser.pl
 lib/webmin/mysql/login.cgi
 lib/webmin/mysql/module.info
 lib/webmin/mysql/module.info.ca
+lib/webmin/mysql/module.info.ca.UTF-8
 lib/webmin/mysql/module.info.cz
 lib/webmin/mysql/module.info.cz.UTF-8
 lib/webmin/mysql/module.info.de
+lib/webmin/mysql/module.info.de.UTF-8
 lib/webmin/mysql/module.info.es
+lib/webmin/mysql/module.info.es.UTF-8
 lib/webmin/mysql/module.info.fr
+lib/webmin/mysql/module.info.fr.UTF-8
 lib/webmin/mysql/module.info.hu
 lib/webmin/mysql/module.info.hu.UTF-8
 lib/webmin/mysql/module.info.it
+lib/webmin/mysql/module.info.it.UTF-8
 lib/webmin/mysql/module.info.ja_JP.UTF-8
 lib/webmin/mysql/module.info.ja_JP.euc
 lib/webmin/mysql/module.info.ko_KR.UTF-8
 lib/webmin/mysql/module.info.ko_KR.euc
 lib/webmin/mysql/module.info.ms_MY
+lib/webmin/mysql/module.info.ms_MY.UTF-8
 lib/webmin/mysql/module.info.nl
+lib/webmin/mysql/module.info.nl.UTF-8
 lib/webmin/mysql/module.info.no
 lib/webmin/mysql/module.info.no.UTF-8
 lib/webmin/mysql/module.info.pl
 lib/webmin/mysql/module.info.pl.UTF-8
 lib/webmin/mysql/module.info.pt
+lib/webmin/mysql/module.info.pt.UTF-8
 lib/webmin/mysql/module.info.ru.UTF-8
 lib/webmin/mysql/module.info.ru_RU
 lib/webmin/mysql/module.info.ru_RU.UTF-8
 lib/webmin/mysql/module.info.ru_SU
 lib/webmin/mysql/module.info.sv
+lib/webmin/mysql/module.info.sv.UTF-8
 lib/webmin/mysql/module.info.tr
 lib/webmin/mysql/module.info.zh_CN
-lib/webmin/mysql/module.info.zh_CN.UTF-8
 lib/webmin/mysql/module.info.zh_TW.Big5
-lib/webmin/mysql/module.info.zh_TW.UTF-8
 lib/webmin/mysql/mysql-lib.pl
 lib/webmin/mysql/newdb.cgi
 lib/webmin/mysql/newdb_form.cgi
+lib/webmin/mysql/postinstall.pl
 lib/webmin/mysql/root_form.cgi
 lib/webmin/mysql/save_cnf.cgi
 lib/webmin/mysql/save_cpriv.cgi
@@ -15877,7 +15679,6 @@ lib/webmin/net/images/icon.gif
 lib/webmin/net/images/ifcs.gif
 lib/webmin/net/images/ipnodes.gif
 lib/webmin/net/images/routes.gif
-lib/webmin/net/images/smallicon.gif
 lib/webmin/net/index.cgi
 lib/webmin/net/interface_chooser.cgi
 lib/webmin/net/lang/ca
@@ -15938,26 +15739,35 @@ lib/webmin/net/mandrake-linux-lib.pl
 lib/webmin/net/mod_aifc.cgi
 lib/webmin/net/module.info
 lib/webmin/net/module.info.ca
+lib/webmin/net/module.info.ca.UTF-8
 lib/webmin/net/module.info.cz
 lib/webmin/net/module.info.cz.UTF-8
 lib/webmin/net/module.info.de
+lib/webmin/net/module.info.de.UTF-8
 lib/webmin/net/module.info.es
+lib/webmin/net/module.info.es.UTF-8
 lib/webmin/net/module.info.fr
+lib/webmin/net/module.info.fr.UTF-8
 lib/webmin/net/module.info.hu
 lib/webmin/net/module.info.hu.UTF-8
 lib/webmin/net/module.info.it
+lib/webmin/net/module.info.it.UTF-8
 lib/webmin/net/module.info.ja_JP.UTF-8
 lib/webmin/net/module.info.ja_JP.euc
 lib/webmin/net/module.info.ko_KR.UTF-8
 lib/webmin/net/module.info.ko_KR.euc
 lib/webmin/net/module.info.ms_MY
+lib/webmin/net/module.info.ms_MY.UTF-8
 lib/webmin/net/module.info.nl
+lib/webmin/net/module.info.nl.UTF-8
 lib/webmin/net/module.info.no
 lib/webmin/net/module.info.no.UTF-8
 lib/webmin/net/module.info.pl
 lib/webmin/net/module.info.pl.UTF-8
 lib/webmin/net/module.info.pt
+lib/webmin/net/module.info.pt.UTF-8
 lib/webmin/net/module.info.pt_BR
+lib/webmin/net/module.info.pt_BR.UTF-8
 lib/webmin/net/module.info.ru.UTF-8
 lib/webmin/net/module.info.ru_RU
 lib/webmin/net/module.info.ru_RU.UTF-8
@@ -15965,11 +15775,10 @@ lib/webmin/net/module.info.ru_SU
 lib/webmin/net/module.info.sk
 lib/webmin/net/module.info.sk.UTF-8
 lib/webmin/net/module.info.sv
+lib/webmin/net/module.info.sv.UTF-8
 lib/webmin/net/module.info.tr
 lib/webmin/net/module.info.zh_CN
-lib/webmin/net/module.info.zh_CN.UTF-8
 lib/webmin/net/module.info.zh_TW.Big5
-lib/webmin/net/module.info.zh_TW.UTF-8
 lib/webmin/net/msc-linux-lib.pl
 lib/webmin/net/net-lib.pl
 lib/webmin/net/netbsd-lib.pl
@@ -16073,7 +15882,6 @@ lib/webmin/nis/images/client.gif
 lib/webmin/nis/images/icon.gif
 lib/webmin/nis/images/security.gif
 lib/webmin/nis/images/server.gif
-lib/webmin/nis/images/smallicon.gif
 lib/webmin/nis/images/switch.gif
 lib/webmin/nis/images/tables.gif
 lib/webmin/nis/index.cgi
@@ -16119,11 +15927,15 @@ lib/webmin/nis/mandrake-linux-lib.pl
 lib/webmin/nis/md5-lib.pl
 lib/webmin/nis/module.info
 lib/webmin/nis/module.info.ca
+lib/webmin/nis/module.info.ca.UTF-8
 lib/webmin/nis/module.info.cz
 lib/webmin/nis/module.info.cz.UTF-8
 lib/webmin/nis/module.info.de
+lib/webmin/nis/module.info.de.UTF-8
 lib/webmin/nis/module.info.es
+lib/webmin/nis/module.info.es.UTF-8
 lib/webmin/nis/module.info.fr
+lib/webmin/nis/module.info.fr.UTF-8
 lib/webmin/nis/module.info.hu
 lib/webmin/nis/module.info.hu.UTF-8
 lib/webmin/nis/module.info.ja_JP.UTF-8
@@ -16131,7 +15943,9 @@ lib/webmin/nis/module.info.ja_JP.euc
 lib/webmin/nis/module.info.ko_KR.UTF-8
 lib/webmin/nis/module.info.ko_KR.euc
 lib/webmin/nis/module.info.ms_MY
+lib/webmin/nis/module.info.ms_MY.UTF-8
 lib/webmin/nis/module.info.nl
+lib/webmin/nis/module.info.nl.UTF-8
 lib/webmin/nis/module.info.no
 lib/webmin/nis/module.info.no.UTF-8
 lib/webmin/nis/module.info.pl
@@ -16141,10 +15955,9 @@ lib/webmin/nis/module.info.ru_RU
 lib/webmin/nis/module.info.ru_RU.UTF-8
 lib/webmin/nis/module.info.ru_SU
 lib/webmin/nis/module.info.sv
+lib/webmin/nis/module.info.sv.UTF-8
 lib/webmin/nis/module.info.zh_CN
-lib/webmin/nis/module.info.zh_CN.UTF-8
 lib/webmin/nis/module.info.zh_TW.Big5
-lib/webmin/nis/module.info.zh_TW.UTF-8
 lib/webmin/nis/msc-linux-lib.pl
 lib/webmin/nis/nis-lib.pl
 lib/webmin/nis/nisupdate.conf
@@ -16233,7 +16046,6 @@ lib/webmin/openslp/images/dacfg.gif
 lib/webmin/openslp/images/icon.gif
 lib/webmin/openslp/images/log.gif
 lib/webmin/openslp/images/netcfg.gif
-lib/webmin/openslp/images/smallicon.gif
 lib/webmin/openslp/images/snda.gif
 lib/webmin/openslp/index.cgi
 lib/webmin/openslp/install_check.pl
@@ -16261,12 +16073,17 @@ lib/webmin/openslp/lang/uk_UA
 lib/webmin/openslp/lang/uk_UA.UTF-8
 lib/webmin/openslp/module.info
 lib/webmin/openslp/module.info.ca
+lib/webmin/openslp/module.info.ca.UTF-8
 lib/webmin/openslp/module.info.cz
 lib/webmin/openslp/module.info.cz.UTF-8
 lib/webmin/openslp/module.info.de
+lib/webmin/openslp/module.info.de.UTF-8
 lib/webmin/openslp/module.info.ms
+lib/webmin/openslp/module.info.ms.UTF-8
 lib/webmin/openslp/module.info.ms_MY
+lib/webmin/openslp/module.info.ms_MY.UTF-8
 lib/webmin/openslp/module.info.nl
+lib/webmin/openslp/module.info.nl.UTF-8
 lib/webmin/openslp/module.info.no
 lib/webmin/openslp/module.info.no.UTF-8
 lib/webmin/openslp/module.info.ru.UTF-8
@@ -16301,8 +16118,8 @@ lib/webmin/package-updates/config.info.ru.UTF-8
 lib/webmin/package-updates/config.info.ru_RU
 lib/webmin/package-updates/config.info.ru_RU.UTF-8
 lib/webmin/package-updates/config.info.ru_SU
+lib/webmin/package-updates/create_repo.cgi
 lib/webmin/package-updates/images/icon.gif
-lib/webmin/package-updates/images/smallicon.gif
 lib/webmin/package-updates/index.cgi
 lib/webmin/package-updates/install_check.pl
 lib/webmin/package-updates/lang/ar
@@ -16332,19 +16149,23 @@ lib/webmin/package-updates/log_parser.pl
 lib/webmin/package-updates/module.info
 lib/webmin/package-updates/module.info.ar
 lib/webmin/package-updates/module.info.ca
+lib/webmin/package-updates/module.info.ca.UTF-8
 lib/webmin/package-updates/module.info.de
+lib/webmin/package-updates/module.info.de.UTF-8
 lib/webmin/package-updates/module.info.hu
 lib/webmin/package-updates/module.info.hu.UTF-8
 lib/webmin/package-updates/module.info.ms_MY
+lib/webmin/package-updates/module.info.ms_MY.UTF-8
 lib/webmin/package-updates/module.info.nl
+lib/webmin/package-updates/module.info.nl.UTF-8
 lib/webmin/package-updates/module.info.no
 lib/webmin/package-updates/module.info.no.UTF-8
 lib/webmin/package-updates/module.info.pl
 lib/webmin/package-updates/module.info.pl.UTF-8
-lib/webmin/package-updates/module.info.ru.UTF-8
 lib/webmin/package-updates/newfeatures/2.9/0-all
 lib/webmin/package-updates/package-updates-lib.pl
 lib/webmin/package-updates/postinstall.pl
+lib/webmin/package-updates/save_repos.cgi
 lib/webmin/package-updates/save_sched.cgi
 lib/webmin/package-updates/save_view.cgi
 lib/webmin/package-updates/update.cgi
@@ -16414,7 +16235,6 @@ lib/webmin/pam/feedback_files.pl
 lib/webmin/pam/images/down.gif
 lib/webmin/pam/images/gap.gif
 lib/webmin/pam/images/icon.gif
-lib/webmin/pam/images/smallicon.gif
 lib/webmin/pam/images/up.gif
 lib/webmin/pam/index.cgi
 lib/webmin/pam/install_check.pl
@@ -16458,10 +16278,13 @@ lib/webmin/pam/lang/zh_TW.UTF-8
 lib/webmin/pam/log_parser.pl
 lib/webmin/pam/module.info
 lib/webmin/pam/module.info.ca
+lib/webmin/pam/module.info.ca.UTF-8
 lib/webmin/pam/module.info.cz
 lib/webmin/pam/module.info.cz.UTF-8
 lib/webmin/pam/module.info.de
+lib/webmin/pam/module.info.de.UTF-8
 lib/webmin/pam/module.info.es
+lib/webmin/pam/module.info.es.UTF-8
 lib/webmin/pam/module.info.hu
 lib/webmin/pam/module.info.hu.UTF-8
 lib/webmin/pam/module.info.ja_JP.UTF-8
@@ -16469,7 +16292,9 @@ lib/webmin/pam/module.info.ja_JP.euc
 lib/webmin/pam/module.info.ko_KR.UTF-8
 lib/webmin/pam/module.info.ko_KR.euc
 lib/webmin/pam/module.info.ms_MY
+lib/webmin/pam/module.info.ms_MY.UTF-8
 lib/webmin/pam/module.info.nl
+lib/webmin/pam/module.info.nl.UTF-8
 lib/webmin/pam/module.info.no
 lib/webmin/pam/module.info.no.UTF-8
 lib/webmin/pam/module.info.pl
@@ -16479,8 +16304,8 @@ lib/webmin/pam/module.info.ru_RU
 lib/webmin/pam/module.info.ru_RU.UTF-8
 lib/webmin/pam/module.info.ru_SU
 lib/webmin/pam/module.info.sv
+lib/webmin/pam/module.info.sv.UTF-8
 lib/webmin/pam/module.info.zh_TW.Big5
-lib/webmin/pam/module.info.zh_TW.UTF-8
 lib/webmin/pam/move.cgi
 lib/webmin/pam/pam-lib.pl
 lib/webmin/pam/pam_cracklib.so.pl
@@ -16578,7 +16403,6 @@ lib/webmin/pap/images/icon.gif
 lib/webmin/pap/images/mgetty.gif
 lib/webmin/pap/images/options.gif
 lib/webmin/pap/images/secrets.gif
-lib/webmin/pap/images/smallicon.gif
 lib/webmin/pap/images/up.gif
 lib/webmin/pap/index.cgi
 lib/webmin/pap/install_check.pl
@@ -16623,12 +16447,17 @@ lib/webmin/pap/log_parser.pl
 lib/webmin/pap/mgetty_apply.cgi
 lib/webmin/pap/module.info
 lib/webmin/pap/module.info.ca
+lib/webmin/pap/module.info.ca.UTF-8
 lib/webmin/pap/module.info.cz
 lib/webmin/pap/module.info.cz.UTF-8
 lib/webmin/pap/module.info.de
+lib/webmin/pap/module.info.de.UTF-8
 lib/webmin/pap/module.info.es
+lib/webmin/pap/module.info.es.UTF-8
 lib/webmin/pap/module.info.ms_MY
+lib/webmin/pap/module.info.ms_MY.UTF-8
 lib/webmin/pap/module.info.nl
+lib/webmin/pap/module.info.nl.UTF-8
 lib/webmin/pap/module.info.no
 lib/webmin/pap/module.info.no.UTF-8
 lib/webmin/pap/module.info.ru.UTF-8
@@ -16698,7 +16527,6 @@ lib/webmin/passwd/config.info.zh_TW.UTF-8
 lib/webmin/passwd/defaultacl
 lib/webmin/passwd/edit_passwd.cgi
 lib/webmin/passwd/images/icon.gif
-lib/webmin/passwd/images/smallicon.gif
 lib/webmin/passwd/index.cgi
 lib/webmin/passwd/lang/af
 lib/webmin/passwd/lang/af.UTF-8
@@ -16756,29 +16584,40 @@ lib/webmin/passwd/lang/zh_TW.UTF-8
 lib/webmin/passwd/log_parser.pl
 lib/webmin/passwd/module.info
 lib/webmin/passwd/module.info.af
+lib/webmin/passwd/module.info.af.UTF-8
 lib/webmin/passwd/module.info.ar
 lib/webmin/passwd/module.info.ca
+lib/webmin/passwd/module.info.ca.UTF-8
 lib/webmin/passwd/module.info.cz
 lib/webmin/passwd/module.info.cz.UTF-8
 lib/webmin/passwd/module.info.de
+lib/webmin/passwd/module.info.de.UTF-8
 lib/webmin/passwd/module.info.es
+lib/webmin/passwd/module.info.es.UTF-8
 lib/webmin/passwd/module.info.fi
+lib/webmin/passwd/module.info.fi.UTF-8
 lib/webmin/passwd/module.info.fr
+lib/webmin/passwd/module.info.fr.UTF-8
 lib/webmin/passwd/module.info.hu
 lib/webmin/passwd/module.info.hu.UTF-8
 lib/webmin/passwd/module.info.it
+lib/webmin/passwd/module.info.it.UTF-8
 lib/webmin/passwd/module.info.ja_JP.UTF-8
 lib/webmin/passwd/module.info.ja_JP.euc
 lib/webmin/passwd/module.info.ko_KR.UTF-8
 lib/webmin/passwd/module.info.ko_KR.euc
 lib/webmin/passwd/module.info.ms
+lib/webmin/passwd/module.info.ms.UTF-8
 lib/webmin/passwd/module.info.ms_MY
+lib/webmin/passwd/module.info.ms_MY.UTF-8
 lib/webmin/passwd/module.info.nl
+lib/webmin/passwd/module.info.nl.UTF-8
 lib/webmin/passwd/module.info.no
 lib/webmin/passwd/module.info.no.UTF-8
 lib/webmin/passwd/module.info.pl
 lib/webmin/passwd/module.info.pl.UTF-8
 lib/webmin/passwd/module.info.pt_BR
+lib/webmin/passwd/module.info.pt_BR.UTF-8
 lib/webmin/passwd/module.info.ru.UTF-8
 lib/webmin/passwd/module.info.ru_RU
 lib/webmin/passwd/module.info.ru_RU.UTF-8
@@ -16787,7 +16626,6 @@ lib/webmin/passwd/module.info.sk
 lib/webmin/passwd/module.info.sk.UTF-8
 lib/webmin/passwd/module.info.tr
 lib/webmin/passwd/module.info.zh_TW.Big5
-lib/webmin/passwd/module.info.zh_TW.UTF-8
 lib/webmin/passwd/passwd-lib.pl
 lib/webmin/passwd/rbac-mapping
 lib/webmin/passwd/save_passwd.cgi
@@ -16854,7 +16692,6 @@ lib/webmin/phpini/images/manual.gif
 lib/webmin/phpini/images/misc.gif
 lib/webmin/phpini/images/safe.gif
 lib/webmin/phpini/images/session.gif
-lib/webmin/phpini/images/smallicon.gif
 lib/webmin/phpini/images/vars.gif
 lib/webmin/phpini/index.cgi
 lib/webmin/phpini/install_check.pl
@@ -16888,16 +16725,21 @@ lib/webmin/phpini/list_ini.cgi
 lib/webmin/phpini/log_parser.pl
 lib/webmin/phpini/module.info
 lib/webmin/phpini/module.info.ca
+lib/webmin/phpini/module.info.ca.UTF-8
 lib/webmin/phpini/module.info.cz
 lib/webmin/phpini/module.info.cz.UTF-8
 lib/webmin/phpini/module.info.de
+lib/webmin/phpini/module.info.de.UTF-8
 lib/webmin/phpini/module.info.hu
 lib/webmin/phpini/module.info.hu.UTF-8
 lib/webmin/phpini/module.info.it
+lib/webmin/phpini/module.info.it.UTF-8
 lib/webmin/phpini/module.info.ko_KR.UTF-8
 lib/webmin/phpini/module.info.ko_KR.euc
 lib/webmin/phpini/module.info.ms_MY
+lib/webmin/phpini/module.info.ms_MY.UTF-8
 lib/webmin/phpini/module.info.nl
+lib/webmin/phpini/module.info.nl.UTF-8
 lib/webmin/phpini/module.info.no
 lib/webmin/phpini/module.info.no.UTF-8
 lib/webmin/phpini/module.info.pl
@@ -18679,7 +18521,6 @@ lib/webmin/postfix/images/rate.gif
 lib/webmin/postfix/images/relocated.gif
 lib/webmin/postfix/images/resource.gif
 lib/webmin/postfix/images/sasl.gif
-lib/webmin/postfix/images/smallicon.gif
 lib/webmin/postfix/images/smtp.gif
 lib/webmin/postfix/images/smtpd.gif
 lib/webmin/postfix/images/transport.gif
@@ -18739,11 +18580,15 @@ lib/webmin/postfix/map_chooser_save.cgi
 lib/webmin/postfix/master.cgi
 lib/webmin/postfix/module.info
 lib/webmin/postfix/module.info.ca
+lib/webmin/postfix/module.info.ca.UTF-8
 lib/webmin/postfix/module.info.cz
 lib/webmin/postfix/module.info.cz.UTF-8
 lib/webmin/postfix/module.info.de
+lib/webmin/postfix/module.info.de.UTF-8
 lib/webmin/postfix/module.info.es
+lib/webmin/postfix/module.info.es.UTF-8
 lib/webmin/postfix/module.info.fr
+lib/webmin/postfix/module.info.fr.UTF-8
 lib/webmin/postfix/module.info.hu
 lib/webmin/postfix/module.info.hu.UTF-8
 lib/webmin/postfix/module.info.ja_JP.UTF-8
@@ -18751,7 +18596,9 @@ lib/webmin/postfix/module.info.ja_JP.euc
 lib/webmin/postfix/module.info.ko_KR.UTF-8
 lib/webmin/postfix/module.info.ko_KR.euc
 lib/webmin/postfix/module.info.ms_MY
+lib/webmin/postfix/module.info.ms_MY.UTF-8
 lib/webmin/postfix/module.info.nl
+lib/webmin/postfix/module.info.nl.UTF-8
 lib/webmin/postfix/module.info.no
 lib/webmin/postfix/module.info.no.UTF-8
 lib/webmin/postfix/module.info.pl
@@ -18761,11 +18608,10 @@ lib/webmin/postfix/module.info.ru_RU
 lib/webmin/postfix/module.info.ru_RU.UTF-8
 lib/webmin/postfix/module.info.ru_SU
 lib/webmin/postfix/module.info.sv
+lib/webmin/postfix/module.info.sv.UTF-8
 lib/webmin/postfix/module.info.tr
 lib/webmin/postfix/module.info.zh_CN
-lib/webmin/postfix/module.info.zh_CN.UTF-8
 lib/webmin/postfix/module.info.zh_TW.Big5
-lib/webmin/postfix/module.info.zh_TW.UTF-8
 lib/webmin/postfix/postfinger.cgi
 lib/webmin/postfix/postfix-lib.pl
 lib/webmin/postfix/rate.cgi
@@ -19134,7 +18980,6 @@ lib/webmin/postgresql/images/hosts.gif
 lib/webmin/postgresql/images/icon.gif
 lib/webmin/postgresql/images/index.gif
 lib/webmin/postgresql/images/seq.gif
-lib/webmin/postgresql/images/smallicon.gif
 lib/webmin/postgresql/images/table.gif
 lib/webmin/postgresql/images/up.gif
 lib/webmin/postgresql/images/users.gif
@@ -19192,9 +19037,13 @@ lib/webmin/postgresql/log_parser.pl
 lib/webmin/postgresql/login.cgi
 lib/webmin/postgresql/module.info
 lib/webmin/postgresql/module.info.ca
+lib/webmin/postgresql/module.info.ca.UTF-8
 lib/webmin/postgresql/module.info.de
+lib/webmin/postgresql/module.info.de.UTF-8
 lib/webmin/postgresql/module.info.es
+lib/webmin/postgresql/module.info.es.UTF-8
 lib/webmin/postgresql/module.info.fr
+lib/webmin/postgresql/module.info.fr.UTF-8
 lib/webmin/postgresql/module.info.hu
 lib/webmin/postgresql/module.info.hu.UTF-8
 lib/webmin/postgresql/module.info.ja_JP.UTF-8
@@ -19202,7 +19051,9 @@ lib/webmin/postgresql/module.info.ja_JP.euc
 lib/webmin/postgresql/module.info.ko_KR.UTF-8
 lib/webmin/postgresql/module.info.ko_KR.euc
 lib/webmin/postgresql/module.info.ms_MY
+lib/webmin/postgresql/module.info.ms_MY.UTF-8
 lib/webmin/postgresql/module.info.nl
+lib/webmin/postgresql/module.info.nl.UTF-8
 lib/webmin/postgresql/module.info.no
 lib/webmin/postgresql/module.info.no.UTF-8
 lib/webmin/postgresql/module.info.pl
@@ -19212,10 +19063,9 @@ lib/webmin/postgresql/module.info.ru_RU
 lib/webmin/postgresql/module.info.ru_RU.UTF-8
 lib/webmin/postgresql/module.info.ru_SU
 lib/webmin/postgresql/module.info.sv
+lib/webmin/postgresql/module.info.sv.UTF-8
 lib/webmin/postgresql/module.info.zh_CN
-lib/webmin/postgresql/module.info.zh_CN.UTF-8
 lib/webmin/postgresql/module.info.zh_TW.Big5
-lib/webmin/postgresql/module.info.zh_TW.UTF-8
 lib/webmin/postgresql/newdb.cgi
 lib/webmin/postgresql/newdb_form.cgi
 lib/webmin/postgresql/old/download.cgi
@@ -19264,7 +19114,6 @@ lib/webmin/ppp-client/edit.cgi
 lib/webmin/ppp-client/images/icon.gif
 lib/webmin/ppp-client/images/modem-externe.jpg
 lib/webmin/ppp-client/images/modem.gif
-lib/webmin/ppp-client/images/smallicon.gif
 lib/webmin/ppp-client/index.cgi
 lib/webmin/ppp-client/init.cgi
 lib/webmin/ppp-client/install_check.pl
@@ -19282,11 +19131,15 @@ lib/webmin/ppp-client/lang/no.UTF-8
 lib/webmin/ppp-client/log_parser.pl
 lib/webmin/ppp-client/module.info
 lib/webmin/ppp-client/module.info.ca
+lib/webmin/ppp-client/module.info.ca.UTF-8
 lib/webmin/ppp-client/module.info.cz
 lib/webmin/ppp-client/module.info.cz.UTF-8
 lib/webmin/ppp-client/module.info.de
+lib/webmin/ppp-client/module.info.de.UTF-8
 lib/webmin/ppp-client/module.info.ms_MY
+lib/webmin/ppp-client/module.info.ms_MY.UTF-8
 lib/webmin/ppp-client/module.info.nl
+lib/webmin/ppp-client/module.info.nl.UTF-8
 lib/webmin/ppp-client/module.info.no
 lib/webmin/ppp-client/module.info.no.UTF-8
 lib/webmin/ppp-client/ppp-client-lib.pl
@@ -19319,7 +19172,6 @@ lib/webmin/pptp-client/help/intro.html
 lib/webmin/pptp-client/help/intro.nl.UTF-8.html
 lib/webmin/pptp-client/help/intro.nl.html
 lib/webmin/pptp-client/images/icon.gif
-lib/webmin/pptp-client/images/smallicon.gif
 lib/webmin/pptp-client/images/tunnel.gif
 lib/webmin/pptp-client/index.cgi
 lib/webmin/pptp-client/install_check.pl
@@ -19340,14 +19192,19 @@ lib/webmin/pptp-client/lang/pt_BR.UTF-8
 lib/webmin/pptp-client/log_parser.pl
 lib/webmin/pptp-client/module.info
 lib/webmin/pptp-client/module.info.ca
+lib/webmin/pptp-client/module.info.ca.UTF-8
 lib/webmin/pptp-client/module.info.cz
 lib/webmin/pptp-client/module.info.cz.UTF-8
 lib/webmin/pptp-client/module.info.de
+lib/webmin/pptp-client/module.info.de.UTF-8
 lib/webmin/pptp-client/module.info.ms_MY
+lib/webmin/pptp-client/module.info.ms_MY.UTF-8
 lib/webmin/pptp-client/module.info.nl
+lib/webmin/pptp-client/module.info.nl.UTF-8
 lib/webmin/pptp-client/module.info.no
 lib/webmin/pptp-client/module.info.no.UTF-8
 lib/webmin/pptp-client/module.info.pt_BR
+lib/webmin/pptp-client/module.info.pt_BR.UTF-8
 lib/webmin/pptp-client/pptp-client-lib.pl
 lib/webmin/pptp-client/save.cgi
 lib/webmin/pptp-client/save_opts.cgi
@@ -19417,7 +19274,6 @@ lib/webmin/pptp-server/images/icon.gif
 lib/webmin/pptp-server/images/options.gif
 lib/webmin/pptp-server/images/pipe.gif
 lib/webmin/pptp-server/images/secrets.gif
-lib/webmin/pptp-server/images/smallicon.gif
 lib/webmin/pptp-server/index.cgi
 lib/webmin/pptp-server/install_check.pl
 lib/webmin/pptp-server/lang/ca
@@ -19441,14 +19297,19 @@ lib/webmin/pptp-server/list_secrets.cgi
 lib/webmin/pptp-server/log_parser.pl
 lib/webmin/pptp-server/module.info
 lib/webmin/pptp-server/module.info.ca
+lib/webmin/pptp-server/module.info.ca.UTF-8
 lib/webmin/pptp-server/module.info.cz
 lib/webmin/pptp-server/module.info.cz.UTF-8
 lib/webmin/pptp-server/module.info.es
+lib/webmin/pptp-server/module.info.es.UTF-8
 lib/webmin/pptp-server/module.info.ms_MY
+lib/webmin/pptp-server/module.info.ms_MY.UTF-8
 lib/webmin/pptp-server/module.info.nl
+lib/webmin/pptp-server/module.info.nl.UTF-8
 lib/webmin/pptp-server/module.info.no
 lib/webmin/pptp-server/module.info.no.UTF-8
 lib/webmin/pptp-server/module.info.pt_BR
+lib/webmin/pptp-server/module.info.pt_BR.UTF-8
 lib/webmin/pptp-server/pptp-server-lib.pl
 lib/webmin/pptp-server/save_conf.cgi
 lib/webmin/pptp-server/save_options.cgi
@@ -19983,7 +19844,6 @@ lib/webmin/proc/help/zone.ru_RU.html
 lib/webmin/proc/help/zone.ru_SU.html
 lib/webmin/proc/hpux-lib.pl
 lib/webmin/proc/images/icon.gif
-lib/webmin/proc/images/smallicon.gif
 lib/webmin/proc/index.cgi
 lib/webmin/proc/index_cpu.cgi
 lib/webmin/proc/index_run.cgi
@@ -20046,35 +19906,42 @@ lib/webmin/proc/macos-lib.pl
 lib/webmin/proc/medium.risk
 lib/webmin/proc/module.info
 lib/webmin/proc/module.info.ca
+lib/webmin/proc/module.info.ca.UTF-8
 lib/webmin/proc/module.info.cz
 lib/webmin/proc/module.info.cz.UTF-8
 lib/webmin/proc/module.info.de
+lib/webmin/proc/module.info.de.UTF-8
 lib/webmin/proc/module.info.es
+lib/webmin/proc/module.info.es.UTF-8
 lib/webmin/proc/module.info.fr
+lib/webmin/proc/module.info.fr.UTF-8
 lib/webmin/proc/module.info.hu
 lib/webmin/proc/module.info.hu.UTF-8
 lib/webmin/proc/module.info.it
+lib/webmin/proc/module.info.it.UTF-8
 lib/webmin/proc/module.info.ja_JP.UTF-8
 lib/webmin/proc/module.info.ja_JP.euc
 lib/webmin/proc/module.info.ko_KR.UTF-8
 lib/webmin/proc/module.info.ko_KR.euc
 lib/webmin/proc/module.info.ms_MY
+lib/webmin/proc/module.info.ms_MY.UTF-8
 lib/webmin/proc/module.info.nl
+lib/webmin/proc/module.info.nl.UTF-8
 lib/webmin/proc/module.info.no
 lib/webmin/proc/module.info.no.UTF-8
 lib/webmin/proc/module.info.pl
 lib/webmin/proc/module.info.pl.UTF-8
 lib/webmin/proc/module.info.pt
+lib/webmin/proc/module.info.pt.UTF-8
 lib/webmin/proc/module.info.ru.UTF-8
 lib/webmin/proc/module.info.ru_RU
 lib/webmin/proc/module.info.ru_RU.UTF-8
 lib/webmin/proc/module.info.ru_SU
 lib/webmin/proc/module.info.sv
+lib/webmin/proc/module.info.sv.UTF-8
 lib/webmin/proc/module.info.tr
 lib/webmin/proc/module.info.zh_CN
-lib/webmin/proc/module.info.zh_CN.UTF-8
 lib/webmin/proc/module.info.zh_TW.Big5
-lib/webmin/proc/module.info.zh_TW.UTF-8
 lib/webmin/proc/open_files.cgi
 lib/webmin/proc/openbsd-lib.pl
 lib/webmin/proc/osf-lib.pl
@@ -20127,7 +19994,6 @@ lib/webmin/procmail/images/before.gif
 lib/webmin/procmail/images/down.gif
 lib/webmin/procmail/images/gap.gif
 lib/webmin/procmail/images/icon.gif
-lib/webmin/procmail/images/smallicon.gif
 lib/webmin/procmail/images/up.gif
 lib/webmin/procmail/index.cgi
 lib/webmin/procmail/install_check.pl
@@ -20166,18 +20032,25 @@ lib/webmin/procmail/manual_form.cgi
 lib/webmin/procmail/manual_save.cgi
 lib/webmin/procmail/module.info
 lib/webmin/procmail/module.info.ca
+lib/webmin/procmail/module.info.ca.UTF-8
 lib/webmin/procmail/module.info.cz
 lib/webmin/procmail/module.info.cz.UTF-8
 lib/webmin/procmail/module.info.de
+lib/webmin/procmail/module.info.de.UTF-8
 lib/webmin/procmail/module.info.es
+lib/webmin/procmail/module.info.es.UTF-8
 lib/webmin/procmail/module.info.fr
+lib/webmin/procmail/module.info.fr.UTF-8
 lib/webmin/procmail/module.info.hu
 lib/webmin/procmail/module.info.hu.UTF-8
 lib/webmin/procmail/module.info.it
+lib/webmin/procmail/module.info.it.UTF-8
 lib/webmin/procmail/module.info.ko_KR.UTF-8
 lib/webmin/procmail/module.info.ko_KR.euc
 lib/webmin/procmail/module.info.ms_MY
+lib/webmin/procmail/module.info.ms_MY.UTF-8
 lib/webmin/procmail/module.info.nl
+lib/webmin/procmail/module.info.nl.UTF-8
 lib/webmin/procmail/module.info.no
 lib/webmin/procmail/module.info.no.UTF-8
 lib/webmin/procmail/module.info.pl
@@ -20287,7 +20160,6 @@ lib/webmin/proftpd/images/icon.gif
 lib/webmin/proftpd/images/limit.gif
 lib/webmin/proftpd/images/log.gif
 lib/webmin/proftpd/images/misc.gif
-lib/webmin/proftpd/images/smallicon.gif
 lib/webmin/proftpd/images/type_icon_0.gif
 lib/webmin/proftpd/images/type_icon_1.gif
 lib/webmin/proftpd/images/type_icon_2.gif
@@ -20352,11 +20224,15 @@ lib/webmin/proftpd/mod_site.pl
 lib/webmin/proftpd/mod_unixpw.pl
 lib/webmin/proftpd/module.info
 lib/webmin/proftpd/module.info.ca
+lib/webmin/proftpd/module.info.ca.UTF-8
 lib/webmin/proftpd/module.info.cz
 lib/webmin/proftpd/module.info.cz.UTF-8
 lib/webmin/proftpd/module.info.de
+lib/webmin/proftpd/module.info.de.UTF-8
 lib/webmin/proftpd/module.info.es
+lib/webmin/proftpd/module.info.es.UTF-8
 lib/webmin/proftpd/module.info.fr
+lib/webmin/proftpd/module.info.fr.UTF-8
 lib/webmin/proftpd/module.info.hu
 lib/webmin/proftpd/module.info.hu.UTF-8
 lib/webmin/proftpd/module.info.ja_JP.UTF-8
@@ -20364,18 +20240,20 @@ lib/webmin/proftpd/module.info.ja_JP.euc
 lib/webmin/proftpd/module.info.ko_KR.UTF-8
 lib/webmin/proftpd/module.info.ko_KR.euc
 lib/webmin/proftpd/module.info.ms_MY
+lib/webmin/proftpd/module.info.ms_MY.UTF-8
 lib/webmin/proftpd/module.info.nl
+lib/webmin/proftpd/module.info.nl.UTF-8
 lib/webmin/proftpd/module.info.no
 lib/webmin/proftpd/module.info.no.UTF-8
 lib/webmin/proftpd/module.info.pl
 lib/webmin/proftpd/module.info.pl.UTF-8
 lib/webmin/proftpd/module.info.pt_BR
+lib/webmin/proftpd/module.info.pt_BR.UTF-8
 lib/webmin/proftpd/module.info.ru.UTF-8
 lib/webmin/proftpd/module.info.ru_RU
 lib/webmin/proftpd/module.info.ru_RU.UTF-8
 lib/webmin/proftpd/module.info.ru_SU
 lib/webmin/proftpd/module.info.zh_TW.Big5
-lib/webmin/proftpd/module.info.zh_TW.UTF-8
 lib/webmin/proftpd/proftpd-lib.pl
 lib/webmin/proftpd/save_anon.cgi
 lib/webmin/proftpd/save_aserv.cgi
@@ -20447,7 +20325,6 @@ lib/webmin/qmailadmin/images/percents.gif
 lib/webmin/qmailadmin/images/queue.gif
 lib/webmin/qmailadmin/images/rcpts.gif
 lib/webmin/qmailadmin/images/routes.gif
-lib/webmin/qmailadmin/images/smallicon.gif
 lib/webmin/qmailadmin/images/virts.gif
 lib/webmin/qmailadmin/index.cgi
 lib/webmin/qmailadmin/install_check.pl
@@ -20490,14 +20367,19 @@ lib/webmin/qmailadmin/list_virts.cgi
 lib/webmin/qmailadmin/log_parser.pl
 lib/webmin/qmailadmin/module.info
 lib/webmin/qmailadmin/module.info.ca
+lib/webmin/qmailadmin/module.info.ca.UTF-8
 lib/webmin/qmailadmin/module.info.cz
 lib/webmin/qmailadmin/module.info.cz.UTF-8
 lib/webmin/qmailadmin/module.info.de
+lib/webmin/qmailadmin/module.info.de.UTF-8
 lib/webmin/qmailadmin/module.info.es
+lib/webmin/qmailadmin/module.info.es.UTF-8
 lib/webmin/qmailadmin/module.info.hu
 lib/webmin/qmailadmin/module.info.hu.UTF-8
 lib/webmin/qmailadmin/module.info.ms_MY
+lib/webmin/qmailadmin/module.info.ms_MY.UTF-8
 lib/webmin/qmailadmin/module.info.nl
+lib/webmin/qmailadmin/module.info.nl.UTF-8
 lib/webmin/qmailadmin/module.info.no
 lib/webmin/qmailadmin/module.info.no.UTF-8
 lib/webmin/qmailadmin/module.info.ru.UTF-8
@@ -20771,7 +20653,6 @@ lib/webmin/quota/help/user_grace.zh_TW.Big5.html
 lib/webmin/quota/help/user_grace.zh_TW.UTF-8.html
 lib/webmin/quota/hpux-lib.pl
 lib/webmin/quota/images/icon.gif
-lib/webmin/quota/images/smallicon.gif
 lib/webmin/quota/index.cgi
 lib/webmin/quota/install_check.pl
 lib/webmin/quota/irix-lib.pl
@@ -20831,36 +20712,44 @@ lib/webmin/quota/macos-lib.pl
 lib/webmin/quota/module.info
 lib/webmin/quota/module.info.ar
 lib/webmin/quota/module.info.ca
+lib/webmin/quota/module.info.ca.UTF-8
 lib/webmin/quota/module.info.cz
 lib/webmin/quota/module.info.cz.UTF-8
 lib/webmin/quota/module.info.da
+lib/webmin/quota/module.info.da.UTF-8
 lib/webmin/quota/module.info.de
+lib/webmin/quota/module.info.de.UTF-8
 lib/webmin/quota/module.info.es
+lib/webmin/quota/module.info.es.UTF-8
 lib/webmin/quota/module.info.fr
+lib/webmin/quota/module.info.fr.UTF-8
 lib/webmin/quota/module.info.hu
 lib/webmin/quota/module.info.hu.UTF-8
 lib/webmin/quota/module.info.it
+lib/webmin/quota/module.info.it.UTF-8
 lib/webmin/quota/module.info.ja_JP.UTF-8
 lib/webmin/quota/module.info.ja_JP.euc
 lib/webmin/quota/module.info.ko_KR.UTF-8
 lib/webmin/quota/module.info.ko_KR.euc
 lib/webmin/quota/module.info.ms_MY
+lib/webmin/quota/module.info.ms_MY.UTF-8
 lib/webmin/quota/module.info.nl
+lib/webmin/quota/module.info.nl.UTF-8
 lib/webmin/quota/module.info.no
 lib/webmin/quota/module.info.no.UTF-8
 lib/webmin/quota/module.info.pl
 lib/webmin/quota/module.info.pl.UTF-8
 lib/webmin/quota/module.info.pt
+lib/webmin/quota/module.info.pt.UTF-8
 lib/webmin/quota/module.info.ru.UTF-8
 lib/webmin/quota/module.info.ru_RU
 lib/webmin/quota/module.info.ru_RU.UTF-8
 lib/webmin/quota/module.info.ru_SU
 lib/webmin/quota/module.info.sv
+lib/webmin/quota/module.info.sv.UTF-8
 lib/webmin/quota/module.info.tr
 lib/webmin/quota/module.info.zh_CN
-lib/webmin/quota/module.info.zh_CN.UTF-8
 lib/webmin/quota/module.info.zh_TW.Big5
-lib/webmin/quota/module.info.zh_TW.UTF-8
 lib/webmin/quota/netbsd-lib.pl
 lib/webmin/quota/notes
 lib/webmin/quota/openbsd-lib.pl
@@ -20935,7 +20824,6 @@ lib/webmin/raid/images/disk.gif
 lib/webmin/raid/images/icon.gif
 lib/webmin/raid/images/linear.gif
 lib/webmin/raid/images/linear.ia.gif
-lib/webmin/raid/images/smallicon.gif
 lib/webmin/raid/index.cgi
 lib/webmin/raid/install_check.pl
 lib/webmin/raid/lang/bg
@@ -20980,10 +20868,13 @@ lib/webmin/raid/log_parser.pl
 lib/webmin/raid/mkfs.cgi
 lib/webmin/raid/module.info
 lib/webmin/raid/module.info.ca
+lib/webmin/raid/module.info.ca.UTF-8
 lib/webmin/raid/module.info.cz
 lib/webmin/raid/module.info.cz.UTF-8
 lib/webmin/raid/module.info.de
+lib/webmin/raid/module.info.de.UTF-8
 lib/webmin/raid/module.info.es
+lib/webmin/raid/module.info.es.UTF-8
 lib/webmin/raid/module.info.hu
 lib/webmin/raid/module.info.hu.UTF-8
 lib/webmin/raid/module.info.ja_JP.UTF-8
@@ -20991,22 +20882,24 @@ lib/webmin/raid/module.info.ja_JP.euc
 lib/webmin/raid/module.info.ko_KR.UTF-8
 lib/webmin/raid/module.info.ko_KR.euc
 lib/webmin/raid/module.info.ms_MY
+lib/webmin/raid/module.info.ms_MY.UTF-8
 lib/webmin/raid/module.info.nl
+lib/webmin/raid/module.info.nl.UTF-8
 lib/webmin/raid/module.info.no
 lib/webmin/raid/module.info.no.UTF-8
 lib/webmin/raid/module.info.pl
 lib/webmin/raid/module.info.pl.UTF-8
 lib/webmin/raid/module.info.pt
+lib/webmin/raid/module.info.pt.UTF-8
 lib/webmin/raid/module.info.ru.UTF-8
 lib/webmin/raid/module.info.ru_RU
 lib/webmin/raid/module.info.ru_RU.UTF-8
 lib/webmin/raid/module.info.ru_SU
 lib/webmin/raid/module.info.sv
+lib/webmin/raid/module.info.sv.UTF-8
 lib/webmin/raid/module.info.tr
 lib/webmin/raid/module.info.zh_CN
-lib/webmin/raid/module.info.zh_CN.UTF-8
 lib/webmin/raid/module.info.zh_TW.Big5
-lib/webmin/raid/module.info.zh_TW.UTF-8
 lib/webmin/raid/raid-lib.pl
 lib/webmin/raid/raid_form.cgi
 lib/webmin/raid/save_mdadm.cgi
@@ -21073,7 +20966,6 @@ lib/webmin/rbac/images/policy.gif
 lib/webmin/rbac/images/prctl.gif
 lib/webmin/rbac/images/profs.gif
 lib/webmin/rbac/images/projects.gif
-lib/webmin/rbac/images/smallicon.gif
 lib/webmin/rbac/images/users.gif
 lib/webmin/rbac/index.cgi
 lib/webmin/rbac/install_check.pl
@@ -21095,7 +20987,9 @@ lib/webmin/rbac/list_users.cgi
 lib/webmin/rbac/log_parser.pl
 lib/webmin/rbac/module.info
 lib/webmin/rbac/module.info.ca
+lib/webmin/rbac/module.info.ca.UTF-8
 lib/webmin/rbac/module.info.nl
+lib/webmin/rbac/module.info.nl.UTF-8
 lib/webmin/rbac/rbac-lib.pl
 lib/webmin/rbac/rbac-mapping
 lib/webmin/rbac/rbac_help.cgi
@@ -21262,7 +21156,6 @@ lib/webmin/samba/images/icon_8.gif
 lib/webmin/samba/images/icon_9.gif
 lib/webmin/samba/images/listgroups.gif
 lib/webmin/samba/images/manual.gif
-lib/webmin/samba/images/smallicon.gif
 lib/webmin/samba/images/winbind.gif
 lib/webmin/samba/index.cgi
 lib/webmin/samba/install_check.pl
@@ -21320,33 +21213,40 @@ lib/webmin/samba/logout.cgi
 lib/webmin/samba/make_epass.cgi
 lib/webmin/samba/module.info
 lib/webmin/samba/module.info.ca
+lib/webmin/samba/module.info.ca.UTF-8
 lib/webmin/samba/module.info.cz
 lib/webmin/samba/module.info.cz.UTF-8
 lib/webmin/samba/module.info.de
+lib/webmin/samba/module.info.de.UTF-8
 lib/webmin/samba/module.info.es
+lib/webmin/samba/module.info.es.UTF-8
 lib/webmin/samba/module.info.fr
+lib/webmin/samba/module.info.fr.UTF-8
 lib/webmin/samba/module.info.ja_JP.UTF-8
 lib/webmin/samba/module.info.ja_JP.euc
 lib/webmin/samba/module.info.ko_KR.UTF-8
 lib/webmin/samba/module.info.ko_KR.euc
 lib/webmin/samba/module.info.ms_MY
+lib/webmin/samba/module.info.ms_MY.UTF-8
 lib/webmin/samba/module.info.nl
+lib/webmin/samba/module.info.nl.UTF-8
 lib/webmin/samba/module.info.no
 lib/webmin/samba/module.info.no.UTF-8
 lib/webmin/samba/module.info.pl
 lib/webmin/samba/module.info.pl.UTF-8
 lib/webmin/samba/module.info.pt
+lib/webmin/samba/module.info.pt.UTF-8
 lib/webmin/samba/module.info.pt_BR
+lib/webmin/samba/module.info.pt_BR.UTF-8
 lib/webmin/samba/module.info.ru.UTF-8
 lib/webmin/samba/module.info.ru_RU
 lib/webmin/samba/module.info.ru_RU.UTF-8
 lib/webmin/samba/module.info.ru_SU
 lib/webmin/samba/module.info.sv
+lib/webmin/samba/module.info.sv.UTF-8
 lib/webmin/samba/module.info.tr
 lib/webmin/samba/module.info.zh_CN
-lib/webmin/samba/module.info.zh_CN.UTF-8
 lib/webmin/samba/module.info.zh_TW.Big5
-lib/webmin/samba/module.info.zh_TW.UTF-8
 lib/webmin/samba/opts.pl.dev
 lib/webmin/samba/rbac-mapping
 lib/webmin/samba/readonly-share.pl
@@ -21418,7 +21318,6 @@ lib/webmin/sarg/images/log.gif
 lib/webmin/sarg/images/package_graphics.png
 lib/webmin/sarg/images/report.gif
 lib/webmin/sarg/images/sched.gif
-lib/webmin/sarg/images/smallicon.gif
 lib/webmin/sarg/images/style.gif
 lib/webmin/sarg/index.cgi
 lib/webmin/sarg/install_check.pl
@@ -21443,12 +21342,17 @@ lib/webmin/sarg/languages
 lib/webmin/sarg/log_parser.pl
 lib/webmin/sarg/module.info
 lib/webmin/sarg/module.info.ca
+lib/webmin/sarg/module.info.ca.UTF-8
 lib/webmin/sarg/module.info.cz
 lib/webmin/sarg/module.info.cz.UTF-8
 lib/webmin/sarg/module.info.de
+lib/webmin/sarg/module.info.de.UTF-8
 lib/webmin/sarg/module.info.es
+lib/webmin/sarg/module.info.es.UTF-8
 lib/webmin/sarg/module.info.ms_MY
+lib/webmin/sarg/module.info.ms_MY.UTF-8
 lib/webmin/sarg/module.info.nl
+lib/webmin/sarg/module.info.nl.UTF-8
 lib/webmin/sarg/module.info.no
 lib/webmin/sarg/module.info.no.UTF-8
 lib/webmin/sarg/sarg-lib.pl
@@ -22107,7 +22011,6 @@ lib/webmin/sendmail/images/p2.gif
 lib/webmin/sendmail/images/ports.gif
 lib/webmin/sendmail/images/read.gif
 lib/webmin/sendmail/images/relay.gif
-lib/webmin/sendmail/images/smallicon.gif
 lib/webmin/sendmail/images/special.gif
 lib/webmin/sendmail/images/trusts.gif
 lib/webmin/sendmail/images/up.gif
@@ -22178,11 +22081,15 @@ lib/webmin/sendmail/mailq_search.cgi
 lib/webmin/sendmail/manual_features.cgi
 lib/webmin/sendmail/module.info
 lib/webmin/sendmail/module.info.ca
+lib/webmin/sendmail/module.info.ca.UTF-8
 lib/webmin/sendmail/module.info.cz
 lib/webmin/sendmail/module.info.cz.UTF-8
 lib/webmin/sendmail/module.info.de
+lib/webmin/sendmail/module.info.de.UTF-8
 lib/webmin/sendmail/module.info.es
+lib/webmin/sendmail/module.info.es.UTF-8
 lib/webmin/sendmail/module.info.fr
+lib/webmin/sendmail/module.info.fr.UTF-8
 lib/webmin/sendmail/module.info.hu
 lib/webmin/sendmail/module.info.hu.UTF-8
 lib/webmin/sendmail/module.info.ja_JP.UTF-8
@@ -22190,23 +22097,26 @@ lib/webmin/sendmail/module.info.ja_JP.euc
 lib/webmin/sendmail/module.info.ko_KR.UTF-8
 lib/webmin/sendmail/module.info.ko_KR.euc
 lib/webmin/sendmail/module.info.ms_MY
+lib/webmin/sendmail/module.info.ms_MY.UTF-8
 lib/webmin/sendmail/module.info.nl
+lib/webmin/sendmail/module.info.nl.UTF-8
 lib/webmin/sendmail/module.info.no
 lib/webmin/sendmail/module.info.no.UTF-8
 lib/webmin/sendmail/module.info.pl
 lib/webmin/sendmail/module.info.pl.UTF-8
 lib/webmin/sendmail/module.info.pt
+lib/webmin/sendmail/module.info.pt.UTF-8
 lib/webmin/sendmail/module.info.pt_BR
+lib/webmin/sendmail/module.info.pt_BR.UTF-8
 lib/webmin/sendmail/module.info.ru.UTF-8
 lib/webmin/sendmail/module.info.ru_RU
 lib/webmin/sendmail/module.info.ru_RU.UTF-8
 lib/webmin/sendmail/module.info.ru_SU
 lib/webmin/sendmail/module.info.sv
+lib/webmin/sendmail/module.info.sv.UTF-8
 lib/webmin/sendmail/module.info.tr
 lib/webmin/sendmail/module.info.zh_CN
-lib/webmin/sendmail/module.info.zh_CN.UTF-8
 lib/webmin/sendmail/module.info.zh_TW.Big5
-lib/webmin/sendmail/module.info.zh_TW.UTF-8
 lib/webmin/sendmail/move.cgi
 lib/webmin/sendmail/negativeacl
 lib/webmin/sendmail/qdetach.cgi
@@ -22308,11 +22218,11 @@ lib/webmin/servers/images/mac.gif
 lib/webmin/servers/images/mandrake.gif
 lib/webmin/servers/images/msc.gif
 lib/webmin/servers/images/openbsd.gif
+lib/webmin/servers/images/pi.gif
 lib/webmin/servers/images/redflag.gif
 lib/webmin/servers/images/redhat.gif
 lib/webmin/servers/images/sco.gif
 lib/webmin/servers/images/slackware.gif
-lib/webmin/servers/images/smallicon.gif
 lib/webmin/servers/images/solaris.gif
 lib/webmin/servers/images/suse.gif
 lib/webmin/servers/images/turbo.gif
@@ -22377,26 +22287,37 @@ lib/webmin/servers/logout.cgi
 lib/webmin/servers/module.info
 lib/webmin/servers/module.info.ar
 lib/webmin/servers/module.info.ca
+lib/webmin/servers/module.info.ca.UTF-8
 lib/webmin/servers/module.info.cz
 lib/webmin/servers/module.info.cz.UTF-8
 lib/webmin/servers/module.info.de
+lib/webmin/servers/module.info.de.UTF-8
 lib/webmin/servers/module.info.es
+lib/webmin/servers/module.info.es.UTF-8
 lib/webmin/servers/module.info.fr
+lib/webmin/servers/module.info.fr.UTF-8
 lib/webmin/servers/module.info.hu
 lib/webmin/servers/module.info.hu.UTF-8
 lib/webmin/servers/module.info.it
+lib/webmin/servers/module.info.it.UTF-8
 lib/webmin/servers/module.info.ja_JP.UTF-8
 lib/webmin/servers/module.info.ja_JP.euc
 lib/webmin/servers/module.info.ko_KR.UTF-8
 lib/webmin/servers/module.info.ko_KR.euc
 lib/webmin/servers/module.info.ms
+lib/webmin/servers/module.info.ms.UTF-8
 lib/webmin/servers/module.info.ms_MY
+lib/webmin/servers/module.info.ms_MY.UTF-8
 lib/webmin/servers/module.info.nl
+lib/webmin/servers/module.info.nl.UTF-8
 lib/webmin/servers/module.info.no
 lib/webmin/servers/module.info.no.UTF-8
 lib/webmin/servers/module.info.pl
 lib/webmin/servers/module.info.pl.UTF-8
 lib/webmin/servers/module.info.pt
+lib/webmin/servers/module.info.pt.UTF-8
+lib/webmin/servers/module.info.pt_BR
+lib/webmin/servers/module.info.pt_BR.UTF-8
 lib/webmin/servers/module.info.ru.UTF-8
 lib/webmin/servers/module.info.ru_RU
 lib/webmin/servers/module.info.ru_RU.UTF-8
@@ -22404,11 +22325,10 @@ lib/webmin/servers/module.info.ru_SU
 lib/webmin/servers/module.info.sk
 lib/webmin/servers/module.info.sk.UTF-8
 lib/webmin/servers/module.info.sv
+lib/webmin/servers/module.info.sv.UTF-8
 lib/webmin/servers/module.info.tr
 lib/webmin/servers/module.info.zh_CN
-lib/webmin/servers/module.info.zh_CN.UTF-8
 lib/webmin/servers/module.info.zh_TW.Big5
-lib/webmin/servers/module.info.zh_TW.UTF-8
 lib/webmin/servers/save_auto.cgi
 lib/webmin/servers/save_serv.cgi
 lib/webmin/servers/servers-lib.pl
@@ -22428,7 +22348,6 @@ lib/webmin/sgiexports/config.info.nl
 lib/webmin/sgiexports/config.info.nl.UTF-8
 lib/webmin/sgiexports/edit_export.cgi
 lib/webmin/sgiexports/images/icon.gif
-lib/webmin/sgiexports/images/smallicon.gif
 lib/webmin/sgiexports/index.cgi
 lib/webmin/sgiexports/lang/ca
 lib/webmin/sgiexports/lang/ca.UTF-8
@@ -22441,8 +22360,11 @@ lib/webmin/sgiexports/lang/nl.UTF-8
 lib/webmin/sgiexports/log_parser.pl
 lib/webmin/sgiexports/module.info
 lib/webmin/sgiexports/module.info.ca
+lib/webmin/sgiexports/module.info.ca.UTF-8
 lib/webmin/sgiexports/module.info.de
+lib/webmin/sgiexports/module.info.de.UTF-8
 lib/webmin/sgiexports/module.info.nl
+lib/webmin/sgiexports/module.info.nl.UTF-8
 lib/webmin/sgiexports/save_export.cgi
 lib/webmin/sgiexports/sgiexports-lib.pl
 lib/webmin/shell/CHANGELOG
@@ -22479,7 +22401,6 @@ lib/webmin/shell/config.info.sk.UTF-8
 lib/webmin/shell/defaultacl
 lib/webmin/shell/images/icon.gif
 lib/webmin/shell/images/shell.jpg
-lib/webmin/shell/images/smallicon.gif
 lib/webmin/shell/index.cgi
 lib/webmin/shell/lang/ar
 lib/webmin/shell/lang/bg
@@ -22530,21 +22451,29 @@ lib/webmin/shell/module.info.ar
 lib/webmin/shell/module.info.bg
 lib/webmin/shell/module.info.bg.UTF-8
 lib/webmin/shell/module.info.ca
+lib/webmin/shell/module.info.ca.UTF-8
 lib/webmin/shell/module.info.cz
 lib/webmin/shell/module.info.cz.UTF-8
 lib/webmin/shell/module.info.de
+lib/webmin/shell/module.info.de.UTF-8
 lib/webmin/shell/module.info.es
+lib/webmin/shell/module.info.es.UTF-8
 lib/webmin/shell/module.info.fr
+lib/webmin/shell/module.info.fr.UTF-8
 lib/webmin/shell/module.info.hu
 lib/webmin/shell/module.info.hu.UTF-8
 lib/webmin/shell/module.info.it
+lib/webmin/shell/module.info.it.UTF-8
 lib/webmin/shell/module.info.ja_JP.UTF-8
 lib/webmin/shell/module.info.ja_JP.euc
 lib/webmin/shell/module.info.ko_KR.UTF-8
 lib/webmin/shell/module.info.ko_KR.euc
 lib/webmin/shell/module.info.ms
+lib/webmin/shell/module.info.ms.UTF-8
 lib/webmin/shell/module.info.ms_MY
+lib/webmin/shell/module.info.ms_MY.UTF-8
 lib/webmin/shell/module.info.nl
+lib/webmin/shell/module.info.nl.UTF-8
 lib/webmin/shell/module.info.no
 lib/webmin/shell/module.info.no.UTF-8
 lib/webmin/shell/module.info.pl
@@ -22556,7 +22485,6 @@ lib/webmin/shell/module.info.ru_SU
 lib/webmin/shell/module.info.sk
 lib/webmin/shell/module.info.sk.UTF-8
 lib/webmin/shell/module.info.zh_TW.Big5
-lib/webmin/shell/module.info.zh_TW.UTF-8
 lib/webmin/shell/shell-lib.pl
 lib/webmin/shorewall/CHANGELOG
 lib/webmin/shorewall/acl_security.pl
@@ -22603,7 +22531,6 @@ lib/webmin/shorewall/images/route_rules.gif
 lib/webmin/shorewall/images/routestopped.gif
 lib/webmin/shorewall/images/rules.gif
 lib/webmin/shorewall/images/shorewall.conf.gif
-lib/webmin/shorewall/images/smallicon.gif
 lib/webmin/shorewall/images/tos.gif
 lib/webmin/shorewall/images/tunnels.gif
 lib/webmin/shorewall/images/up.gif
@@ -22635,14 +22562,19 @@ lib/webmin/shorewall/manual_form.cgi
 lib/webmin/shorewall/manual_save.cgi
 lib/webmin/shorewall/module.info
 lib/webmin/shorewall/module.info.ca
+lib/webmin/shorewall/module.info.ca.UTF-8
 lib/webmin/shorewall/module.info.cz
 lib/webmin/shorewall/module.info.cz.UTF-8
 lib/webmin/shorewall/module.info.de
+lib/webmin/shorewall/module.info.de.UTF-8
 lib/webmin/shorewall/module.info.es
+lib/webmin/shorewall/module.info.es.UTF-8
 lib/webmin/shorewall/module.info.hu
 lib/webmin/shorewall/module.info.hu.UTF-8
 lib/webmin/shorewall/module.info.ms_MY
+lib/webmin/shorewall/module.info.ms_MY.UTF-8
 lib/webmin/shorewall/module.info.nl
+lib/webmin/shorewall/module.info.nl.UTF-8
 lib/webmin/shorewall/module.info.no
 lib/webmin/shorewall/module.info.no.UTF-8
 lib/webmin/shorewall/refresh.cgi
@@ -22698,7 +22630,6 @@ lib/webmin/shorewall6/images/proxyndp.gif
 lib/webmin/shorewall6/images/routestopped.gif
 lib/webmin/shorewall6/images/rules.gif
 lib/webmin/shorewall6/images/shorewall6.conf.gif
-lib/webmin/shorewall6/images/smallicon.gif
 lib/webmin/shorewall6/images/tos.gif
 lib/webmin/shorewall6/images/tunnels.gif
 lib/webmin/shorewall6/images/up.gif
@@ -22721,12 +22652,17 @@ lib/webmin/shorewall6/manual_form.cgi
 lib/webmin/shorewall6/manual_save.cgi
 lib/webmin/shorewall6/module.info
 lib/webmin/shorewall6/module.info.ca
+lib/webmin/shorewall6/module.info.ca.UTF-8
 lib/webmin/shorewall6/module.info.cz
 lib/webmin/shorewall6/module.info.cz.UTF-8
 lib/webmin/shorewall6/module.info.de
+lib/webmin/shorewall6/module.info.de.UTF-8
 lib/webmin/shorewall6/module.info.es
+lib/webmin/shorewall6/module.info.es.UTF-8
 lib/webmin/shorewall6/module.info.ms_MY
+lib/webmin/shorewall6/module.info.ms_MY.UTF-8
 lib/webmin/shorewall6/module.info.nl
+lib/webmin/shorewall6/module.info.nl.UTF-8
 lib/webmin/shorewall6/module.info.no
 lib/webmin/shorewall6/module.info.no.UTF-8
 lib/webmin/shorewall6/refresh.cgi
@@ -22763,7 +22699,6 @@ lib/webmin/smart-status/config.info.ru_RU
 lib/webmin/smart-status/config.info.ru_RU.UTF-8
 lib/webmin/smart-status/config.info.ru_SU
 lib/webmin/smart-status/images/icon.gif
-lib/webmin/smart-status/images/smallicon.gif
 lib/webmin/smart-status/index.cgi
 lib/webmin/smart-status/install_check.pl
 lib/webmin/smart-status/lang/ca
@@ -22790,12 +22725,17 @@ lib/webmin/smart-status/lang/sk
 lib/webmin/smart-status/lang/sk.UTF-8
 lib/webmin/smart-status/module.info
 lib/webmin/smart-status/module.info.ca
+lib/webmin/smart-status/module.info.ca.UTF-8
 lib/webmin/smart-status/module.info.cz
 lib/webmin/smart-status/module.info.cz.UTF-8
 lib/webmin/smart-status/module.info.de
+lib/webmin/smart-status/module.info.de.UTF-8
 lib/webmin/smart-status/module.info.es
+lib/webmin/smart-status/module.info.es.UTF-8
 lib/webmin/smart-status/module.info.ms_MY
+lib/webmin/smart-status/module.info.ms_MY.UTF-8
 lib/webmin/smart-status/module.info.nl
+lib/webmin/smart-status/module.info.nl.UTF-8
 lib/webmin/smart-status/module.info.no
 lib/webmin/smart-status/module.info.no.UTF-8
 lib/webmin/smart-status/module.info.ru.UTF-8
@@ -22869,7 +22809,6 @@ lib/webmin/smf/images/nextlevel.gif
 lib/webmin/smf/images/rc1.gif
 lib/webmin/smf/images/rc2.gif
 lib/webmin/smf/images/service.gif
-lib/webmin/smf/images/smallicon.gif
 lib/webmin/smf/images/smf.gif
 lib/webmin/smf/images/svc.gif
 lib/webmin/smf/images/uplevel.gif
@@ -22889,7 +22828,9 @@ lib/webmin/smf/log_viewer.cgi
 lib/webmin/smf/manpage_template.xml
 lib/webmin/smf/module.info
 lib/webmin/smf/module.info.ca
+lib/webmin/smf/module.info.ca.UTF-8
 lib/webmin/smf/module.info.nl
+lib/webmin/smf/module.info.nl.UTF-8
 lib/webmin/smf/path_chooser.cgi
 lib/webmin/smf/property_editor.cgi
 lib/webmin/smf/property_group_editor.cgi
@@ -23300,7 +23241,6 @@ lib/webmin/software/images/close.gif
 lib/webmin/software/images/icon.gif
 lib/webmin/software/images/open.gif
 lib/webmin/software/images/pack.gif
-lib/webmin/software/images/smallicon.gif
 lib/webmin/software/index.cgi
 lib/webmin/software/install_pack.cgi
 lib/webmin/software/ipkg-close.cgi
@@ -23358,11 +23298,15 @@ lib/webmin/software/list_pack.cgi
 lib/webmin/software/log_parser.pl
 lib/webmin/software/module.info
 lib/webmin/software/module.info.ca
+lib/webmin/software/module.info.ca.UTF-8
 lib/webmin/software/module.info.cz
 lib/webmin/software/module.info.cz.UTF-8
 lib/webmin/software/module.info.de
+lib/webmin/software/module.info.de.UTF-8
 lib/webmin/software/module.info.es
+lib/webmin/software/module.info.es.UTF-8
 lib/webmin/software/module.info.fr
+lib/webmin/software/module.info.fr.UTF-8
 lib/webmin/software/module.info.hu
 lib/webmin/software/module.info.hu.UTF-8
 lib/webmin/software/module.info.ja_JP.UTF-8
@@ -23370,23 +23314,26 @@ lib/webmin/software/module.info.ja_JP.euc
 lib/webmin/software/module.info.ko_KR.UTF-8
 lib/webmin/software/module.info.ko_KR.euc
 lib/webmin/software/module.info.ms
+lib/webmin/software/module.info.ms.UTF-8
 lib/webmin/software/module.info.ms_MY
+lib/webmin/software/module.info.ms_MY.UTF-8
 lib/webmin/software/module.info.nl
+lib/webmin/software/module.info.nl.UTF-8
 lib/webmin/software/module.info.no
 lib/webmin/software/module.info.no.UTF-8
 lib/webmin/software/module.info.pl
 lib/webmin/software/module.info.pl.UTF-8
 lib/webmin/software/module.info.pt
+lib/webmin/software/module.info.pt.UTF-8
 lib/webmin/software/module.info.ru.UTF-8
 lib/webmin/software/module.info.ru_RU
 lib/webmin/software/module.info.ru_RU.UTF-8
 lib/webmin/software/module.info.ru_SU
 lib/webmin/software/module.info.sv
+lib/webmin/software/module.info.sv.UTF-8
 lib/webmin/software/module.info.tr
 lib/webmin/software/module.info.zh_CN
-lib/webmin/software/module.info.zh_CN.UTF-8
 lib/webmin/software/module.info.zh_TW.Big5
-lib/webmin/software/module.info.zh_TW.UTF-8
 lib/webmin/software/msi-lib.pl
 lib/webmin/software/open.cgi
 lib/webmin/software/openbsd-lib.pl
@@ -23468,7 +23415,6 @@ lib/webmin/spam/images/score.gif
 lib/webmin/spam/images/settings.gif
 lib/webmin/spam/images/setup.gif
 lib/webmin/spam/images/simple.gif
-lib/webmin/spam/images/smallicon.gif
 lib/webmin/spam/images/spam.gif
 lib/webmin/spam/images/user.gif
 lib/webmin/spam/images/white.gif
@@ -23499,15 +23445,21 @@ lib/webmin/spam/locales
 lib/webmin/spam/log_parser.pl
 lib/webmin/spam/module.info
 lib/webmin/spam/module.info.ca
+lib/webmin/spam/module.info.ca.UTF-8
 lib/webmin/spam/module.info.cz
 lib/webmin/spam/module.info.cz.UTF-8
 lib/webmin/spam/module.info.de
+lib/webmin/spam/module.info.de.UTF-8
 lib/webmin/spam/module.info.es
+lib/webmin/spam/module.info.es.UTF-8
 lib/webmin/spam/module.info.fr
+lib/webmin/spam/module.info.fr.UTF-8
 lib/webmin/spam/module.info.hu
 lib/webmin/spam/module.info.hu.UTF-8
 lib/webmin/spam/module.info.ms_MY
+lib/webmin/spam/module.info.ms_MY.UTF-8
 lib/webmin/spam/module.info.nl
+lib/webmin/spam/module.info.nl.UTF-8
 lib/webmin/spam/module.info.no
 lib/webmin/spam/module.info.no.UTF-8
 lib/webmin/spam/save_amavisd.cgi
@@ -23888,7 +23840,6 @@ lib/webmin/squid/images/misc.gif
 lib/webmin/squid/images/nauth.gif
 lib/webmin/squid/images/ports.gif
 lib/webmin/squid/images/progs.gif
-lib/webmin/squid/images/smallicon.gif
 lib/webmin/squid/images/smem.gif
 lib/webmin/squid/images/sports.gif
 lib/webmin/squid/images/up.gif
@@ -23941,31 +23892,38 @@ lib/webmin/squid/list_refresh.cgi
 lib/webmin/squid/log_parser.pl
 lib/webmin/squid/module.info
 lib/webmin/squid/module.info.ca
+lib/webmin/squid/module.info.ca.UTF-8
 lib/webmin/squid/module.info.cz
 lib/webmin/squid/module.info.cz.UTF-8
 lib/webmin/squid/module.info.de
+lib/webmin/squid/module.info.de.UTF-8
 lib/webmin/squid/module.info.es
+lib/webmin/squid/module.info.es.UTF-8
 lib/webmin/squid/module.info.fr
+lib/webmin/squid/module.info.fr.UTF-8
 lib/webmin/squid/module.info.ja_JP.UTF-8
 lib/webmin/squid/module.info.ja_JP.euc
 lib/webmin/squid/module.info.ko_KR.UTF-8
 lib/webmin/squid/module.info.ko_KR.euc
 lib/webmin/squid/module.info.ms_MY
+lib/webmin/squid/module.info.ms_MY.UTF-8
 lib/webmin/squid/module.info.nl
+lib/webmin/squid/module.info.nl.UTF-8
 lib/webmin/squid/module.info.pl
 lib/webmin/squid/module.info.pl.UTF-8
 lib/webmin/squid/module.info.pt
+lib/webmin/squid/module.info.pt.UTF-8
 lib/webmin/squid/module.info.pt_BR
+lib/webmin/squid/module.info.pt_BR.UTF-8
 lib/webmin/squid/module.info.ru.UTF-8
 lib/webmin/squid/module.info.ru_RU
 lib/webmin/squid/module.info.ru_RU.UTF-8
 lib/webmin/squid/module.info.ru_SU
 lib/webmin/squid/module.info.sv
+lib/webmin/squid/module.info.sv.UTF-8
 lib/webmin/squid/module.info.tr
 lib/webmin/squid/module.info.zh_CN
-lib/webmin/squid/module.info.zh_CN.UTF-8
 lib/webmin/squid/module.info.zh_TW.Big5
-lib/webmin/squid/module.info.zh_TW.UTF-8
 lib/webmin/squid/move_always.cgi
 lib/webmin/squid/move_headeracc.cgi
 lib/webmin/squid/move_http.cgi
@@ -24216,7 +24174,6 @@ lib/webmin/sshd/images/keys.gif
 lib/webmin/sshd/images/manual.gif
 lib/webmin/sshd/images/misc.gif
 lib/webmin/sshd/images/net.gif
-lib/webmin/sshd/images/smallicon.gif
 lib/webmin/sshd/images/sync.gif
 lib/webmin/sshd/images/users.gif
 lib/webmin/sshd/index.cgi
@@ -24270,21 +24227,29 @@ lib/webmin/sshd/module.info
 lib/webmin/sshd/module.info.bg
 lib/webmin/sshd/module.info.bg.UTF-8
 lib/webmin/sshd/module.info.ca
+lib/webmin/sshd/module.info.ca.UTF-8
 lib/webmin/sshd/module.info.cz
 lib/webmin/sshd/module.info.cz.UTF-8
 lib/webmin/sshd/module.info.de
+lib/webmin/sshd/module.info.de.UTF-8
 lib/webmin/sshd/module.info.es
+lib/webmin/sshd/module.info.es.UTF-8
 lib/webmin/sshd/module.info.eu
+lib/webmin/sshd/module.info.eu.UTF-8
 lib/webmin/sshd/module.info.fr
+lib/webmin/sshd/module.info.fr.UTF-8
 lib/webmin/sshd/module.info.hu
 lib/webmin/sshd/module.info.hu.UTF-8
 lib/webmin/sshd/module.info.it
+lib/webmin/sshd/module.info.it.UTF-8
 lib/webmin/sshd/module.info.ja_JP.UTF-8
 lib/webmin/sshd/module.info.ja_JP.euc
 lib/webmin/sshd/module.info.ko_KR.UTF-8
 lib/webmin/sshd/module.info.ko_KR.euc
 lib/webmin/sshd/module.info.ms_MY
+lib/webmin/sshd/module.info.ms_MY.UTF-8
 lib/webmin/sshd/module.info.nl
+lib/webmin/sshd/module.info.nl.UTF-8
 lib/webmin/sshd/module.info.no
 lib/webmin/sshd/module.info.no.UTF-8
 lib/webmin/sshd/module.info.pl
@@ -24388,12 +24353,12 @@ lib/webmin/status/images/icon.gif
 lib/webmin/status/images/not.gif
 lib/webmin/status/images/quest.gif
 lib/webmin/status/images/skip.gif
-lib/webmin/status/images/smallicon.gif
 lib/webmin/status/images/timed.gif
 lib/webmin/status/images/up.gif
 lib/webmin/status/images/webmin.gif
 lib/webmin/status/index.cgi
 lib/webmin/status/inetd-monitor.pl
+lib/webmin/status/init-monitor.pl
 lib/webmin/status/jabber-monitor.pl
 lib/webmin/status/lang/ca
 lib/webmin/status/lang/ca.UTF-8
@@ -24447,20 +24412,27 @@ lib/webmin/status/mailq-monitor.pl
 lib/webmin/status/memory-monitor.pl
 lib/webmin/status/module.info
 lib/webmin/status/module.info.ca
+lib/webmin/status/module.info.ca.UTF-8
 lib/webmin/status/module.info.cz
 lib/webmin/status/module.info.cz.UTF-8
 lib/webmin/status/module.info.de
+lib/webmin/status/module.info.de.UTF-8
 lib/webmin/status/module.info.es
+lib/webmin/status/module.info.es.UTF-8
 lib/webmin/status/module.info.fr
+lib/webmin/status/module.info.fr.UTF-8
 lib/webmin/status/module.info.hu
 lib/webmin/status/module.info.hu.UTF-8
 lib/webmin/status/module.info.it
+lib/webmin/status/module.info.it.UTF-8
 lib/webmin/status/module.info.ja_JP.UTF-8
 lib/webmin/status/module.info.ja_JP.euc
 lib/webmin/status/module.info.ko_KR.UTF-8
 lib/webmin/status/module.info.ko_KR.euc
 lib/webmin/status/module.info.ms_MY
+lib/webmin/status/module.info.ms_MY.UTF-8
 lib/webmin/status/module.info.nl
+lib/webmin/status/module.info.nl.UTF-8
 lib/webmin/status/module.info.no
 lib/webmin/status/module.info.no.UTF-8
 lib/webmin/status/module.info.pl
@@ -24472,11 +24444,10 @@ lib/webmin/status/module.info.ru_SU
 lib/webmin/status/module.info.sk
 lib/webmin/status/module.info.sk.UTF-8
 lib/webmin/status/module.info.sv
+lib/webmin/status/module.info.sv.UTF-8
 lib/webmin/status/module.info.tr
 lib/webmin/status/module.info.zh_CN
-lib/webmin/status/module.info.zh_CN.UTF-8
 lib/webmin/status/module.info.zh_TW.Big5
-lib/webmin/status/module.info.zh_TW.UTF-8
 lib/webmin/status/mon-monitor.pl
 lib/webmin/status/monitor.pl
 lib/webmin/status/mysql-monitor.pl
@@ -24576,7 +24547,6 @@ lib/webmin/stunnel/help/intro.ca.UTF-8.html
 lib/webmin/stunnel/help/intro.ca.html
 lib/webmin/stunnel/help/intro.html
 lib/webmin/stunnel/images/icon.gif
-lib/webmin/stunnel/images/smallicon.gif
 lib/webmin/stunnel/images/tunnel.jpg
 lib/webmin/stunnel/index.cgi
 lib/webmin/stunnel/install_check.pl
@@ -24613,16 +24583,23 @@ lib/webmin/stunnel/lang/zh_CN.UTF-8
 lib/webmin/stunnel/log_parser.pl
 lib/webmin/stunnel/module.info
 lib/webmin/stunnel/module.info.ca
+lib/webmin/stunnel/module.info.ca.UTF-8
 lib/webmin/stunnel/module.info.cz
 lib/webmin/stunnel/module.info.cz.UTF-8
 lib/webmin/stunnel/module.info.de
+lib/webmin/stunnel/module.info.de.UTF-8
 lib/webmin/stunnel/module.info.es
+lib/webmin/stunnel/module.info.es.UTF-8
 lib/webmin/stunnel/module.info.fr
+lib/webmin/stunnel/module.info.fr.UTF-8
 lib/webmin/stunnel/module.info.ja_JP.UTF-8
 lib/webmin/stunnel/module.info.ja_JP.euc
 lib/webmin/stunnel/module.info.ms
+lib/webmin/stunnel/module.info.ms.UTF-8
 lib/webmin/stunnel/module.info.ms_MY
+lib/webmin/stunnel/module.info.ms_MY.UTF-8
 lib/webmin/stunnel/module.info.nl
+lib/webmin/stunnel/module.info.nl.UTF-8
 lib/webmin/stunnel/module.info.no
 lib/webmin/stunnel/module.info.no.UTF-8
 lib/webmin/stunnel/module.info.ru.UTF-8
@@ -24703,7 +24680,6 @@ lib/webmin/syslog-ng/images/filters.gif
 lib/webmin/syslog-ng/images/icon.gif
 lib/webmin/syslog-ng/images/logs.gif
 lib/webmin/syslog-ng/images/options.gif
-lib/webmin/syslog-ng/images/smallicon.gif
 lib/webmin/syslog-ng/images/sources.gif
 lib/webmin/syslog-ng/index.cgi
 lib/webmin/syslog-ng/install_check.pl
@@ -24729,11 +24705,15 @@ lib/webmin/syslog-ng/list_sources.cgi
 lib/webmin/syslog-ng/log_parser.pl
 lib/webmin/syslog-ng/module.info
 lib/webmin/syslog-ng/module.info.ca
+lib/webmin/syslog-ng/module.info.ca.UTF-8
 lib/webmin/syslog-ng/module.info.de
+lib/webmin/syslog-ng/module.info.de.UTF-8
 lib/webmin/syslog-ng/module.info.hu
 lib/webmin/syslog-ng/module.info.hu.UTF-8
 lib/webmin/syslog-ng/module.info.ms_MY
+lib/webmin/syslog-ng/module.info.ms_MY.UTF-8
 lib/webmin/syslog-ng/module.info.nl
+lib/webmin/syslog-ng/module.info.nl.UTF-8
 lib/webmin/syslog-ng/module.info.no
 lib/webmin/syslog-ng/module.info.no.UTF-8
 lib/webmin/syslog-ng/save_destination.cgi
@@ -24832,7 +24812,6 @@ lib/webmin/syslog/config.info.zh_TW.UTF-8
 lib/webmin/syslog/defaultacl
 lib/webmin/syslog/edit_log.cgi
 lib/webmin/syslog/images/icon.gif
-lib/webmin/syslog/images/smallicon.gif
 lib/webmin/syslog/index.cgi
 lib/webmin/syslog/install_check.pl
 lib/webmin/syslog/lang/bg
@@ -24885,36 +24864,44 @@ lib/webmin/syslog/m4.cgi
 lib/webmin/syslog/medium.risk
 lib/webmin/syslog/module.info
 lib/webmin/syslog/module.info.ca
+lib/webmin/syslog/module.info.ca.UTF-8
 lib/webmin/syslog/module.info.cz
 lib/webmin/syslog/module.info.cz.UTF-8
 lib/webmin/syslog/module.info.de
+lib/webmin/syslog/module.info.de.UTF-8
 lib/webmin/syslog/module.info.es
+lib/webmin/syslog/module.info.es.UTF-8
 lib/webmin/syslog/module.info.fr
+lib/webmin/syslog/module.info.fr.UTF-8
 lib/webmin/syslog/module.info.hu
 lib/webmin/syslog/module.info.hu.UTF-8
 lib/webmin/syslog/module.info.it
+lib/webmin/syslog/module.info.it.UTF-8
 lib/webmin/syslog/module.info.ja_JP.UTF-8
 lib/webmin/syslog/module.info.ja_JP.euc
 lib/webmin/syslog/module.info.ko_KR.UTF-8
 lib/webmin/syslog/module.info.ko_KR.euc
 lib/webmin/syslog/module.info.ms_MY
+lib/webmin/syslog/module.info.ms_MY.UTF-8
 lib/webmin/syslog/module.info.nl
+lib/webmin/syslog/module.info.nl.UTF-8
 lib/webmin/syslog/module.info.no
 lib/webmin/syslog/module.info.no.UTF-8
 lib/webmin/syslog/module.info.pl
 lib/webmin/syslog/module.info.pl.UTF-8
 lib/webmin/syslog/module.info.pt
+lib/webmin/syslog/module.info.pt.UTF-8
 lib/webmin/syslog/module.info.pt_BR
+lib/webmin/syslog/module.info.pt_BR.UTF-8
 lib/webmin/syslog/module.info.ru.UTF-8
 lib/webmin/syslog/module.info.ru_RU
 lib/webmin/syslog/module.info.ru_RU.UTF-8
 lib/webmin/syslog/module.info.ru_SU
 lib/webmin/syslog/module.info.sv
+lib/webmin/syslog/module.info.sv.UTF-8
 lib/webmin/syslog/module.info.tr
 lib/webmin/syslog/module.info.zh_CN
-lib/webmin/syslog/module.info.zh_CN.UTF-8
 lib/webmin/syslog/module.info.zh_TW.Big5
-lib/webmin/syslog/module.info.zh_TW.UTF-8
 lib/webmin/syslog/rbac-mapping
 lib/webmin/syslog/restart.cgi
 lib/webmin/syslog/save_log.cgi
@@ -24943,10 +24930,13 @@ lib/webmin/system-status/lang/pl
 lib/webmin/system-status/lang/pl.UTF-8
 lib/webmin/system-status/module.info
 lib/webmin/system-status/module.info.ca
+lib/webmin/system-status/module.info.ca.UTF-8
 lib/webmin/system-status/module.info.de
+lib/webmin/system-status/module.info.de.UTF-8
 lib/webmin/system-status/module.info.hu
 lib/webmin/system-status/module.info.hu.UTF-8
 lib/webmin/system-status/module.info.ms_MY
+lib/webmin/system-status/module.info.ms_MY.UTF-8
 lib/webmin/system-status/module.info.no
 lib/webmin/system-status/module.info.no.UTF-8
 lib/webmin/system-status/module.info.pl
@@ -24985,7 +24975,6 @@ lib/webmin/tcpwrappers/help/intro.ca.UTF-8.html
 lib/webmin/tcpwrappers/help/intro.ca.html
 lib/webmin/tcpwrappers/help/intro.html
 lib/webmin/tcpwrappers/images/icon.gif
-lib/webmin/tcpwrappers/images/smallicon.gif
 lib/webmin/tcpwrappers/index.cgi
 lib/webmin/tcpwrappers/lang/ca
 lib/webmin/tcpwrappers/lang/ca.UTF-8
@@ -25009,11 +24998,15 @@ lib/webmin/tcpwrappers/lang/pl
 lib/webmin/tcpwrappers/lang/pl.UTF-8
 lib/webmin/tcpwrappers/module.info
 lib/webmin/tcpwrappers/module.info.ca
+lib/webmin/tcpwrappers/module.info.ca.UTF-8
 lib/webmin/tcpwrappers/module.info.de
+lib/webmin/tcpwrappers/module.info.de.UTF-8
 lib/webmin/tcpwrappers/module.info.hu
 lib/webmin/tcpwrappers/module.info.hu.UTF-8
 lib/webmin/tcpwrappers/module.info.ms_MY
+lib/webmin/tcpwrappers/module.info.ms_MY.UTF-8
 lib/webmin/tcpwrappers/module.info.nl
+lib/webmin/tcpwrappers/module.info.nl.UTF-8
 lib/webmin/tcpwrappers/module.info.no
 lib/webmin/tcpwrappers/module.info.no.UTF-8
 lib/webmin/tcpwrappers/module.info.pl
@@ -25068,7 +25061,6 @@ lib/webmin/telnet/config.info.zh_CN.UTF-8
 lib/webmin/telnet/config.info.zh_TW.Big5
 lib/webmin/telnet/config.info.zh_TW.UTF-8
 lib/webmin/telnet/images/icon.gif
-lib/webmin/telnet/images/smallicon.gif
 lib/webmin/telnet/index.cgi
 lib/webmin/telnet/install_check.pl
 lib/webmin/telnet/jta26.jar
@@ -25123,26 +25115,35 @@ lib/webmin/telnet/lang/zh_TW.Big5
 lib/webmin/telnet/lang/zh_TW.UTF-8
 lib/webmin/telnet/module.info
 lib/webmin/telnet/module.info.ca
+lib/webmin/telnet/module.info.ca.UTF-8
 lib/webmin/telnet/module.info.cz
 lib/webmin/telnet/module.info.cz.UTF-8
 lib/webmin/telnet/module.info.de
+lib/webmin/telnet/module.info.de.UTF-8
 lib/webmin/telnet/module.info.es
+lib/webmin/telnet/module.info.es.UTF-8
 lib/webmin/telnet/module.info.fr
+lib/webmin/telnet/module.info.fr.UTF-8
 lib/webmin/telnet/module.info.hu
 lib/webmin/telnet/module.info.hu.UTF-8
 lib/webmin/telnet/module.info.it
+lib/webmin/telnet/module.info.it.UTF-8
 lib/webmin/telnet/module.info.ja_JP.UTF-8
 lib/webmin/telnet/module.info.ja_JP.euc
 lib/webmin/telnet/module.info.ko_KR.UTF-8
 lib/webmin/telnet/module.info.ko_KR.euc
 lib/webmin/telnet/module.info.ms_MY
+lib/webmin/telnet/module.info.ms_MY.UTF-8
 lib/webmin/telnet/module.info.nl
+lib/webmin/telnet/module.info.nl.UTF-8
 lib/webmin/telnet/module.info.no
 lib/webmin/telnet/module.info.no.UTF-8
 lib/webmin/telnet/module.info.pl
 lib/webmin/telnet/module.info.pl.UTF-8
 lib/webmin/telnet/module.info.pt
+lib/webmin/telnet/module.info.pt.UTF-8
 lib/webmin/telnet/module.info.pt_BR
+lib/webmin/telnet/module.info.pt_BR.UTF-8
 lib/webmin/telnet/module.info.ru.UTF-8
 lib/webmin/telnet/module.info.ru_RU
 lib/webmin/telnet/module.info.ru_RU.UTF-8
@@ -25150,11 +25151,10 @@ lib/webmin/telnet/module.info.ru_SU
 lib/webmin/telnet/module.info.sk
 lib/webmin/telnet/module.info.sk.UTF-8
 lib/webmin/telnet/module.info.sv
+lib/webmin/telnet/module.info.sv.UTF-8
 lib/webmin/telnet/module.info.tr
 lib/webmin/telnet/module.info.zh_CN
-lib/webmin/telnet/module.info.zh_CN.UTF-8
 lib/webmin/telnet/module.info.zh_TW.Big5
-lib/webmin/telnet/module.info.zh_TW.UTF-8
 lib/webmin/telnet/ssh.conf
 lib/webmin/telnet/telnet.conf
 lib/webmin/thirdparty.pl
@@ -25342,7 +25342,6 @@ lib/webmin/time/help/timeserver.sv.html
 lib/webmin/time/help/timeserver.zh_TW.Big5.html
 lib/webmin/time/help/timeserver.zh_TW.UTF-8.html
 lib/webmin/time/images/icon.gif
-lib/webmin/time/images/smallicon.gif
 lib/webmin/time/index.cgi
 lib/webmin/time/lang/ca
 lib/webmin/time/lang/ca.UTF-8
@@ -25398,25 +25397,33 @@ lib/webmin/time/linux-lib.pl
 lib/webmin/time/log_parser.pl
 lib/webmin/time/module.info
 lib/webmin/time/module.info.ca
+lib/webmin/time/module.info.ca.UTF-8
 lib/webmin/time/module.info.cz
 lib/webmin/time/module.info.cz.UTF-8
 lib/webmin/time/module.info.de
+lib/webmin/time/module.info.de.UTF-8
 lib/webmin/time/module.info.es
+lib/webmin/time/module.info.es.UTF-8
 lib/webmin/time/module.info.fr
+lib/webmin/time/module.info.fr.UTF-8
 lib/webmin/time/module.info.hu
 lib/webmin/time/module.info.hu.UTF-8
 lib/webmin/time/module.info.it
+lib/webmin/time/module.info.it.UTF-8
 lib/webmin/time/module.info.ja_JP.UTF-8
 lib/webmin/time/module.info.ja_JP.euc
 lib/webmin/time/module.info.ko_KR.UTF-8
 lib/webmin/time/module.info.ko_KR.euc
 lib/webmin/time/module.info.ms_MY
+lib/webmin/time/module.info.ms_MY.UTF-8
 lib/webmin/time/module.info.nl
+lib/webmin/time/module.info.nl.UTF-8
 lib/webmin/time/module.info.no
 lib/webmin/time/module.info.no.UTF-8
 lib/webmin/time/module.info.pl
 lib/webmin/time/module.info.pl.UTF-8
 lib/webmin/time/module.info.pt
+lib/webmin/time/module.info.pt.UTF-8
 lib/webmin/time/module.info.ru.UTF-8
 lib/webmin/time/module.info.ru_RU
 lib/webmin/time/module.info.ru_RU.UTF-8
@@ -25424,11 +25431,10 @@ lib/webmin/time/module.info.ru_SU
 lib/webmin/time/module.info.sk
 lib/webmin/time/module.info.sk.UTF-8
 lib/webmin/time/module.info.sv
+lib/webmin/time/module.info.sv.UTF-8
 lib/webmin/time/module.info.tr
 lib/webmin/time/module.info.zh_CN
-lib/webmin/time/module.info.zh_CN.UTF-8
 lib/webmin/time/module.info.zh_TW.Big5
-lib/webmin/time/module.info.zh_TW.UTF-8
 lib/webmin/time/postinstall.pl
 lib/webmin/time/rbac-mapping
 lib/webmin/time/save_timezone.cgi
@@ -25458,7 +25464,6 @@ lib/webmin/tunnel/config.info.nl.UTF-8
 lib/webmin/tunnel/config.info.no
 lib/webmin/tunnel/config.info.no.UTF-8
 lib/webmin/tunnel/images/icon.gif
-lib/webmin/tunnel/images/smallicon.gif
 lib/webmin/tunnel/index.cgi
 lib/webmin/tunnel/lang/ca
 lib/webmin/tunnel/lang/ca.UTF-8
@@ -25487,17 +25492,23 @@ lib/webmin/tunnel/link.cgi
 lib/webmin/tunnel/login.cgi
 lib/webmin/tunnel/module.info
 lib/webmin/tunnel/module.info.ca
+lib/webmin/tunnel/module.info.ca.UTF-8
 lib/webmin/tunnel/module.info.cz
 lib/webmin/tunnel/module.info.cz.UTF-8
 lib/webmin/tunnel/module.info.de
+lib/webmin/tunnel/module.info.de.UTF-8
 lib/webmin/tunnel/module.info.es
+lib/webmin/tunnel/module.info.es.UTF-8
 lib/webmin/tunnel/module.info.hu
 lib/webmin/tunnel/module.info.hu.UTF-8
 lib/webmin/tunnel/module.info.it
+lib/webmin/tunnel/module.info.it.UTF-8
 lib/webmin/tunnel/module.info.ko_KR.UTF-8
 lib/webmin/tunnel/module.info.ko_KR.euc
 lib/webmin/tunnel/module.info.ms_MY
+lib/webmin/tunnel/module.info.ms_MY.UTF-8
 lib/webmin/tunnel/module.info.nl
+lib/webmin/tunnel/module.info.nl.UTF-8
 lib/webmin/tunnel/module.info.no
 lib/webmin/tunnel/module.info.no.UTF-8
 lib/webmin/tunnel/seturl.cgi
@@ -25519,7 +25530,6 @@ lib/webmin/updown/fetch.cgi
 lib/webmin/updown/images/icon.gif
 lib/webmin/updown/images/left.gif
 lib/webmin/updown/images/pack.gif
-lib/webmin/updown/images/smallicon.gif
 lib/webmin/updown/index.cgi
 lib/webmin/updown/lang/ca
 lib/webmin/updown/lang/ca.UTF-8
@@ -25565,22 +25575,31 @@ lib/webmin/updown/lang/zh_TW.UTF-8
 lib/webmin/updown/log_parser.pl
 lib/webmin/updown/module.info
 lib/webmin/updown/module.info.ca
+lib/webmin/updown/module.info.ca.UTF-8
 lib/webmin/updown/module.info.cz
 lib/webmin/updown/module.info.cz.UTF-8
 lib/webmin/updown/module.info.de
+lib/webmin/updown/module.info.de.UTF-8
 lib/webmin/updown/module.info.es
+lib/webmin/updown/module.info.es.UTF-8
 lib/webmin/updown/module.info.fi
+lib/webmin/updown/module.info.fi.UTF-8
 lib/webmin/updown/module.info.fr
+lib/webmin/updown/module.info.fr.UTF-8
 lib/webmin/updown/module.info.hu
 lib/webmin/updown/module.info.hu.UTF-8
 lib/webmin/updown/module.info.it
+lib/webmin/updown/module.info.it.UTF-8
 lib/webmin/updown/module.info.ja_JP.UTF-8
 lib/webmin/updown/module.info.ja_JP.euc
 lib/webmin/updown/module.info.ko_KR.UTF-8
 lib/webmin/updown/module.info.ko_KR.euc
 lib/webmin/updown/module.info.ms
+lib/webmin/updown/module.info.ms.UTF-8
 lib/webmin/updown/module.info.ms_MY
+lib/webmin/updown/module.info.ms_MY.UTF-8
 lib/webmin/updown/module.info.nl
+lib/webmin/updown/module.info.nl.UTF-8
 lib/webmin/updown/module.info.no
 lib/webmin/updown/module.info.no.UTF-8
 lib/webmin/updown/module.info.pl
@@ -25593,7 +25612,6 @@ lib/webmin/updown/module.info.sk
 lib/webmin/updown/module.info.sk.UTF-8
 lib/webmin/updown/module.info.tr
 lib/webmin/updown/module.info.zh_TW.Big5
-lib/webmin/updown/module.info.zh_TW.UTF-8
 lib/webmin/updown/uninstall.pl
 lib/webmin/updown/updown-lib.pl
 lib/webmin/updown/upload.cgi
@@ -26461,7 +26479,6 @@ lib/webmin/useradmin/help/workph.nl.html
 lib/webmin/useradmin/hpux-lib.pl
 lib/webmin/useradmin/images/group.gif
 lib/webmin/useradmin/images/icon.gif
-lib/webmin/useradmin/images/smallicon.gif
 lib/webmin/useradmin/images/user.gif
 lib/webmin/useradmin/index.cgi
 lib/webmin/useradmin/irix-lib.pl
@@ -26524,12 +26541,17 @@ lib/webmin/useradmin/md5-lib.pl
 lib/webmin/useradmin/module.info
 lib/webmin/useradmin/module.info.ar
 lib/webmin/useradmin/module.info.ca
+lib/webmin/useradmin/module.info.ca.UTF-8
 lib/webmin/useradmin/module.info.cz
 lib/webmin/useradmin/module.info.cz.UTF-8
 lib/webmin/useradmin/module.info.da
+lib/webmin/useradmin/module.info.da.UTF-8
 lib/webmin/useradmin/module.info.de
+lib/webmin/useradmin/module.info.de.UTF-8
 lib/webmin/useradmin/module.info.es
+lib/webmin/useradmin/module.info.es.UTF-8
 lib/webmin/useradmin/module.info.fr
+lib/webmin/useradmin/module.info.fr.UTF-8
 lib/webmin/useradmin/module.info.hu
 lib/webmin/useradmin/module.info.hu.UTF-8
 lib/webmin/useradmin/module.info.ja_JP.UTF-8
@@ -26537,23 +26559,26 @@ lib/webmin/useradmin/module.info.ja_JP.euc
 lib/webmin/useradmin/module.info.ko_KR.UTF-8
 lib/webmin/useradmin/module.info.ko_KR.euc
 lib/webmin/useradmin/module.info.ms_MY
+lib/webmin/useradmin/module.info.ms_MY.UTF-8
 lib/webmin/useradmin/module.info.nl
+lib/webmin/useradmin/module.info.nl.UTF-8
 lib/webmin/useradmin/module.info.no
 lib/webmin/useradmin/module.info.no.UTF-8
 lib/webmin/useradmin/module.info.pl
 lib/webmin/useradmin/module.info.pl.UTF-8
 lib/webmin/useradmin/module.info.pt
+lib/webmin/useradmin/module.info.pt.UTF-8
 lib/webmin/useradmin/module.info.pt_BR
+lib/webmin/useradmin/module.info.pt_BR.UTF-8
 lib/webmin/useradmin/module.info.ru.UTF-8
 lib/webmin/useradmin/module.info.ru_RU
 lib/webmin/useradmin/module.info.ru_RU.UTF-8
 lib/webmin/useradmin/module.info.ru_SU
 lib/webmin/useradmin/module.info.sv
+lib/webmin/useradmin/module.info.sv.UTF-8
 lib/webmin/useradmin/module.info.tr
 lib/webmin/useradmin/module.info.zh_CN
-lib/webmin/useradmin/module.info.zh_CN.UTF-8
 lib/webmin/useradmin/module.info.zh_TW.Big5
-lib/webmin/useradmin/module.info.zh_TW.UTF-8
 lib/webmin/useradmin/my_group_chooser.cgi
 lib/webmin/useradmin/my_user_chooser.cgi
 lib/webmin/useradmin/netbsd-lib.pl
@@ -26682,7 +26707,6 @@ lib/webmin/usermin/images/referers.gif
 lib/webmin/usermin/images/restrict.gif
 lib/webmin/usermin/images/session.gif
 lib/webmin/usermin/images/sessions.gif
-lib/webmin/usermin/images/smallicon.gif
 lib/webmin/usermin/images/ssl.gif
 lib/webmin/usermin/images/themes.gif
 lib/webmin/usermin/images/ui.gif
@@ -26740,30 +26764,38 @@ lib/webmin/usermin/log_parser.pl
 lib/webmin/usermin/module.info
 lib/webmin/usermin/module.info.ar
 lib/webmin/usermin/module.info.ca
+lib/webmin/usermin/module.info.ca.UTF-8
 lib/webmin/usermin/module.info.cz
 lib/webmin/usermin/module.info.cz.UTF-8
 lib/webmin/usermin/module.info.de
+lib/webmin/usermin/module.info.de.UTF-8
 lib/webmin/usermin/module.info.es
+lib/webmin/usermin/module.info.es.UTF-8
 lib/webmin/usermin/module.info.fi
+lib/webmin/usermin/module.info.fi.UTF-8
 lib/webmin/usermin/module.info.fr
+lib/webmin/usermin/module.info.fr.UTF-8
 lib/webmin/usermin/module.info.hu
 lib/webmin/usermin/module.info.hu.UTF-8
 lib/webmin/usermin/module.info.it
+lib/webmin/usermin/module.info.it.UTF-8
 lib/webmin/usermin/module.info.ja_JP.UTF-8
 lib/webmin/usermin/module.info.ja_JP.euc
 lib/webmin/usermin/module.info.ms_MY
+lib/webmin/usermin/module.info.ms_MY.UTF-8
 lib/webmin/usermin/module.info.nl
+lib/webmin/usermin/module.info.nl.UTF-8
 lib/webmin/usermin/module.info.no
 lib/webmin/usermin/module.info.no.UTF-8
 lib/webmin/usermin/module.info.pl
 lib/webmin/usermin/module.info.pl.UTF-8
 lib/webmin/usermin/module.info.pt_BR
+lib/webmin/usermin/module.info.pt_BR.UTF-8
 lib/webmin/usermin/module.info.ru.UTF-8
 lib/webmin/usermin/module.info.ru_RU
 lib/webmin/usermin/module.info.ru_RU.UTF-8
 lib/webmin/usermin/module.info.ru_SU
 lib/webmin/usermin/module.info.zh_TW.Big5
-lib/webmin/usermin/module.info.zh_TW.UTF-8
 lib/webmin/usermin/move.cgi
 lib/webmin/usermin/newkey.cgi
 lib/webmin/usermin/restart.cgi
@@ -26825,7 +26857,6 @@ lib/webmin/vgetty/images/icon.gif
 lib/webmin/vgetty/images/messages.gif
 lib/webmin/vgetty/images/options.gif
 lib/webmin/vgetty/images/received.gif
-lib/webmin/vgetty/images/smallicon.gif
 lib/webmin/vgetty/images/vgetty.gif
 lib/webmin/vgetty/index.cgi
 lib/webmin/vgetty/install_check.pl
@@ -26860,14 +26891,19 @@ lib/webmin/vgetty/listen.cgi
 lib/webmin/vgetty/log_parser.pl
 lib/webmin/vgetty/module.info
 lib/webmin/vgetty/module.info.ca
+lib/webmin/vgetty/module.info.ca.UTF-8
 lib/webmin/vgetty/module.info.cz
 lib/webmin/vgetty/module.info.cz.UTF-8
 lib/webmin/vgetty/module.info.de
+lib/webmin/vgetty/module.info.de.UTF-8
 lib/webmin/vgetty/module.info.es
+lib/webmin/vgetty/module.info.es.UTF-8
 lib/webmin/vgetty/module.info.hu
 lib/webmin/vgetty/module.info.hu.UTF-8
 lib/webmin/vgetty/module.info.ms_MY
+lib/webmin/vgetty/module.info.ms_MY.UTF-8
 lib/webmin/vgetty/module.info.nl
+lib/webmin/vgetty/module.info.nl.UTF-8
 lib/webmin/vgetty/module.info.no
 lib/webmin/vgetty/module.info.no.UTF-8
 lib/webmin/vgetty/module.info.pl
@@ -26934,7 +26970,6 @@ lib/webmin/webalizer/edit_global.cgi
 lib/webmin/webalizer/edit_log.cgi
 lib/webmin/webalizer/images/empty.gif
 lib/webmin/webalizer/images/icon.gif
-lib/webmin/webalizer/images/smallicon.gif
 lib/webmin/webalizer/index.cgi
 lib/webmin/webalizer/install_check.pl
 lib/webmin/webalizer/lang/ca
@@ -26976,15 +27011,21 @@ lib/webmin/webalizer/log_parser.pl
 lib/webmin/webalizer/mass.cgi
 lib/webmin/webalizer/module.info
 lib/webmin/webalizer/module.info.ca
+lib/webmin/webalizer/module.info.ca.UTF-8
 lib/webmin/webalizer/module.info.cz
 lib/webmin/webalizer/module.info.cz.UTF-8
 lib/webmin/webalizer/module.info.de
+lib/webmin/webalizer/module.info.de.UTF-8
 lib/webmin/webalizer/module.info.es
+lib/webmin/webalizer/module.info.es.UTF-8
 lib/webmin/webalizer/module.info.fr
+lib/webmin/webalizer/module.info.fr.UTF-8
 lib/webmin/webalizer/module.info.hu
 lib/webmin/webalizer/module.info.hu.UTF-8
 lib/webmin/webalizer/module.info.ms_MY
+lib/webmin/webalizer/module.info.ms_MY.UTF-8
 lib/webmin/webalizer/module.info.nl
+lib/webmin/webalizer/module.info.nl.UTF-8
 lib/webmin/webalizer/module.info.no
 lib/webmin/webalizer/module.info.no.UTF-8
 lib/webmin/webalizer/module.info.pl
@@ -26992,7 +27033,6 @@ lib/webmin/webalizer/module.info.pl.UTF-8
 lib/webmin/webalizer/module.info.ru_RU
 lib/webmin/webalizer/module.info.ru_RU.UTF-8
 lib/webmin/webalizer/module.info.zh_TW.Big5
-lib/webmin/webalizer/module.info.zh_TW.UTF-8
 lib/webmin/webalizer/save_global.cgi
 lib/webmin/webalizer/save_log.cgi
 lib/webmin/webalizer/view_log.cgi
@@ -27150,7 +27190,6 @@ lib/webmin/webmin/images/proxy.gif
 lib/webmin/webmin/images/referers.gif
 lib/webmin/webmin/images/sendmail.gif
 lib/webmin/webmin/images/session.gif
-lib/webmin/webmin/images/smallicon.gif
 lib/webmin/webmin/images/ssl.gif
 lib/webmin/webmin/images/startpage.gif
 lib/webmin/webmin/images/status.gif
@@ -27227,26 +27266,35 @@ lib/webmin/webmin/log_parser.pl
 lib/webmin/webmin/module.info
 lib/webmin/webmin/module.info.ar
 lib/webmin/webmin/module.info.ca
+lib/webmin/webmin/module.info.ca.UTF-8
 lib/webmin/webmin/module.info.cz
 lib/webmin/webmin/module.info.cz.UTF-8
 lib/webmin/webmin/module.info.de
+lib/webmin/webmin/module.info.de.UTF-8
 lib/webmin/webmin/module.info.es
+lib/webmin/webmin/module.info.es.UTF-8
 lib/webmin/webmin/module.info.fr
+lib/webmin/webmin/module.info.fr.UTF-8
 lib/webmin/webmin/module.info.hu
 lib/webmin/webmin/module.info.hu.UTF-8
 lib/webmin/webmin/module.info.it
+lib/webmin/webmin/module.info.it.UTF-8
 lib/webmin/webmin/module.info.ja_JP.UTF-8
 lib/webmin/webmin/module.info.ja_JP.euc
 lib/webmin/webmin/module.info.ko_KR.UTF-8
 lib/webmin/webmin/module.info.ko_KR.euc
 lib/webmin/webmin/module.info.ms_MY
+lib/webmin/webmin/module.info.ms_MY.UTF-8
 lib/webmin/webmin/module.info.nl
+lib/webmin/webmin/module.info.nl.UTF-8
 lib/webmin/webmin/module.info.no
 lib/webmin/webmin/module.info.no.UTF-8
 lib/webmin/webmin/module.info.pl
 lib/webmin/webmin/module.info.pl.UTF-8
 lib/webmin/webmin/module.info.pt
+lib/webmin/webmin/module.info.pt.UTF-8
 lib/webmin/webmin/module.info.pt_BR
+lib/webmin/webmin/module.info.pt_BR.UTF-8
 lib/webmin/webmin/module.info.ru.UTF-8
 lib/webmin/webmin/module.info.ru_RU
 lib/webmin/webmin/module.info.ru_RU.UTF-8
@@ -27254,11 +27302,10 @@ lib/webmin/webmin/module.info.ru_SU
 lib/webmin/webmin/module.info.sk
 lib/webmin/webmin/module.info.sk.UTF-8
 lib/webmin/webmin/module.info.sv
+lib/webmin/webmin/module.info.sv.UTF-8
 lib/webmin/webmin/module.info.tr
 lib/webmin/webmin/module.info.zh_CN
-lib/webmin/webmin/module.info.zh_CN.UTF-8
 lib/webmin/webmin/module.info.zh_TW.Big5
-lib/webmin/webmin/module.info.zh_TW.UTF-8
 lib/webmin/webmin/newcsr.cgi
 lib/webmin/webmin/newkey.cgi
 lib/webmin/webmin/postinstall.pl
@@ -27310,11 +27357,15 @@ lib/webmin/webmincron/lang/ru_RU.UTF-8
 lib/webmin/webmincron/log_parser.pl
 lib/webmin/webmincron/module.info
 lib/webmin/webmincron/module.info.ca
+lib/webmin/webmincron/module.info.ca.UTF-8
 lib/webmin/webmincron/module.info.de
+lib/webmin/webmincron/module.info.de.UTF-8
 lib/webmin/webmincron/module.info.hu
 lib/webmin/webmincron/module.info.hu.UTF-8
 lib/webmin/webmincron/module.info.ms_MY
+lib/webmin/webmincron/module.info.ms_MY.UTF-8
 lib/webmin/webmincron/module.info.nl
+lib/webmin/webmincron/module.info.nl.UTF-8
 lib/webmin/webmincron/module.info.no
 lib/webmin/webmincron/module.info.no.UTF-8
 lib/webmin/webmincron/module.info.pl
@@ -27356,7 +27407,6 @@ lib/webmin/webminlog/config.info.sk.UTF-8
 lib/webmin/webminlog/config.info.tr
 lib/webmin/webminlog/defaultacl
 lib/webmin/webminlog/images/icon.gif
-lib/webmin/webminlog/images/smallicon.gif
 lib/webmin/webminlog/images/star.gif
 lib/webmin/webminlog/index.cgi
 lib/webmin/webminlog/lang/ar
@@ -27412,21 +27462,29 @@ lib/webmin/webminlog/log_parser.pl
 lib/webmin/webminlog/module.info
 lib/webmin/webminlog/module.info.ar
 lib/webmin/webminlog/module.info.ca
+lib/webmin/webminlog/module.info.ca.UTF-8
 lib/webmin/webminlog/module.info.cz
 lib/webmin/webminlog/module.info.cz.UTF-8
 lib/webmin/webminlog/module.info.de
+lib/webmin/webminlog/module.info.de.UTF-8
 lib/webmin/webminlog/module.info.es
+lib/webmin/webminlog/module.info.es.UTF-8
 lib/webmin/webminlog/module.info.fr
+lib/webmin/webminlog/module.info.fr.UTF-8
 lib/webmin/webminlog/module.info.hu
 lib/webmin/webminlog/module.info.hu.UTF-8
 lib/webmin/webminlog/module.info.it
+lib/webmin/webminlog/module.info.it.UTF-8
 lib/webmin/webminlog/module.info.ja_JP.UTF-8
 lib/webmin/webminlog/module.info.ja_JP.euc
 lib/webmin/webminlog/module.info.ko_KR.UTF-8
 lib/webmin/webminlog/module.info.ko_KR.euc
 lib/webmin/webminlog/module.info.ms
+lib/webmin/webminlog/module.info.ms.UTF-8
 lib/webmin/webminlog/module.info.ms_MY
+lib/webmin/webminlog/module.info.ms_MY.UTF-8
 lib/webmin/webminlog/module.info.nl
+lib/webmin/webminlog/module.info.nl.UTF-8
 lib/webmin/webminlog/module.info.no
 lib/webmin/webminlog/module.info.no.UTF-8
 lib/webmin/webminlog/module.info.pl
@@ -27438,11 +27496,10 @@ lib/webmin/webminlog/module.info.ru_SU
 lib/webmin/webminlog/module.info.sk
 lib/webmin/webminlog/module.info.sk.UTF-8
 lib/webmin/webminlog/module.info.sv
+lib/webmin/webminlog/module.info.sv.UTF-8
 lib/webmin/webminlog/module.info.tr
 lib/webmin/webminlog/module.info.zh_CN
-lib/webmin/webminlog/module.info.zh_CN.UTF-8
 lib/webmin/webminlog/module.info.zh_TW.Big5
-lib/webmin/webminlog/module.info.zh_TW.UTF-8
 lib/webmin/webminlog/rollback.cgi
 lib/webmin/webminlog/search.cgi
 lib/webmin/webminlog/view.cgi
@@ -27707,7 +27764,6 @@ lib/webmin/wuftpd/images/message.gif
 lib/webmin/wuftpd/images/misc.gif
 lib/webmin/wuftpd/images/net.gif
 lib/webmin/wuftpd/images/perm.gif
-lib/webmin/wuftpd/images/smallicon.gif
 lib/webmin/wuftpd/index.cgi
 lib/webmin/wuftpd/install_check.pl
 lib/webmin/wuftpd/lang/ca
@@ -27754,32 +27810,38 @@ lib/webmin/wuftpd/lang/zh_TW.UTF-8
 lib/webmin/wuftpd/log_parser.pl
 lib/webmin/wuftpd/module.info
 lib/webmin/wuftpd/module.info.ca
+lib/webmin/wuftpd/module.info.ca.UTF-8
 lib/webmin/wuftpd/module.info.cz
 lib/webmin/wuftpd/module.info.cz.UTF-8
 lib/webmin/wuftpd/module.info.de
+lib/webmin/wuftpd/module.info.de.UTF-8
 lib/webmin/wuftpd/module.info.es
+lib/webmin/wuftpd/module.info.es.UTF-8
 lib/webmin/wuftpd/module.info.fr
+lib/webmin/wuftpd/module.info.fr.UTF-8
 lib/webmin/wuftpd/module.info.ja_JP.UTF-8
 lib/webmin/wuftpd/module.info.ja_JP.euc
 lib/webmin/wuftpd/module.info.ko_KR.UTF-8
 lib/webmin/wuftpd/module.info.ko_KR.euc
 lib/webmin/wuftpd/module.info.ms_MY
+lib/webmin/wuftpd/module.info.ms_MY.UTF-8
 lib/webmin/wuftpd/module.info.nl
+lib/webmin/wuftpd/module.info.nl.UTF-8
 lib/webmin/wuftpd/module.info.no
 lib/webmin/wuftpd/module.info.no.UTF-8
 lib/webmin/wuftpd/module.info.pl
 lib/webmin/wuftpd/module.info.pl.UTF-8
 lib/webmin/wuftpd/module.info.pt
+lib/webmin/wuftpd/module.info.pt.UTF-8
 lib/webmin/wuftpd/module.info.ru.UTF-8
 lib/webmin/wuftpd/module.info.ru_RU
 lib/webmin/wuftpd/module.info.ru_RU.UTF-8
 lib/webmin/wuftpd/module.info.ru_SU
 lib/webmin/wuftpd/module.info.sv
+lib/webmin/wuftpd/module.info.sv.UTF-8
 lib/webmin/wuftpd/module.info.tr
 lib/webmin/wuftpd/module.info.zh_CN
-lib/webmin/wuftpd/module.info.zh_CN.UTF-8
 lib/webmin/wuftpd/module.info.zh_TW.Big5
-lib/webmin/wuftpd/module.info.zh_TW.UTF-8
 lib/webmin/wuftpd/restart.cgi
 lib/webmin/wuftpd/save_acl.cgi
 lib/webmin/wuftpd/save_alias.cgi
@@ -27866,7 +27928,6 @@ lib/webmin/xinetd/edit_defaults.cgi
 lib/webmin/xinetd/edit_serv.cgi
 lib/webmin/xinetd/feedback_files.pl
 lib/webmin/xinetd/images/icon.gif
-lib/webmin/xinetd/images/smallicon.gif
 lib/webmin/xinetd/index.cgi
 lib/webmin/xinetd/install_check.pl
 lib/webmin/xinetd/lang/ca
@@ -27917,11 +27978,15 @@ lib/webmin/xinetd/log_parser.pl
 lib/webmin/xinetd/mass_enable.cgi
 lib/webmin/xinetd/module.info
 lib/webmin/xinetd/module.info.ca
+lib/webmin/xinetd/module.info.ca.UTF-8
 lib/webmin/xinetd/module.info.de
+lib/webmin/xinetd/module.info.de.UTF-8
 lib/webmin/xinetd/module.info.hu
 lib/webmin/xinetd/module.info.hu.UTF-8
 lib/webmin/xinetd/module.info.ms_MY
+lib/webmin/xinetd/module.info.ms_MY.UTF-8
 lib/webmin/xinetd/module.info.nl
+lib/webmin/xinetd/module.info.nl.UTF-8
 lib/webmin/xinetd/module.info.no
 lib/webmin/xinetd/module.info.no.UTF-8
 lib/webmin/xinetd/module.info.pl
@@ -27991,7 +28056,6 @@ lib/webmin/zones/help/rctl.html
 lib/webmin/zones/help/rctl.nl.UTF-8.html
 lib/webmin/zones/help/rctl.nl.html
 lib/webmin/zones/images/icon.gif
-lib/webmin/zones/images/smallicon.gif
 lib/webmin/zones/images/tzone4.jpg
 lib/webmin/zones/images/zone.gif
 lib/webmin/zones/index.cgi
@@ -28007,6 +28071,7 @@ lib/webmin/zones/lang/nl.UTF-8
 lib/webmin/zones/log_parser.pl
 lib/webmin/zones/module.info
 lib/webmin/zones/module.info.ca
+lib/webmin/zones/module.info.ca.UTF-8
 lib/webmin/zones/save_attr.cgi
 lib/webmin/zones/save_fs.cgi
 lib/webmin/zones/save_net.cgi
@@ -28014,7 +28079,6 @@ lib/webmin/zones/save_pkg.cgi
 lib/webmin/zones/save_rctl.cgi
 lib/webmin/zones/save_zone.cgi
 lib/webmin/zones/zones-lib.pl
-@dir lib/webmin/file/xinha/plugins
 @dir lib/webmin/mailboxes/xinha/plugins
 @dir lib/webmin/system-status/images
 @dir lib/webmin/webmincron/images
author	Koop Mast <kwm@rainbow-runner.nl>	2019-08-24 18:15:33 +0800
committer	Koop Mast <kwm@rainbow-runner.nl>	2019-08-24 18:15:33 +0800
commit	9fcef473288365748d276dbf967c46d8c3698aaf (patch)
tree	f2cb55313941568afa0d6433903b1ef3745562f4 /sysutils
parent	10567987504404669e1cfc3d20faaeb3dfad42d1 (diff)
parent	acc0f44496c6b2b236d95762511a98a0aa5061e6 (diff)
download	freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.tar.gz freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.tar.zst freebsd-ports-gnome-9fcef473288365748d276dbf967c46d8c3698aaf.zip