diff --git a/graphics/azpainter/Makefile b/graphics/azpainter/Makefile
index 40ba198d529f..5998c240a1e6 100644
--- a/graphics/azpainter/Makefile
+++ b/graphics/azpainter/Makefile
@@ -1,45 +1,55 @@
 # Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	azpainter
 DISTVERSION=	2.0.3
 CATEGORIES=	graphics
-MASTER_SITES=	http://acc.dl.osdn.jp/azpainter/67218/ \
+MASTER_SITES=	http://aarnet.dl.osdn.jp/azpainter/67218/ \
+		http://acc.dl.osdn.jp/azpainter/67218/ \
+		http://c3sl.dl.osdn.jp/azpainter/67218/ \
 		http://cznic.dl.osdn.jp/azpainter/67218/ \
 		http://gigenet.dl.osdn.jp/azpainter/67218/ \
 		http://iij.dl.osdn.jp/azpainter/67218/ \
 		http://jaist.dl.osdn.jp/azpainter/67218/ \
+		http://master.dl.osdn.jp/azpainter/67218/ \
+		http://nchc.dl.osdn.jp/azpainter/67218/ \
 		http://onet.dl.osdn.jp/azpainter/67218/ \
 		http://osdn.dl.osdn.jp/azpainter/67218/ \
+		http://pumath.dl.osdn.jp/azpainter/67218/ \
 		http://rwthaachen.dl.osdn.jp/azpainter/67218/ \
 		http://ymu.dl.osdn.jp/azpainter/67218/
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	16-bit RGB full color painting application
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libpng.so:graphics/png
 
 USES=		desktop-file-utils jpeg localbase shared-mime-info tar:bzip2
 USE_XORG=	x11 xext xi
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-freetype-dir=${LOCALBASE}/include/freetype2
 
 PORTDOCS=	AUTHORS ChangeLog NEWS README README.ja manual
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
 
-pre-build:
+post-patch-NLS-off:
+	@${REINPLACE_CMD} -e '/install-dist_trdataDATA$$/d' \
+		${WRKSRC}/data/Makefile.in
+
+pre-build-NLS-on:
 	cd ${WRKSRC}/translation && ${CC} ${CFLAGS} -o mtrconv mtrconv.c
 .for lang in ru uk
 	cd ${WRKSRC}/translation && ./mtrconv ${lang} ../data/tr/${lang}.mtr
 .endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${CP} -a ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/azpainter/pkg-plist b/graphics/azpainter/pkg-plist
index ba02b7f9ea99..4ead79748add 100644
--- a/graphics/azpainter/pkg-plist
+++ b/graphics/azpainter/pkg-plist
@@ -1,166 +1,166 @@
 bin/azpainter
 %%DATADIR%%/brush/circle1.png
 %%DATADIR%%/brush/ellipse.png
 %%DATADIR%%/brush-2.dat
 %%DATADIR%%/grad.dat
 %%DATADIR%%/ib_brushedit.png
 %%DATADIR%%/ib_canvasview.png
 %%DATADIR%%/ib_imgviewer.png
 %%DATADIR%%/ib_layer.png
 %%DATADIR%%/ib_tool.png
 %%DATADIR%%/ib_toolbar.png
 %%DATADIR%%/ib_toolsub.png
 %%DATADIR%%/icon.png
 %%DATADIR%%/palette-2.dat
 %%DATADIR%%/sckey-2.conf
 %%DATADIR%%/texture/tone300/05L01.png
 %%DATADIR%%/texture/tone300/05L02.png
 %%DATADIR%%/texture/tone300/05L05.png
 %%DATADIR%%/texture/tone300/05L10.png
 %%DATADIR%%/texture/tone300/05L20.png
 %%DATADIR%%/texture/tone300/08L01.png
 %%DATADIR%%/texture/tone300/08L02.png
 %%DATADIR%%/texture/tone300/08L05.png
 %%DATADIR%%/texture/tone300/10L02.png
 %%DATADIR%%/texture/tone300/10L05.png
 %%DATADIR%%/texture/tone300/10L10.png
 %%DATADIR%%/texture/tone300/10L20.png
 %%DATADIR%%/texture/tone300/10L30.png
 %%DATADIR%%/texture/tone300/15L02.png
 %%DATADIR%%/texture/tone300/15L05.png
 %%DATADIR%%/texture/tone300/15L10.png
 %%DATADIR%%/texture/tone300/15L20.png
 %%DATADIR%%/texture/tone300/20L02.png
 %%DATADIR%%/texture/tone300/20L05.png
 %%DATADIR%%/texture/tone300/20L10.png
 %%DATADIR%%/texture/tone300/20L20.png
 %%DATADIR%%/texture/tone300/20L30.png
 %%DATADIR%%/texture/tone300/20L40.png
 %%DATADIR%%/texture/tone300/30L10.png
 %%DATADIR%%/texture/tone300/30L20.png
 %%DATADIR%%/texture/tone300/30L30.png
 %%DATADIR%%/texture/tone300/30L40.png
 %%DATADIR%%/texture/tone300/40L10.png
 %%DATADIR%%/texture/tone300/40L20.png
 %%DATADIR%%/texture/tone300/40L30.png
 %%DATADIR%%/texture/tone300/50L10.png
 %%DATADIR%%/texture/tone300/50L20.png
 %%DATADIR%%/texture/tone300/60L10.png
 %%DATADIR%%/texture/tone600/27.5L05.png
 %%DATADIR%%/texture/tone600/27.5L10.png
 %%DATADIR%%/texture/tone600/27.5L20.png
 %%DATADIR%%/texture/tone600/27.5L30.png
 %%DATADIR%%/texture/tone600/27.5L40.png
 %%DATADIR%%/texture/tone600/30L05.png
 %%DATADIR%%/texture/tone600/30L10.png
 %%DATADIR%%/texture/tone600/30L20.png
 %%DATADIR%%/texture/tone600/30L30.png
 %%DATADIR%%/texture/tone600/32.5L05.png
 %%DATADIR%%/texture/tone600/32.5L10.png
 %%DATADIR%%/texture/tone600/32.5L20.png
 %%DATADIR%%/texture/tone600/32.5L30.png
 %%DATADIR%%/texture/tone600/42.5L05.png
 %%DATADIR%%/texture/tone600/42.5L10.png
 %%DATADIR%%/texture/tone600/42.5L20.png
 %%DATADIR%%/texture/tone600/42.5L30.png
 %%DATADIR%%/texture/tone600/50L05.png
 %%DATADIR%%/texture/tone600/50L10.png
 %%DATADIR%%/texture/tone600/50L20.png
 %%DATADIR%%/texture/tone600/50L30.png
 %%DATADIR%%/texture/tone600/55L05.png
 %%DATADIR%%/texture/tone600/55L10.png
 %%DATADIR%%/texture/tone600/55L20.png
 %%DATADIR%%/texture/tone600/55L30.png
 %%DATADIR%%/texture/tone600/60L05.png
 %%DATADIR%%/texture/tone600/60L10.png
 %%DATADIR%%/texture/tone600/60L30.png
 %%DATADIR%%/texture/tone600/65L05.png
 %%DATADIR%%/texture/tone600/65L10.png
 %%DATADIR%%/texture/tone600/85L05.png
 %%DATADIR%%/texture/various/brick.png
 %%DATADIR%%/texture/various/check1.png
 %%DATADIR%%/texture/various/check2.png
 %%DATADIR%%/texture/various/check3.png
 %%DATADIR%%/texture/various/check4.png
 %%DATADIR%%/texture/various/check5.png
 %%DATADIR%%/texture/various/check6.png
 %%DATADIR%%/texture/various/cross.png
 %%DATADIR%%/texture/various/dot01.png
 %%DATADIR%%/texture/various/dot02.png
 %%DATADIR%%/texture/various/dot03.png
 %%DATADIR%%/texture/various/dot04.png
 %%DATADIR%%/texture/various/dot05.png
 %%DATADIR%%/texture/various/dot06.png
 %%DATADIR%%/texture/various/dot07.png
 %%DATADIR%%/texture/various/dot08.png
 %%DATADIR%%/texture/various/dot09.png
 %%DATADIR%%/texture/various/dot10.png
 %%DATADIR%%/texture/various/flower.png
 %%DATADIR%%/texture/various/gradient1.png
 %%DATADIR%%/texture/various/gradient2.png
 %%DATADIR%%/texture/various/grid01.png
 %%DATADIR%%/texture/various/grid02.png
 %%DATADIR%%/texture/various/grid03.png
 %%DATADIR%%/texture/various/grid04.png
 %%DATADIR%%/texture/various/grid05.png
 %%DATADIR%%/texture/various/grid06.png
 %%DATADIR%%/texture/various/grid07.png
 %%DATADIR%%/texture/various/grid08.png
 %%DATADIR%%/texture/various/gridsl1.png
 %%DATADIR%%/texture/various/gridsl2.png
 %%DATADIR%%/texture/various/heart.png
 %%DATADIR%%/texture/various/horz1.png
 %%DATADIR%%/texture/various/horz2.png
 %%DATADIR%%/texture/various/horz3.png
 %%DATADIR%%/texture/various/horz4.png
 %%DATADIR%%/texture/various/horz5.png
 %%DATADIR%%/texture/various/horz6.png
 %%DATADIR%%/texture/various/horz7.png
 %%DATADIR%%/texture/various/jag1.png
 %%DATADIR%%/texture/various/jag2.png
 %%DATADIR%%/texture/various/slant1.png
 %%DATADIR%%/texture/various/slant2.png
 %%DATADIR%%/texture/various/slant3.png
 %%DATADIR%%/texture/various/slant4.png
 %%DATADIR%%/texture/various/slant5.png
 %%DATADIR%%/texture/various/slant6.png
 %%DATADIR%%/texture/various/slant7.png
 %%DATADIR%%/texture/various/slant8.png
 %%DATADIR%%/texture/various/speed_horz.png
 %%DATADIR%%/texture/various/speed_vert.png
 %%DATADIR%%/texture/various/square_dot.png
 %%DATADIR%%/texture/various/star.png
 %%DATADIR%%/texture/various/tone00.png
 %%DATADIR%%/texture/various/tone01.png
 %%DATADIR%%/texture/various/tone02.png
 %%DATADIR%%/texture/various/tone03.png
 %%DATADIR%%/texture/various/tone04.png
 %%DATADIR%%/texture/various/tone05.png
 %%DATADIR%%/texture/various/tone06.png
 %%DATADIR%%/texture/various/tone07.png
 %%DATADIR%%/texture/various/tone08.png
 %%DATADIR%%/texture/various/tone09.png
 %%DATADIR%%/texture/various/tone10.png
 %%DATADIR%%/texture/various/triangle1.png
 %%DATADIR%%/texture/various/triangle2.png
 %%DATADIR%%/texture/various/vert1.png
 %%DATADIR%%/texture/various/vert2.png
 %%DATADIR%%/texture/various/vert3.png
 %%DATADIR%%/texture/various/vert4.png
 %%DATADIR%%/texture/various/vert5.png
 %%DATADIR%%/texture/various/vert6.png
 %%DATADIR%%/texture/various/vert7.png
 %%DATADIR%%/texture/various/wall.png
 %%DATADIR%%/texture/various/white_circle.png
 %%DATADIR%%/texture/various/x-mark.png
-%%DATADIR%%/tr/en.mtr
-%%DATADIR%%/tr/ja.mtr
-%%DATADIR%%/tr/pt_BR.mtr
-%%DATADIR%%/tr/ru.mtr
-%%DATADIR%%/tr/uk.mtr
+%%NLS%%%%DATADIR%%/tr/en.mtr
+%%NLS%%%%DATADIR%%/tr/ja.mtr
+%%NLS%%%%DATADIR%%/tr/pt_BR.mtr
+%%NLS%%%%DATADIR%%/tr/ru.mtr
+%%NLS%%%%DATADIR%%/tr/uk.mtr
 share/applications/azpainter.desktop
 share/icons/hicolor/48x48/apps/application-x-azpainter-apd.png
 share/icons/hicolor/48x48/apps/azpainter.png
 share/icons/hicolor/scalable/apps/application-x-azpainter-apd.svg
 share/icons/hicolor/scalable/apps/azpainter.svg
 share/mime/packages/azpainter.xml