diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
index 26fffcd986da..9259e4591012 100644
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -1,55 +1,56 @@
 PORTNAME=	lazpaint
 PORTVERSION=	7.1.6
 PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	${LAZARUS_PKGNAMESUFFIX}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Image editor written in Lazarus
 
 LICENSE=	GPLv3
 
 gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
 qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		desktop-file-utils dos2unix fpc gnome lazarus:flavors xorg
 USE_FPC=	chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \
 		opengl openssl pasjpeg rtl-extra rtl-objpas x11
 USE_XORG=	x11
 DOS2UNIX_REGEX=	.*\.([txt]|pas|lpi|txt)
 USE_GITHUB=	yes
+GH_TAGNAME=	426f74adc0fc5bca31213c2e7c3ae772ba49769a
 GH_ACCOUNT=	bgrabitmap
-GH_TUPLE=	bgrabitmap:bgracontrols:95fc0d2:bgracontrols/bgracontrols \
-		bgrabitmap:bgrabitmap:ace7e0e:bgrabitmap/bgrabitmapnew
+GH_TUPLE=	bgrabitmap:bgracontrols:2797120:bgracontrols/bgracontrols \
+		bgrabitmap:bgrabitmap:d52b5b7:bgrabitmap/bgrabitmapnew
 
 USE_FPC_gtk2=	cairo
 USE_GNOME_gtk2=	cairo
 USE_FPC+=	${USE_FPC_${FLAVOR}}
 USE_GNOME+=	${USE_GNOME_${FLAVOR}}
 
 DESKTOP_ENTRIES="LazPaint" \
 		"Image editor written in Lazarus" \
 		"lazpaint" \
 		"${PREFIX}/bin/lazpaint" \
 		"Graphics;" \
 		${TRUE}
 
 LAZARUS_PROJECT_FILES=	bgrabitmapnew/bgrabitmap/bgrabitmappack.lpk
 LAZARUS_PROJECT_FILES+=	bgracontrols/bgracontrols.lpk
 LAZARUS_PROJECT_FILES+=	lazpaintcontrols/lazpaintcontrols.lpk
 LAZARUS_PROJECT_FILES+=	lazpaint/lazpaint.lpi
 
 LAZBUILD_ARGS=	-d --bm=Release
 
 post-patch:
 	${REINPLACE_CMD} 's|%%DATADIR%%|${DATADIR}|g' ${WRKSRC}/lazpaint/utranslation.pas
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/lazpaint/release/bin/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps
 	${INSTALL_DATA} ${WRKSRC}/resources/icon/48x48.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/lazpaint/release/bin && ${COPYTREE_SHARE} "i18n models" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/lazpaint/distinfo b/graphics/lazpaint/distinfo
index 88fb7ff29491..56f4c738ba41 100644
--- a/graphics/lazpaint/distinfo
+++ b/graphics/lazpaint/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1613656109
-SHA256 (bgrabitmap-lazpaint-v7.1.6_GH0.tar.gz) = 9726370964f9d86ea12a900d04fdce35f3b3922e63b3039ce9787155b6a0797d
-SIZE (bgrabitmap-lazpaint-v7.1.6_GH0.tar.gz) = 34817420
-SHA256 (bgrabitmap-bgracontrols-95fc0d2_GH0.tar.gz) = 7ca2220ec6c4115cbb0069de29e50190d3465d3f2f65721ea34c64a4b1987484
-SIZE (bgrabitmap-bgracontrols-95fc0d2_GH0.tar.gz) = 16811386
-SHA256 (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = ae3f28596c2a5f44bc468f6c3380fc1ceb27e95afea579f09b1d340c781bbef2
-SIZE (bgrabitmap-bgrabitmap-ace7e0e_GH0.tar.gz) = 6983967
+TIMESTAMP = 1644619495
+SHA256 (bgrabitmap-lazpaint-v7.1.6-426f74adc0fc5bca31213c2e7c3ae772ba49769a_GH0.tar.gz) = 63a833575b72abb1a808e36be0683f42b1464585713fd2bf485204c9d7689ce2
+SIZE (bgrabitmap-lazpaint-v7.1.6-426f74adc0fc5bca31213c2e7c3ae772ba49769a_GH0.tar.gz) = 36733913
+SHA256 (bgrabitmap-bgracontrols-2797120_GH0.tar.gz) = bcdff6f80a903a2ccfa11ae5fb7dfbaf991dcf498a6ed495069d0c3f4e2f904d
+SIZE (bgrabitmap-bgracontrols-2797120_GH0.tar.gz) = 16830016
+SHA256 (bgrabitmap-bgrabitmap-d52b5b7_GH0.tar.gz) = e2bae5e75d6356b67ceb625c8d38e2795dd0e055f70c3a1cc53e27beabb56429
+SIZE (bgrabitmap-bgrabitmap-d52b5b7_GH0.tar.gz) = 6995022
diff --git a/graphics/lazpaint/pkg-plist b/graphics/lazpaint/pkg-plist
index 70a21209ee08..03b82e1a43b5 100644
--- a/graphics/lazpaint/pkg-plist
+++ b/graphics/lazpaint/pkg-plist
@@ -1,63 +1,65 @@
 bin/lazpaint
 share/icons/hicolor/48x48/apps/lazpaint.png
 %%DATADIR%%/i18n/lazpaint.ar.po
 %%DATADIR%%/i18n/lazpaint.bg.po
 %%DATADIR%%/i18n/lazpaint.cs.po
 %%DATADIR%%/i18n/lazpaint.de.po
 %%DATADIR%%/i18n/lazpaint.es.po
 %%DATADIR%%/i18n/lazpaint.fi.po
 %%DATADIR%%/i18n/lazpaint.fr.po
+%%DATADIR%%/i18n/lazpaint.it.po
 %%DATADIR%%/i18n/lazpaint.ja.po
 %%DATADIR%%/i18n/lazpaint.kab.po
 %%DATADIR%%/i18n/lazpaint.lv.po
 %%DATADIR%%/i18n/lazpaint.nl.po
 %%DATADIR%%/i18n/lazpaint.pl.po
 %%DATADIR%%/i18n/lazpaint.po
 %%DATADIR%%/i18n/lazpaint.pt_BR.po
 %%DATADIR%%/i18n/lazpaint.ru.po
 %%DATADIR%%/i18n/lazpaint.sv.po
 %%DATADIR%%/i18n/lazpaint.zh_CN.po
 %%DATADIR%%/i18n/lclstrconsts.ca.po
 %%DATADIR%%/i18n/lclstrconsts.cs.po
 %%DATADIR%%/i18n/lclstrconsts.de.po
 %%DATADIR%%/i18n/lclstrconsts.es.po
 %%DATADIR%%/i18n/lclstrconsts.fi.po
 %%DATADIR%%/i18n/lclstrconsts.fr.po
 %%DATADIR%%/i18n/lclstrconsts.he.po
 %%DATADIR%%/i18n/lclstrconsts.id.po
 %%DATADIR%%/i18n/lclstrconsts.it.po
 %%DATADIR%%/i18n/lclstrconsts.kab.po
 %%DATADIR%%/i18n/lclstrconsts.lt.po
 %%DATADIR%%/i18n/lclstrconsts.nl.po
 %%DATADIR%%/i18n/lclstrconsts.pb.po
 %%DATADIR%%/i18n/lclstrconsts.pl.po
 %%DATADIR%%/i18n/lclstrconsts.po
 %%DATADIR%%/i18n/lclstrconsts.ru.po
 %%DATADIR%%/i18n/lclstrconsts.sk.po
 %%DATADIR%%/i18n/lclstrconsts.tr.po
 %%DATADIR%%/i18n/lclstrconsts.ua.po
 %%DATADIR%%/i18n/lclstrconsts.zh_CN.po
 %%DATADIR%%/i18n/lcresourcestring.ar.po
 %%DATADIR%%/i18n/lcresourcestring.bg.po
 %%DATADIR%%/i18n/lcresourcestring.cs.po
 %%DATADIR%%/i18n/lcresourcestring.de.po
 %%DATADIR%%/i18n/lcresourcestring.es.po
 %%DATADIR%%/i18n/lcresourcestring.fi.po
 %%DATADIR%%/i18n/lcresourcestring.fr.po
 %%DATADIR%%/i18n/lcresourcestring.ja.po
 %%DATADIR%%/i18n/lcresourcestring.kab.po
 %%DATADIR%%/i18n/lcresourcestring.lv.po
 %%DATADIR%%/i18n/lcresourcestring.nl.po
 %%DATADIR%%/i18n/lcresourcestring.po
+%%DATADIR%%/i18n/lcresourcestring.pot
 %%DATADIR%%/i18n/lcresourcestring.pt_BR.po
 %%DATADIR%%/i18n/lcresourcestring.ru.po
 %%DATADIR%%/i18n/lcresourcestring.sv.po
 %%DATADIR%%/i18n/lcresourcestring.zh_CN.po
 %%DATADIR%%/models/cube.obj
 %%DATADIR%%/models/dodecahedron.obj
 %%DATADIR%%/models/greek_vase.jpg
 %%DATADIR%%/models/greek_vase.mtl
 %%DATADIR%%/models/greek_vase.obj
 %%DATADIR%%/models/table.jpg
 %%DATADIR%%/models/table.mtl
 %%DATADIR%%/models/table.obj