12 files changed, 159 insertions, 559 deletions

diff --git a/devel/etl/Makefile b/devel/etl/Makefile
index c7ce321ddbce..cd1129711e26 100644
--- a/devel/etl/Makefile
+++ b/devel/etl/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	etl
-PORTVERSION=	0.04.19
-PORTREVISION=	1
+PORTVERSION=	1.2.1
 CATEGORIES=	devel lang
 MASTER_SITES=	SF/synfig/releases/${SYNFIG_VERSION}/source/
 DISTNAME=	ETL-${PORTVERSION}
@@ -17,7 +16,7 @@ NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
-SYNFIG_VERSION=	1.0.2
+SYNFIG_VERSION=	1.2.1
 
 USES=		pathfix pkgconfig
 GNU_CONFIGURE=	yes
diff --git a/devel/etl/distinfo b/devel/etl/distinfo
index 12723b3fee18..b203adb12664 100644
--- a/devel/etl/distinfo
+++ b/devel/etl/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ETL-0.04.19.tar.gz) = ba944c1a07fd321488f9d034467931b8ba9e48454abef502a633ff4835380c1c
-SIZE (ETL-0.04.19.tar.gz) = 371852
+TIMESTAMP = 1515222748
+SHA256 (ETL-1.2.1.tar.gz) = 754d88c5ddfdef54f27d1e17f62a902eb9f09fbe7ef9aebded34541b4c1700e6
+SIZE (ETL-1.2.1.tar.gz) = 373906
diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile
index bafaf475a818..530007461022 100644
--- a/devel/synfig/Makefile
+++ b/devel/synfig/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	synfig
-PORTVERSION=	1.0.2
-PORTREVISION=	12
+PORTVERSION=	1.2.1
 CATEGORIES=	devel graphics multimedia
 MASTER_SITES=	SF/${PORTNAME}/releases/${PORTVERSION}/source
 
@@ -12,29 +11,29 @@ COMMENT=	Vector based 2D animation package
 
 LICENSE=	GPLv2+
 
-BUILD_DEPENDS=	etl>=0.04.19_1:devel/etl
-LIB_DEPENDS=	libboost_program_options.so:devel/boost-libs \
-		libltdl.so:devel/libltdl \
-		libMagickWand-6.so:graphics/ImageMagick \
+BUILD_DEPENDS=	etl>=1.2.1:devel/etl
+LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
 		libIlmImf.so:graphics/OpenEXR \
+		libMagickWand-6.so:graphics/ImageMagick \
+		libavcodec.so:multimedia/ffmpeg \
+		libboost_program_options.so:devel/boost-libs \
+		libdv.so:multimedia/libdv \
+		libfftw3.so:math/fftw3 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl \
 		libmlt.so:multimedia/mlt \
 		libmng.so:graphics/libmng \
 		libpng.so:graphics/png \
-		libtiff.so:graphics/tiff \
-		libavcodec.so:multimedia/ffmpeg \
-		libdv.so:multimedia/libdv
+		libtiff.so:graphics/tiff
 
-USES=		compiler:c++11-lang iconv jpeg libtool pathfix pkgconfig
+USES=		compiler:c++11-lang gmake iconv jpeg libtool localbase pathfix pkgconfig
 USE_CXXSTD=	c++11
-USE_GNOME=	cairo glibmm libxml++26
+USE_GNOME=	cairo glibmm intltool libxml++26 pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG}
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
-WRKSRC=		${WRKDIR}/${DISTNAME}
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes
@@ -45,24 +44,9 @@ NLS_CONFIGURE_ENABLE=	nls
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
-		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 s|el_GR|el| ; \
-		 s|ja_JP|ja| ; \
-		 s|no_NO|no| ; \
-		 s|pl_PL|pl| ; \
-		 s|sk_SK|sk| ; \
-		 s|sv_SE|sv|' \
+		 /optimization_flags/s|CFLAGS=|#CFLAGS=|' \
 		${WRKSRC}/configure
 
-post-build:
-# FIX LC_MESSAGES
-	@${LN} -sf el_GR.gmo ${WRKSRC}/po/el.gmo
-	@${LN} -sf ja_JP.gmo ${WRKSRC}/po/ja.gmo
-	@${LN} -sf no_NO.gmo ${WRKSRC}/po/no.gmo
-	@${LN} -sf pl_PL.gmo ${WRKSRC}/po/pl.gmo
-	@${LN} -sf sk_SK.gmo ${WRKSRC}/po/sk.gmo
-	@${LN} -sf sv_SE.gmo ${WRKSRC}/po/sv.gmo
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in AUTHORS ChangeLog INSTALL NEWS README TODO
diff --git a/devel/synfig/distinfo b/devel/synfig/distinfo
index 1b0d0686d26d..27394f177514 100644
--- a/devel/synfig/distinfo
+++ b/devel/synfig/distinfo
@@ -1,2 +1,3 @@
-SHA256 (synfig-1.0.2.tar.gz) = 34cdf9eac90aadea29fb2997e82da1c32713ab02940f7c8873330f894e167fb4
-SIZE (synfig-1.0.2.tar.gz) = 4617938
+TIMESTAMP = 1515222796
+SHA256 (synfig-1.2.1.tar.gz) = 4d8bada4e99f05ee16b4256fc3f5a551d00a745347944837bbd6fa158b57e457
+SIZE (synfig-1.2.1.tar.gz) = 4913740
diff --git a/devel/synfig/files/patch-src__synfig__main.cpp b/devel/synfig/files/patch-src__synfig__main.cpp
index 046bd7cea9c7..397e68956e17 100644
--- a/devel/synfig/files/patch-src__synfig__main.cpp
+++ b/devel/synfig/files/patch-src__synfig__main.cpp
@@ -9,29 +9,6 @@
  	std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
  #endif
  #endif
-@@ -289,17 +289,17 @@ synfig::Main::Main(const synfig::String& basepath,Prog
- 		locations.push_back(getenv("SYNFIG_MODULE_LIST"));
- 	else
- 	{
--		locations.push_back("./"MODULE_LIST_FILENAME);
-+		locations.push_back("./" MODULE_LIST_FILENAME);
- 		if(getenv("HOME"))
- 			locations.push_back(strprintf("%s/.local/share/synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
- 	#ifdef SYSCONFDIR
--		locations.push_back(SYSCONFDIR"/"MODULE_LIST_FILENAME);
-+		locations.push_back(SYSCONFDIR "/" MODULE_LIST_FILENAME);
- 	#endif
- 		locations.push_back(prefix+ETL_DIRECTORY_SEPARATOR+"etc"+ETL_DIRECTORY_SEPARATOR+MODULE_LIST_FILENAME);
--		locations.push_back("/usr/local/etc/"MODULE_LIST_FILENAME);
-+		locations.push_back("/usr/local/etc/" MODULE_LIST_FILENAME);
- 	#ifdef __APPLE__
--		locations.push_back("/Library/Frameworks/synfig.framework/Resources/"MODULE_LIST_FILENAME);
--		locations.push_back("/Library/Synfig/"MODULE_LIST_FILENAME);
-+		locations.push_back("/Library/Frameworks/synfig.framework/Resources/" MODULE_LIST_FILENAME);
-+		locations.push_back("/Library/Synfig/" MODULE_LIST_FILENAME);
- 		if(getenv("HOME"))
- 			locations.push_back(strprintf("%s/Library/Synfig/%s", getenv("HOME"), MODULE_LIST_FILENAME));
- 	#endif
 @@ -490,7 +490,11 @@ synfig::get_binary_path(const String &fallback_path)
  
  	/* Read from /proc/self/exe (symlink) */
diff --git a/devel/synfig/pkg-plist b/devel/synfig/pkg-plist
index 16336779c754..18134915e5f7 100644
--- a/devel/synfig/pkg-plist
+++ b/devel/synfig/pkg-plist
@@ -14,26 +14,32 @@ include/synfig-1.0/synfig/cairoimporter.h
 include/synfig-1.0/synfig/cairolistimporter.h
 include/synfig-1.0/synfig/canvas.h
 include/synfig-1.0/synfig/canvasbase.h
+include/synfig-1.0/synfig/canvasfilenaming.h
 include/synfig-1.0/synfig/color.h
 include/synfig-1.0/synfig/color/cairocolor.h
 include/synfig-1.0/synfig/color/cairocoloraccumulator.h
 include/synfig-1.0/synfig/color/color.h
 include/synfig-1.0/synfig/color/color.hpp
 include/synfig-1.0/synfig/color/coloraccumulator.h
+include/synfig-1.0/synfig/color/colormatrix.h
 include/synfig-1.0/synfig/color/common.h
 include/synfig-1.0/synfig/color/pixelformat.h
+include/synfig-1.0/synfig/complex.h
 include/synfig-1.0/synfig/context.h
 include/synfig-1.0/synfig/curve_helper.h
 include/synfig-1.0/synfig/curveset.h
 include/synfig-1.0/synfig/dashitem.h
+include/synfig-1.0/synfig/debug/debugsurface.h
+include/synfig-1.0/synfig/debug/log.h
+include/synfig-1.0/synfig/debug/measure.h
 include/synfig-1.0/synfig/distance.h
 include/synfig-1.0/synfig/exception.h
 include/synfig-1.0/synfig/filecontainer.h
-include/synfig-1.0/synfig/filecontainertemporary.h
 include/synfig-1.0/synfig/filecontainerzip.h
 include/synfig-1.0/synfig/filesystem.h
 include/synfig-1.0/synfig/filesystemgroup.h
 include/synfig-1.0/synfig/filesystemnative.h
+include/synfig-1.0/synfig/filesystemtemporary.h
 include/synfig-1.0/synfig/gamma.h
 include/synfig-1.0/synfig/general.h
 include/synfig-1.0/synfig/gradient.h
@@ -45,13 +51,16 @@ include/synfig-1.0/synfig/keyframe.h
 include/synfig-1.0/synfig/layer.h
 include/synfig-1.0/synfig/layers/layer_bitmap.h
 include/synfig-1.0/synfig/layers/layer_composite.h
+include/synfig-1.0/synfig/layers/layer_composite_fork.h
 include/synfig-1.0/synfig/layers/layer_duplicate.h
 include/synfig-1.0/synfig/layers/layer_group.h
+include/synfig-1.0/synfig/layers/layer_invisible.h
 include/synfig-1.0/synfig/layers/layer_meshtransform.h
 include/synfig-1.0/synfig/layers/layer_mime.h
 include/synfig-1.0/synfig/layers/layer_motionblur.h
 include/synfig-1.0/synfig/layers/layer_pastecanvas.h
 include/synfig-1.0/synfig/layers/layer_polygon.h
+include/synfig-1.0/synfig/layers/layer_rendering_task.h
 include/synfig-1.0/synfig/layers/layer_shape.h
 include/synfig-1.0/synfig/layers/layer_skeleton.h
 include/synfig-1.0/synfig/layers/layer_skeletondeformation.h
@@ -60,6 +69,7 @@ include/synfig-1.0/synfig/layers/layer_sound.h
 include/synfig-1.0/synfig/layers/layer_switch.h
 include/synfig-1.0/synfig/listimporter.h
 include/synfig-1.0/synfig/loadcanvas.h
+include/synfig-1.0/synfig/localization.h
 include/synfig-1.0/synfig/main.h
 include/synfig-1.0/synfig/matrix.h
 include/synfig-1.0/synfig/mesh.h
@@ -71,6 +81,7 @@ include/synfig-1.0/synfig/palette.h
 include/synfig-1.0/synfig/paramdesc.h
 include/synfig-1.0/synfig/polygon.h
 include/synfig-1.0/synfig/polynomial_root.h
+include/synfig-1.0/synfig/progresscallback.h
 include/synfig-1.0/synfig/protocol.h
 include/synfig-1.0/synfig/quick_rng.h
 include/synfig-1.0/synfig/real.h
@@ -78,8 +89,87 @@ include/synfig-1.0/synfig/rect.h
 include/synfig-1.0/synfig/releases.h
 include/synfig-1.0/synfig/renddesc.h
 include/synfig-1.0/synfig/render.h
-include/synfig-1.0/synfig/renderer.h
-include/synfig-1.0/synfig/renderersoftware.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendassociative.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendblend.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendcomposite.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendseparate.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendsplit.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerblendzero.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizercalcbounds.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlinear.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerlist.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizerpixelprocessorsplit.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersplit.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurface.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfaceconvert.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfacecreate.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfacedestroy.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizersurfaceresample.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizertransformation.h
+include/synfig-1.0/synfig/rendering/common/optimizer/optimizertransformationaffine.h
+include/synfig-1.0/synfig/rendering/common/surfacememoryreadwrapper.h
+include/synfig-1.0/synfig/rendering/common/task/taskblend.h
+include/synfig-1.0/synfig/rendering/common/task/taskblur.h
+include/synfig-1.0/synfig/rendering/common/task/taskcallback.h
+include/synfig-1.0/synfig/rendering/common/task/taskcomposite.h
+include/synfig-1.0/synfig/rendering/common/task/taskcontour.h
+include/synfig-1.0/synfig/rendering/common/task/tasklayer.h
+include/synfig-1.0/synfig/rendering/common/task/tasklist.h
+include/synfig-1.0/synfig/rendering/common/task/taskmesh.h
+include/synfig-1.0/synfig/rendering/common/task/taskpixelcolormatrix.h
+include/synfig-1.0/synfig/rendering/common/task/taskpixelgamma.h
+include/synfig-1.0/synfig/rendering/common/task/taskpixelprocessor.h
+include/synfig-1.0/synfig/rendering/common/task/tasksolid.h
+include/synfig-1.0/synfig/rendering/common/task/tasksplittable.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurface.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurfaceconvert.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurfacecreate.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurfacedestroy.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurfaceempty.h
+include/synfig-1.0/synfig/rendering/common/task/tasksurfaceresample.h
+include/synfig-1.0/synfig/rendering/common/task/tasktransformableaffine.h
+include/synfig-1.0/synfig/rendering/common/task/tasktransformation.h
+include/synfig-1.0/synfig/rendering/common/task/tasktransformationpass.h
+include/synfig-1.0/synfig/rendering/optimizer.h
+include/synfig-1.0/synfig/rendering/primitive/affinetransformation.h
+include/synfig-1.0/synfig/rendering/primitive/blur.h
+include/synfig-1.0/synfig/rendering/primitive/contour.h
+include/synfig-1.0/synfig/rendering/primitive/mesh.h
+include/synfig-1.0/synfig/rendering/primitive/polyspan.h
+include/synfig-1.0/synfig/rendering/primitive/transformation.h
+include/synfig-1.0/synfig/rendering/renderer.h
+include/synfig-1.0/synfig/rendering/renderqueue.h
+include/synfig-1.0/synfig/rendering/resource.h
+include/synfig-1.0/synfig/rendering/software/function/array.h
+include/synfig-1.0/synfig/rendering/software/function/blur.h
+include/synfig-1.0/synfig/rendering/software/function/blurtemplates.h
+include/synfig-1.0/synfig/rendering/software/function/contour.h
+include/synfig-1.0/synfig/rendering/software/function/fft.h
+include/synfig-1.0/synfig/rendering/software/function/packedsurface.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizerblendsw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizerblursw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizercontoursw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizerlayersw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizermeshsw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelcolormatrixsw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizerpixelgammasw.h
+include/synfig-1.0/synfig/rendering/software/optimizer/optimizersurfaceresamplesw.h
+include/synfig-1.0/synfig/rendering/software/renderersafe.h
+include/synfig-1.0/synfig/rendering/software/renderersw.h
+include/synfig-1.0/synfig/rendering/software/surfacesw.h
+include/synfig-1.0/synfig/rendering/software/surfaceswpacked.h
+include/synfig-1.0/synfig/rendering/software/task/taskblendsw.h
+include/synfig-1.0/synfig/rendering/software/task/taskblursw.h
+include/synfig-1.0/synfig/rendering/software/task/taskcontoursw.h
+include/synfig-1.0/synfig/rendering/software/task/taskexpandsurfacesw.h
+include/synfig-1.0/synfig/rendering/software/task/tasklayersw.h
+include/synfig-1.0/synfig/rendering/software/task/taskmeshsw.h
+include/synfig-1.0/synfig/rendering/software/task/taskpixelcolormatrixsw.h
+include/synfig-1.0/synfig/rendering/software/task/taskpixelgammasw.h
+include/synfig-1.0/synfig/rendering/software/task/tasksurfaceresamplesw.h
+include/synfig-1.0/synfig/rendering/software/task/tasksw.h
+include/synfig-1.0/synfig/rendering/surface.h
+include/synfig-1.0/synfig/rendering/task.h
 include/synfig-1.0/synfig/rendermethod.h
 include/synfig-1.0/synfig/savecanvas.h
 include/synfig-1.0/synfig/segment.h
@@ -106,10 +196,13 @@ include/synfig-1.0/synfig/types.h
 include/synfig-1.0/synfig/uniqueid.h
 include/synfig-1.0/synfig/value.h
 include/synfig-1.0/synfig/valuenode.h
+include/synfig-1.0/synfig/valuenode_registry.h
 include/synfig-1.0/synfig/valuenodes/valuenode_add.h
 include/synfig-1.0/synfig/valuenodes/valuenode_and.h
 include/synfig-1.0/synfig/valuenodes/valuenode_anglestring.h
 include/synfig-1.0/synfig/valuenodes/valuenode_animated.h
+include/synfig-1.0/synfig/valuenodes/valuenode_animatedfile.h
+include/synfig-1.0/synfig/valuenodes/valuenode_animatedinterface.h
 include/synfig-1.0/synfig/valuenodes/valuenode_atan2.h
 include/synfig-1.0/synfig/valuenodes/valuenode_average.h
 include/synfig-1.0/synfig/valuenodes/valuenode_bline.h
@@ -212,34 +305,42 @@ libdata/pkgconfig/synfig.pc
 %%NLS%%share/locale/ar/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/cs_CZ/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/da/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/de/LC_MESSAGES/synfig.mo
-%%NLS%%share/locale/el/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/el_GR/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/en_CZ/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/es/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/es_PY/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/eu_ES/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/he/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/hi_IN/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/it/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/ja_JP/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/synfig.mo
-%%NLS%%share/locale/no/LC_MESSAGES/synfig.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/no_NO/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/pl_PL/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/si/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sk_SK/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/sr_RS/LC_MESSAGES/synfig.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/synfig.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/synfig.mo
 %%NLS%%share/locale/uz@Latn/LC_MESSAGES/synfig.mo
diff --git a/graphics/synfigstudio/Makefile b/graphics/synfigstudio/Makefile
index b02a4e1a6e52..b07d5f4af2cf 100644
--- a/graphics/synfigstudio/Makefile
+++ b/graphics/synfigstudio/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	synfigstudio
-PORTVERSION=	1.0.2
-PORTREVISION=	3
+PORTVERSION=	1.2.1
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	SF/synfig/releases/${PORTVERSION}/source
 
@@ -13,11 +12,18 @@ COMMENT=	Vector-based 2D animation software package
 LICENSE=	GPLv2+
 
 BUILD_DEPENDS=	etl>=0.04.19_1:devel/etl
-LIB_DEPENDS=	libsynfig.so:devel/synfig
+LIB_DEPENDS=	libHalf.so:graphics/ilmbase \
+		libIlmImf.so:graphics/OpenEXR \
+		libMagick++-6.so:graphics/ImageMagick \
+		libfftw3.so:math/fftw3 \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libmlt.so:multimedia/mlt \
+		libsynfig.so:devel/synfig
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
-USES=		compiler:c++11-lang desktop-file-utils gmake libtool pathfix \
-		pkgconfig shared-mime-info
+USES=		compiler:c++11-lang desktop-file-utils gmake libtool localbase \
+		pathfix pkgconfig shared-mime-info
 USE_CXXSTD=	c++11
 USE_GNOME=	gtkmm30 intltool
 GNU_CONFIGURE=	yes
@@ -26,9 +32,6 @@ INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
 OPTIONS_DEFINE=	DOCS JACK NLS
 OPTIONS_SUB=	yes
 
@@ -41,60 +44,8 @@ NLS_CONFIGURE_ENABLE=	nls
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/optimization_flags/s|CXXFLAGS=|#CXXFLAGS=| ; \
-		 /optimization_flags/s|CFLAGS=|#CFLAGS=| ; \
-		 /DATADIRNAME/s|lib|share|' \
+		 /optimization_flags/s|CFLAGS=|#CFLAGS=|' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e \
-		's|el_GR|el| ; \
-		 s|ja_JP|ja| ; \
-		 s|no_NO|no| ; \
-		 s|pl_PL|pl| ; \
-		 s|sk_SK|sk| ; \
-		 s|sv_SE|sv|' \
-		${WRKSRC}/po/LINGUAS
-	@${REINPLACE_CMD} -e \
-		's|^#include <sigc++/hide.h>$$|#include <sigc++/sigc++.h>| ; \
-		 s|^#include <sigc++/object.h>$$|#include <sigc++/sigc++.h>| ; \
-		 s|^#include <sigc++/retype.h>$$|#include <sigc++/sigc++.h>|' \
-		${WRKSRC}/src/gui/canvasview.cpp \
-		${WRKSRC}/src/gui/compview.cpp \
-		${WRKSRC}/src/gui/docks/dock_children.cpp \
-		${WRKSRC}/src/gui/docks/dock_curves.cpp \
-		${WRKSRC}/src/gui/docks/dock_history.cpp \
-		${WRKSRC}/src/gui/docks/dock_keyframes.cpp \
-		${WRKSRC}/src/gui/docks/dock_layergroups.cpp \
-		${WRKSRC}/src/gui/docks/dock_layers.cpp \
-		${WRKSRC}/src/gui/docks/dock_metadata.cpp \
-		${WRKSRC}/src/gui/docks/dock_params.cpp \
-		${WRKSRC}/src/gui/docks/dock_timetrack.cpp \
-		${WRKSRC}/src/gui/docks/dock_toolbox.cpp \
-		${WRKSRC}/src/gui/docks/dockable.cpp \
-		${WRKSRC}/src/gui/docks/dockdialog.cpp \
-		${WRKSRC}/src/gui/docks/dockmanager.h \
-		${WRKSRC}/src/gui/duck.h \
-		${WRKSRC}/src/gui/duckmatic.cpp \
-		${WRKSRC}/src/gui/duckmatic.h \
-		${WRKSRC}/src/gui/instance.cpp \
-		${WRKSRC}/src/gui/instance.h \
-		${WRKSRC}/src/gui/states/state_stroke.h \
-		${WRKSRC}/src/gui/states/state_zoom.cpp \
-		${WRKSRC}/src/gui/widgets/widget_curves.cpp \
-		${WRKSRC}/src/gui/workarea.cpp \
-		${WRKSRC}/src/gui/workarearenderer/workarearenderer.h \
-		${WRKSRC}/src/synfigapp/action_system.h \
-		${WRKSRC}/src/synfigapp/canvasinterface.h \
-		${WRKSRC}/src/synfigapp/instance.h \
-		${WRKSRC}/src/synfigapp/main.h \
-		${WRKSRC}/src/synfigapp/uimanager.h
-
-pre-build:
-# FIX LC_MESSAGES
-	@${LN} -sf el_GR.po ${WRKSRC}/po/el.po
-	@${LN} -sf ja_JP.po ${WRKSRC}/po/ja.po
-	@${LN} -sf no_NO.po ${WRKSRC}/po/no.po
-	@${LN} -sf pl_PL.po ${WRKSRC}/po/pl.po
-	@${LN} -sf sk_SK.po ${WRKSRC}/po/sk.po
-	@${LN} -sf sv_SE.po ${WRKSRC}/po/sv.po
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/graphics/synfigstudio/distinfo b/graphics/synfigstudio/distinfo
index 9d2377b808da..100ee533c445 100644
--- a/graphics/synfigstudio/distinfo
+++ b/graphics/synfigstudio/distinfo
@@ -1,2 +1,3 @@
-SHA256 (synfigstudio-1.0.2.tar.gz) = e44584aa0b561f374edcfb792eb601083c7e7e111d68d6fe0356def9682347f5
-SIZE (synfigstudio-1.0.2.tar.gz) = 5271116
+TIMESTAMP = 1515222401
+SHA256 (synfigstudio-1.2.1.tar.gz) = 1a97875e0039895604085649bcd30cf0d6165f4c865299ca13d45d2dfbfab05d
+SIZE (synfigstudio-1.2.1.tar.gz) = 5687045
diff --git a/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp b/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp
deleted file mode 100644
index a9fcc5dcab32..000000000000
--- a/graphics/synfigstudio/files/patch-src_gui_dialogs_about.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gui/dialogs/about.cpp.orig	2017-04-02 22:45:26 UTC
-+++ src/gui/dialogs/about.cpp
-@@ -204,7 +204,7 @@ About::About()
- 	imagepath+=ETL_DIRECTORY_SEPARATOR;
- 
- 	Gtk::Image *Logo = manage(new class Gtk::Image());
--	Logo->set(imagepath+"synfig_icon."IMAGE_EXT);
-+	Logo->set(imagepath+"synfig_icon." IMAGE_EXT);
- 	set_logo(Logo->get_pixbuf());
- 
- #ifdef SHOW_EXTRA_INFO
diff --git a/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp b/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp
deleted file mode 100644
index 4ff7871671d1..000000000000
--- a/graphics/synfigstudio/files/patch-src_gui_iconcontroller.cpp
+++ /dev/null
@@ -1,389 +0,0 @@
---- src/gui/iconcontroller.cpp.orig	2017-04-02 22:43:26 UTC
-+++ src/gui/iconcontroller.cpp
-@@ -134,213 +134,213 @@ IconController::init_icons(const synfig::String& path_
- 	Gtk::Stock::add(stock_##name);
- 
- 	// Types
--	INIT_STOCK_ICON(type_bool,"type_bool_icon."IMAGE_EXT,_("Bool"));
--	INIT_STOCK_ICON(type_integer,"type_integer_icon."IMAGE_EXT,_("Integer"));
--	INIT_STOCK_ICON(type_angle,"type_angle_icon."IMAGE_EXT,_("Angle"));
--	INIT_STOCK_ICON(type_time,"type_time_icon."IMAGE_EXT,_("Time"));
--	INIT_STOCK_ICON(type_real,"type_real_icon."IMAGE_EXT,_("Real"));
--	INIT_STOCK_ICON(type_vector,"type_vector_icon."IMAGE_EXT,_("Vector"));
--	INIT_STOCK_ICON(type_color,"type_color_icon."IMAGE_EXT,_("Color"));
--	INIT_STOCK_ICON(type_segment,"type_segment_icon."IMAGE_EXT,_("Segment"));
--	INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon."IMAGE_EXT,_("Spline Point"));
--	INIT_STOCK_ICON(type_list,"type_list_icon."IMAGE_EXT,_("List"));
--	INIT_STOCK_ICON(type_string,"type_string_icon."IMAGE_EXT,_("String"));
--	INIT_STOCK_ICON(type_canvas,"type_canvas_icon."IMAGE_EXT,_("Canvas"));
--	INIT_STOCK_ICON(type_gradient,"type_gradient_icon."IMAGE_EXT,_("Gradient"))
-+	INIT_STOCK_ICON(type_bool,"type_bool_icon." IMAGE_EXT,_("Bool"));
-+	INIT_STOCK_ICON(type_integer,"type_integer_icon." IMAGE_EXT,_("Integer"));
-+	INIT_STOCK_ICON(type_angle,"type_angle_icon." IMAGE_EXT,_("Angle"));
-+	INIT_STOCK_ICON(type_time,"type_time_icon." IMAGE_EXT,_("Time"));
-+	INIT_STOCK_ICON(type_real,"type_real_icon." IMAGE_EXT,_("Real"));
-+	INIT_STOCK_ICON(type_vector,"type_vector_icon." IMAGE_EXT,_("Vector"));
-+	INIT_STOCK_ICON(type_color,"type_color_icon." IMAGE_EXT,_("Color"));
-+	INIT_STOCK_ICON(type_segment,"type_segment_icon." IMAGE_EXT,_("Segment"));
-+	INIT_STOCK_ICON(type_blinepoint,"type_splinepoint_icon." IMAGE_EXT,_("Spline Point"));
-+	INIT_STOCK_ICON(type_list,"type_list_icon." IMAGE_EXT,_("List"));
-+	INIT_STOCK_ICON(type_string,"type_string_icon." IMAGE_EXT,_("String"));
-+	INIT_STOCK_ICON(type_canvas,"type_canvas_icon." IMAGE_EXT,_("Canvas"));
-+	INIT_STOCK_ICON(type_gradient,"type_gradient_icon." IMAGE_EXT,_("Gradient"))
- 
- 	// ToolBox Tools
--	INIT_STOCK_ICON(normal,"tool_normal_icon."IMAGE_EXT,_("Transform Tool"));
--	INIT_STOCK_ICON(polygon,"tool_polyline_icon."IMAGE_EXT,_("Polygon Tool"));
--	INIT_STOCK_ICON(bline,"tool_spline_icon."IMAGE_EXT,_("Spline Tool"));
--	INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon."IMAGE_EXT,_("Eyedrop Tool"));
--	INIT_STOCK_ICON(fill,"tool_fill_icon."IMAGE_EXT,_("Fill Tool"));
--	INIT_STOCK_ICON(draw,"tool_draw_icon."IMAGE_EXT,_("Draw Tool"));
--	INIT_STOCK_ICON(lasso,"tool_cutout_icon."IMAGE_EXT,_("Cutout Tool"));
--	INIT_STOCK_ICON(brush,"tool_brush_icon."IMAGE_EXT,_("Brush Tool"));
--	INIT_STOCK_ICON(sketch,"tool_sketch_icon."IMAGE_EXT,_("Sketch Tool"));
--	INIT_STOCK_ICON(circle,"tool_circle_icon."IMAGE_EXT,_("Circle Tool"));
--	INIT_STOCK_ICON(rectangle,"tool_rectangle_icon."IMAGE_EXT,_("Rectangle Tool"));
--	INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon."IMAGE_EXT,_("SmoothMove Tool"));
--	INIT_STOCK_ICON(rotate,"tool_rotate_icon."IMAGE_EXT,"Rotate Tool");
--	INIT_STOCK_ICON(width,"tool_width_icon."IMAGE_EXT,_("Width Tool"));
--	INIT_STOCK_ICON(scale,"tool_scale_icon."IMAGE_EXT,"Scale Tool");
--	INIT_STOCK_ICON(zoom,"tool_zoom_icon."IMAGE_EXT,_("Zoom Tool"));
--	INIT_STOCK_ICON(mirror,"tool_mirror_icon."IMAGE_EXT,_("Mirror Tool"));
--	INIT_STOCK_ICON(text,"tool_text_icon."IMAGE_EXT,"Text Tool");
--	INIT_STOCK_ICON(gradient,"tool_gradient_icon."IMAGE_EXT,_("Gradient Tool"));
--	INIT_STOCK_ICON(star,"tool_star_icon."IMAGE_EXT,_("Star Tool"));
-+	INIT_STOCK_ICON(normal,"tool_normal_icon." IMAGE_EXT,_("Transform Tool"));
-+	INIT_STOCK_ICON(polygon,"tool_polyline_icon." IMAGE_EXT,_("Polygon Tool"));
-+	INIT_STOCK_ICON(bline,"tool_spline_icon." IMAGE_EXT,_("Spline Tool"));
-+	INIT_STOCK_ICON(eyedrop,"tool_eyedrop_icon." IMAGE_EXT,_("Eyedrop Tool"));
-+	INIT_STOCK_ICON(fill,"tool_fill_icon." IMAGE_EXT,_("Fill Tool"));
-+	INIT_STOCK_ICON(draw,"tool_draw_icon." IMAGE_EXT,_("Draw Tool"));
-+	INIT_STOCK_ICON(lasso,"tool_cutout_icon." IMAGE_EXT,_("Cutout Tool"));
-+	INIT_STOCK_ICON(brush,"tool_brush_icon." IMAGE_EXT,_("Brush Tool"));
-+	INIT_STOCK_ICON(sketch,"tool_sketch_icon." IMAGE_EXT,_("Sketch Tool"));
-+	INIT_STOCK_ICON(circle,"tool_circle_icon." IMAGE_EXT,_("Circle Tool"));
-+	INIT_STOCK_ICON(rectangle,"tool_rectangle_icon." IMAGE_EXT,_("Rectangle Tool"));
-+	INIT_STOCK_ICON(smooth_move,"tool_smooth_move_icon." IMAGE_EXT,_("SmoothMove Tool"));
-+	INIT_STOCK_ICON(rotate,"tool_rotate_icon." IMAGE_EXT,"Rotate Tool");
-+	INIT_STOCK_ICON(width,"tool_width_icon." IMAGE_EXT,_("Width Tool"));
-+	INIT_STOCK_ICON(scale,"tool_scale_icon." IMAGE_EXT,"Scale Tool");
-+	INIT_STOCK_ICON(zoom,"tool_zoom_icon." IMAGE_EXT,_("Zoom Tool"));
-+	INIT_STOCK_ICON(mirror,"tool_mirror_icon." IMAGE_EXT,_("Mirror Tool"));
-+	INIT_STOCK_ICON(text,"tool_text_icon." IMAGE_EXT,"Text Tool");
-+	INIT_STOCK_ICON(gradient,"tool_gradient_icon." IMAGE_EXT,_("Gradient Tool"));
-+	INIT_STOCK_ICON(star,"tool_star_icon." IMAGE_EXT,_("Star Tool"));
- 	// ToolBox Others
--	INIT_STOCK_ICON(reset_colors,"reset_colors_icon."IMAGE_EXT,_("Reset Colors"));
--	INIT_STOCK_ICON(swap_colors,"swap_colors_icon."IMAGE_EXT,_("Swap Colors"));
--	INIT_STOCK_ICON(value_node,"valuenode_icon."IMAGE_EXT,_("ValueNode"));
--	INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon."IMAGE_EXT,_("ValueNode Forbid Animation"));
--	INIT_STOCK_ICON(rename,"rename_icon."IMAGE_EXT,_("Rename"));
--	INIT_STOCK_ICON(canvas,"canvas_icon."IMAGE_EXT,_("Canvas"));
--	INIT_STOCK_ICON(canvas_new,"canvas_icon."IMAGE_EXT,_("New Canvas"));
-+	INIT_STOCK_ICON(reset_colors,"reset_colors_icon." IMAGE_EXT,_("Reset Colors"));
-+	INIT_STOCK_ICON(swap_colors,"swap_colors_icon." IMAGE_EXT,_("Swap Colors"));
-+	INIT_STOCK_ICON(value_node,"valuenode_icon." IMAGE_EXT,_("ValueNode"));
-+	INIT_STOCK_ICON(valuenode_forbidanimation,"valuenode_forbidanimation_icon." IMAGE_EXT,_("ValueNode Forbid Animation"));
-+	INIT_STOCK_ICON(rename,"rename_icon." IMAGE_EXT,_("Rename"));
-+	INIT_STOCK_ICON(canvas,"canvas_icon." IMAGE_EXT,_("Canvas"));
-+	INIT_STOCK_ICON(canvas_new,"canvas_icon." IMAGE_EXT,_("New Canvas"));
- 
- 	// Document Related Actions
--	INIT_STOCK_ICON(about,"about_icon."IMAGE_EXT,_("About"));
--	INIT_STOCK_ICON(new_doc,"action_doc_new_icon."IMAGE_EXT,_("New"));
--	INIT_STOCK_ICON(open,"action_doc_open_icon."IMAGE_EXT,_("Open"));
--	INIT_STOCK_ICON(save,"action_doc_save_icon."IMAGE_EXT,_("Save"));
--	INIT_STOCK_ICON(save_as,"action_doc_saveas_icon."IMAGE_EXT,_("Save As"));
--	INIT_STOCK_ICON(save_all,"action_doc_saveall_icon."IMAGE_EXT,_("Save All"));
--	INIT_STOCK_ICON(redo,"action_doc_redo_icon."IMAGE_EXT,_("Redo"));
--	INIT_STOCK_ICON(undo,"action_doc_undo_icon."IMAGE_EXT,_("Undo"));
-+	INIT_STOCK_ICON(about,"about_icon." IMAGE_EXT,_("About"));
-+	INIT_STOCK_ICON(new_doc,"action_doc_new_icon." IMAGE_EXT,_("New"));
-+	INIT_STOCK_ICON(open,"action_doc_open_icon." IMAGE_EXT,_("Open"));
-+	INIT_STOCK_ICON(save,"action_doc_save_icon." IMAGE_EXT,_("Save"));
-+	INIT_STOCK_ICON(save_as,"action_doc_saveas_icon." IMAGE_EXT,_("Save As"));
-+	INIT_STOCK_ICON(save_all,"action_doc_saveall_icon." IMAGE_EXT,_("Save All"));
-+	INIT_STOCK_ICON(redo,"action_doc_redo_icon." IMAGE_EXT,_("Redo"));
-+	INIT_STOCK_ICON(undo,"action_doc_undo_icon." IMAGE_EXT,_("Undo"));
- 
- 	// Layers
--	INIT_STOCK_ICON(layer,"layer_icon."IMAGE_EXT,_("Layer"));
-+	INIT_STOCK_ICON(layer,"layer_icon." IMAGE_EXT,_("Layer"));
- 	// Blur Layers
--	INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon."IMAGE_EXT,_("Blur Layer"));
--	INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon."IMAGE_EXT,_("Motion Blur Layer"));
--	INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon."IMAGE_EXT,_("Radial Blur Layer"));
-+	INIT_STOCK_ICON(layer_blur_blur,"layer_blur_blur_icon." IMAGE_EXT,_("Blur Layer"));
-+	INIT_STOCK_ICON(layer_blur_motion,"layer_blur_motion_icon." IMAGE_EXT,_("Motion Blur Layer"));
-+	INIT_STOCK_ICON(layer_blur_radial,"layer_blur_radial_icon." IMAGE_EXT,_("Radial Blur Layer"));
- 	// Distortion Layers
--	INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon."IMAGE_EXT,_("Curve Warp Layer"));
--	INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon."IMAGE_EXT,_("Inside Out Layer"));
--	INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon."IMAGE_EXT,_("Noise Distort Layer"));
--	INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon."IMAGE_EXT,_("Spherize Layer"));
--	INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon."IMAGE_EXT,_("Stretch Layer"));
--	INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon."IMAGE_EXT,_("Twirl Layer"));
--	INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon."IMAGE_EXT,_("Warp Layer"));
-+	INIT_STOCK_ICON(layer_distortion_curvewarp,"layer_distortion_curvewarp_icon." IMAGE_EXT,_("Curve Warp Layer"));
-+	INIT_STOCK_ICON(layer_distortion_insideout,"layer_distortion_insideout_icon." IMAGE_EXT,_("Inside Out Layer"));
-+	INIT_STOCK_ICON(layer_distortion_noise,"layer_distortion_noise_icon." IMAGE_EXT,_("Noise Distort Layer"));
-+	INIT_STOCK_ICON(layer_distortion_spherize,"layer_distortion_spherize_icon." IMAGE_EXT,_("Spherize Layer"));
-+	INIT_STOCK_ICON(layer_distortion_stretch,"layer_distortion_stretch_icon." IMAGE_EXT,_("Stretch Layer"));
-+	INIT_STOCK_ICON(layer_distortion_twirl,"layer_distortion_twirl_icon." IMAGE_EXT,_("Twirl Layer"));
-+	INIT_STOCK_ICON(layer_distortion_warp,"layer_distortion_warp_icon." IMAGE_EXT,_("Warp Layer"));
- 	// Example Layers
--	INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon."IMAGE_EXT,_("Filled Rectangle Layer"));
--	INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon."IMAGE_EXT,_("Metallballs Layer"));
--	INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon."IMAGE_EXT,_("Simple Circle Layer"));
-+	INIT_STOCK_ICON(layer_example_filledrectangle,"layer_example_filledrectangle_icon." IMAGE_EXT,_("Filled Rectangle Layer"));
-+	INIT_STOCK_ICON(layer_example_metaballs,"layer_example_metaballs_icon." IMAGE_EXT,_("Metallballs Layer"));
-+	INIT_STOCK_ICON(layer_example_simplecircle,"layer_example_simplecircle_icon." IMAGE_EXT,_("Simple Circle Layer"));
- 	// Filter Layers
--	INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon."IMAGE_EXT,_("Clamp Layer"));
--	INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon."IMAGE_EXT,_("Color Correct Layer"));
--	INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon."IMAGE_EXT,_("Halftone 2 Layer"));
--	INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon."IMAGE_EXT,_("Halftone 3 Layer"));
--	INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon."IMAGE_EXT,_("Luma Key Layer"));
-+	INIT_STOCK_ICON(layer_filter_clamp,"layer_filter_clamp_icon." IMAGE_EXT,_("Clamp Layer"));
-+	INIT_STOCK_ICON(layer_filter_colorcorrect,"layer_filter_colorcorrect_icon." IMAGE_EXT,_("Color Correct Layer"));
-+	INIT_STOCK_ICON(layer_filter_halftone2,"layer_filter_halftone2_icon." IMAGE_EXT,_("Halftone 2 Layer"));
-+	INIT_STOCK_ICON(layer_filter_halftone3,"layer_filter_halftone3_icon." IMAGE_EXT,_("Halftone 3 Layer"));
-+	INIT_STOCK_ICON(layer_filter_lumakey,"layer_filter_lumakey_icon." IMAGE_EXT,_("Luma Key Layer"));
- 	// Fractal Layers
--	INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon."IMAGE_EXT,_("Julia Set Layer"));
--	INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon."IMAGE_EXT,_("Mandelbrot Set Layer"));
-+	INIT_STOCK_ICON(layer_fractal_julia,"layer_fractal_julia_icon." IMAGE_EXT,_("Julia Set Layer"));
-+	INIT_STOCK_ICON(layer_fractal_mandelbrot,"layer_fractal_mandelbrot_icon." IMAGE_EXT,_("Mandelbrot Set Layer"));
- 	// Geometry Layers
--	INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon."IMAGE_EXT,_("Checker Board Layer"));
--	INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon."IMAGE_EXT,_("Circle Layer"));
--	INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon."IMAGE_EXT,_("Outline Layer"));
--	INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon."IMAGE_EXT,_("Advanced Outline Layer"));
--	INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon."IMAGE_EXT,_("Polygon Layer"));
--	INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon."IMAGE_EXT,_("Rectangle Layer"));
--	INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon."IMAGE_EXT,_("Region Layer"));
--	INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon."IMAGE_EXT,_("Solid Color Layer"));
--	INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon."IMAGE_EXT,_("Star Layer"));
-+	INIT_STOCK_ICON(layer_geometry_checkerboard,"layer_geometry_checkerboard_icon." IMAGE_EXT,_("Checker Board Layer"));
-+	INIT_STOCK_ICON(layer_geometry_circle,"layer_geometry_circle_icon." IMAGE_EXT,_("Circle Layer"));
-+	INIT_STOCK_ICON(layer_geometry_outline,"layer_geometry_outline_icon." IMAGE_EXT,_("Outline Layer"));
-+	INIT_STOCK_ICON(layer_geometry_advanced_outline,"layer_geometry_advanced_outline_icon." IMAGE_EXT,_("Advanced Outline Layer"));
-+	INIT_STOCK_ICON(layer_geometry_polygon,"layer_geometry_polygon_icon." IMAGE_EXT,_("Polygon Layer"));
-+	INIT_STOCK_ICON(layer_geometry_rectangle,"layer_geometry_rectangle_icon." IMAGE_EXT,_("Rectangle Layer"));
-+	INIT_STOCK_ICON(layer_geometry_region,"layer_geometry_region_icon." IMAGE_EXT,_("Region Layer"));
-+	INIT_STOCK_ICON(layer_geometry_solidcolor,"layer_geometry_solidcolor_icon." IMAGE_EXT,_("Solid Color Layer"));
-+	INIT_STOCK_ICON(layer_geometry_star,"layer_geometry_star_icon." IMAGE_EXT,_("Star Layer"));
- 	// Gradient Layers
--	INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon."IMAGE_EXT,_("Conical Gradient Layer"));
--	INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon."IMAGE_EXT,_("Curve Gradient Layer"));
--	INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon."IMAGE_EXT,_("Noise Gradient Layer"));
--	INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon."IMAGE_EXT,_("Linear Gradient Layer"));
--	INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon."IMAGE_EXT,_("Radial Gradient Layer"));
--	INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon."IMAGE_EXT,_("Spiral Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_conical,"layer_gradient_conical_icon." IMAGE_EXT,_("Conical Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_curve,"layer_gradient_curve_icon." IMAGE_EXT,_("Curve Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_noise,"layer_gradient_noise_icon." IMAGE_EXT,_("Noise Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_linear,"layer_gradient_linear_icon." IMAGE_EXT,_("Linear Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_radial,"layer_gradient_radial_icon." IMAGE_EXT,_("Radial Gradient Layer"));
-+	INIT_STOCK_ICON(layer_gradient_spiral,"layer_gradient_spiral_icon." IMAGE_EXT,_("Spiral Gradient Layer"));
- 	// Other Layers
--	INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate Layer"));
--	INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import Image Layer"));
--	INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon."IMAGE_EXT,_("Group Layer"));
--	INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant Layer"));
--	INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon."IMAGE_EXT,_("Stroboscope Layer"));
--	INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super Sample Layer"));
--	INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon."IMAGE_EXT,_("Sound Layer"));
--	INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon."IMAGE_EXT,_("Switch Layer"));
--	INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon."IMAGE_EXT,_("Skeleton Layer"));
--	INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text Layer"));
--	INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon."IMAGE_EXT,_("Time Loop Layer"));
--	INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon."IMAGE_EXT,_("XOR Pattern Layer"));
-+	INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon." IMAGE_EXT,_("Duplicate Layer"));
-+	INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon." IMAGE_EXT,_("Import Image Layer"));
-+	INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon." IMAGE_EXT,_("Group Layer"));
-+	INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon." IMAGE_EXT,_("Plant Layer"));
-+	INIT_STOCK_ICON(layer_other_stroboscope,"layer_other_stroboscope_icon." IMAGE_EXT,_("Stroboscope Layer"));
-+	INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon." IMAGE_EXT,_("Super Sample Layer"));
-+	INIT_STOCK_ICON(layer_other_sound,"layer_other_sound_icon." IMAGE_EXT,_("Sound Layer"));
-+	INIT_STOCK_ICON(layer_other_switch,"layer_other_switch_icon." IMAGE_EXT,_("Switch Layer"));
-+	INIT_STOCK_ICON(layer_other_skeleton,"layer_other_skeleton_icon." IMAGE_EXT,_("Skeleton Layer"));
-+	INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon." IMAGE_EXT,_("Text Layer"));
-+	INIT_STOCK_ICON(layer_other_timeloop,"layer_other_timeloop_icon." IMAGE_EXT,_("Time Loop Layer"));
-+	INIT_STOCK_ICON(layer_other_xorpattern,"layer_other_xorpattern_icon." IMAGE_EXT,_("XOR Pattern Layer"));
- 	// Stylize Layers
--	INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon."IMAGE_EXT,_("Bevel Layer"));
--	INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon."IMAGE_EXT,_("Shade Layer"));
-+	INIT_STOCK_ICON(layer_stylize_bevel,"layer_stylize_bevel_icon." IMAGE_EXT,_("Bevel Layer"));
-+	INIT_STOCK_ICON(layer_stylize_shade,"layer_stylize_shade_icon." IMAGE_EXT,_("Shade Layer"));
- 	// Transform Layers
--	INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon."IMAGE_EXT,_("Rotate Layer"));
--	INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon."IMAGE_EXT,_("Translate Layer"));
--	INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale Layer"));
-+	INIT_STOCK_ICON(layer_transform_rotate,"layer_transform_rotate_icon." IMAGE_EXT,_("Rotate Layer"));
-+	INIT_STOCK_ICON(layer_transform_translate,"layer_transform_translate_icon." IMAGE_EXT,_("Translate Layer"));
-+	INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon." IMAGE_EXT,_("Scale Layer"));
- 
--	INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
--	INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set"));
-+	INIT_STOCK_ICON(info,"info_icon." IMAGE_EXT,_("Info Tool"));
-+	INIT_STOCK_ICON(group,"set_icon." IMAGE_EXT,_("Set"));
- 
--	INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show Grid"));
--	INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide Grid"));
--	INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable Grid Snap"));
--	INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable Grid Snap"));
--	INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
--	INIT_STOCK_ICON(encapsulate,"group_icon."IMAGE_EXT,_("Group"));
--	INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select All Child Layers"));
-+	INIT_STOCK_ICON(grid_enable,"grid_enable_icon." IMAGE_EXT,_("Show Grid"));
-+	INIT_STOCK_ICON(grid_disable,"grid_disable_icon." IMAGE_EXT,_("Hide Grid"));
-+	INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon." IMAGE_EXT,_("Enable Grid Snap"));
-+	INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon." IMAGE_EXT,_("Disable Grid Snap"));
-+	INIT_STOCK_ICON(duplicate,"duplicate_icon." IMAGE_EXT,_("Duplicate"));
-+	INIT_STOCK_ICON(encapsulate,"group_icon." IMAGE_EXT,_("Group"));
-+	INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon." IMAGE_EXT,_("Select All Child Layers"));
- 
--	INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo Stack"));
--	INIT_STOCK_ICON(clear_redo,"clear_redo_icon."IMAGE_EXT,_("Clear Redo Stack"));
-+	INIT_STOCK_ICON(clear_undo,"clear_undo_icon." IMAGE_EXT,_("Clear Undo Stack"));
-+	INIT_STOCK_ICON(clear_redo,"clear_redo_icon." IMAGE_EXT,_("Clear Redo Stack"));
- 
--	INIT_STOCK_ICON(children,"library_icon."IMAGE_EXT,_("Library"));
--	INIT_STOCK_ICON(curves,"graphs_icon."IMAGE_EXT,_("Graphs"));
--	INIT_STOCK_ICON(keyframes,"keyframe_icon."IMAGE_EXT,_("Keyframes"));
--	INIT_STOCK_ICON(meta_data,"meta_data_icon."IMAGE_EXT,_("MetaData"));
--	INIT_STOCK_ICON(navigator,"navigator_icon."IMAGE_EXT,_("Navigator"));
--	INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track"));
--	INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History"));
--	INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette"));
--	INIT_STOCK_ICON(params,"parameters_icon."IMAGE_EXT,_("Parameters"));
-+	INIT_STOCK_ICON(children,"library_icon." IMAGE_EXT,_("Library"));
-+	INIT_STOCK_ICON(curves,"graphs_icon." IMAGE_EXT,_("Graphs"));
-+	INIT_STOCK_ICON(keyframes,"keyframe_icon." IMAGE_EXT,_("Keyframes"));
-+	INIT_STOCK_ICON(meta_data,"meta_data_icon." IMAGE_EXT,_("MetaData"));
-+	INIT_STOCK_ICON(navigator,"navigator_icon." IMAGE_EXT,_("Navigator"));
-+	INIT_STOCK_ICON(timetrack,"time_track_icon." IMAGE_EXT,_("Time Track"));
-+	INIT_STOCK_ICON(history,"history_icon." IMAGE_EXT,_("History"));
-+	INIT_STOCK_ICON(palette,"palette_icon." IMAGE_EXT,_("Palette"));
-+	INIT_STOCK_ICON(params,"parameters_icon." IMAGE_EXT,_("Parameters"));
- 
--	INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past keyframes unlocked"));
--	INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past keyframes locked"));
--	INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon."IMAGE_EXT,_("Future keyframes unlocked"));
--	INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon."IMAGE_EXT,_("Future keyframes locked"));
-+	INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon." IMAGE_EXT,_("Past keyframes unlocked"));
-+	INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon." IMAGE_EXT,_("Past keyframes locked"));
-+	INIT_STOCK_ICON(keyframe_lock_future_off,"keyframe_lock_future_off_icon." IMAGE_EXT,_("Future keyframes unlocked"));
-+	INIT_STOCK_ICON(keyframe_lock_future_on,"keyframe_lock_future_on_icon." IMAGE_EXT,_("Future keyframes locked"));
- 
--	INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon."IMAGE_EXT,_("Animate Mode Off"));
--	INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon."IMAGE_EXT,_("Animate Mode On"));
-+	INIT_STOCK_ICON(animate_mode_off,"animate_mode_off_icon." IMAGE_EXT,_("Animate Mode Off"));
-+	INIT_STOCK_ICON(animate_mode_on,"animate_mode_on_icon." IMAGE_EXT,_("Animate Mode On"));
- 	
--	INIT_STOCK_ICON(jack, "jack_icon."IMAGE_EXT, _("JACK"));
-+	INIT_STOCK_ICON(jack, "jack_icon." IMAGE_EXT, _("JACK"));
- 
--	INIT_STOCK_ICON(set_outline_color,"set_outline_color."IMAGE_EXT,_("Set as Outline"));
--	INIT_STOCK_ICON(set_fill_color,"set_fill_color."IMAGE_EXT,_("Set as Fill"));
-+	INIT_STOCK_ICON(set_outline_color,"set_outline_color." IMAGE_EXT,_("Set as Outline"));
-+	INIT_STOCK_ICON(set_fill_color,"set_fill_color." IMAGE_EXT,_("Set as Fill"));
- 
--	INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon."IMAGE_EXT,_("Seek to Begin"));
--	INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon."IMAGE_EXT,_("Seek to Previous Keyframe"));
--	INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon."IMAGE_EXT,_("Seek to Previous Frame"));
--	INIT_STOCK_ICON(animate_play,"animate_play_icon."IMAGE_EXT,_("Play"));
--	INIT_STOCK_ICON(animate_stop,"animate_stop_icon."IMAGE_EXT,_("Stop"));
--	INIT_STOCK_ICON(animate_pause,"animate_pause_icon."IMAGE_EXT,_("Pause"));
--	INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon."IMAGE_EXT,_("Seek to Next frame"));
--	INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon."IMAGE_EXT,_("Seek to Next Keyframe"));
--	INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to End"));
--	INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate Loop"));
-+	INIT_STOCK_ICON(animate_seek_begin,"animate_seek_begin_icon." IMAGE_EXT,_("Seek to Begin"));
-+	INIT_STOCK_ICON(animate_seek_prev_keyframe,"animate_seek_prev_keyframe_icon." IMAGE_EXT,_("Seek to Previous Keyframe"));
-+	INIT_STOCK_ICON(animate_seek_prev_frame,"animate_seek_prev_frame_icon." IMAGE_EXT,_("Seek to Previous Frame"));
-+	INIT_STOCK_ICON(animate_play,"animate_play_icon." IMAGE_EXT,_("Play"));
-+	INIT_STOCK_ICON(animate_stop,"animate_stop_icon." IMAGE_EXT,_("Stop"));
-+	INIT_STOCK_ICON(animate_pause,"animate_pause_icon." IMAGE_EXT,_("Pause"));
-+	INIT_STOCK_ICON(animate_seek_next_frame,"animate_seek_next_frame_icon." IMAGE_EXT,_("Seek to Next frame"));
-+	INIT_STOCK_ICON(animate_seek_next_keyframe,"animate_seek_next_keyframe_icon." IMAGE_EXT,_("Seek to Next Keyframe"));
-+	INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon." IMAGE_EXT,_("Seek to End"));
-+	INIT_STOCK_ICON(animate_loop,"animate_loop_icon." IMAGE_EXT,_("Animate Loop"));
- 
--	INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add Layer to Set"));
--	INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove Layer from Set"));
--	INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set Layer Description"));
--	INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value Node"));
--	INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport Value Node"));
--	INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Flat"));
--	INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Interpolate"));
--	INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Peak"));
--	INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Rounded"));
--	INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon."IMAGE_EXT,_("Set Interpolation to Squared"));
-+	INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon." IMAGE_EXT,_("Add Layer to Set"));
-+	INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon." IMAGE_EXT,_("Remove Layer from Set"));
-+	INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon." IMAGE_EXT,_("Set Layer Description"));
-+	INIT_STOCK_ICON(export,"action_export_icon." IMAGE_EXT,_("Export Value Node"));
-+	INIT_STOCK_ICON(unexport,"action_unexport_icon." IMAGE_EXT,_("Unexport Value Node"));
-+	INIT_STOCK_ICON(flat_interpolation,"action_flat_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Flat"));
-+	INIT_STOCK_ICON(interpolate_interpolation,"action_interpolate_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Interpolate"));
-+	INIT_STOCK_ICON(peak_interpolation,"action_peak_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Peak"));
-+	INIT_STOCK_ICON(rounded_interpolation,"action_rounded_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Rounded"));
-+	INIT_STOCK_ICON(squared_interpolation,"action_squared_interpolation_icon." IMAGE_EXT,_("Set Interpolation to Squared"));
- 
--	INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon."IMAGE_EXT,_("Toggle position handles"));
--	INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon."IMAGE_EXT,_("Toggle vertex handles"));
--	INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon."IMAGE_EXT,_("Toggle tangent handles"));
--	INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon."IMAGE_EXT,_("Toggle radius handles"));
--	INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon."IMAGE_EXT,_("Toggle width handles"));
--	INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon."IMAGE_EXT,_("Toggle angle handles"));
-+	INIT_STOCK_ICON(toggle_duck_position,"duck_position_icon." IMAGE_EXT,_("Toggle position handles"));
-+	INIT_STOCK_ICON(toggle_duck_vertex,"duck_vertex_icon." IMAGE_EXT,_("Toggle vertex handles"));
-+	INIT_STOCK_ICON(toggle_duck_tangent,"duck_tangent_icon." IMAGE_EXT,_("Toggle tangent handles"));
-+	INIT_STOCK_ICON(toggle_duck_radius,"duck_radius_icon." IMAGE_EXT,_("Toggle radius handles"));
-+	INIT_STOCK_ICON(toggle_duck_width,"duck_width_icon." IMAGE_EXT,_("Toggle width handles"));
-+	INIT_STOCK_ICON(toggle_duck_angle,"duck_angle_icon." IMAGE_EXT,_("Toggle angle handles"));
- 
--	INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon."IMAGE_EXT,_("Toggle show grid"));
--	INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon."IMAGE_EXT,_("Toggle snap grid"));
--	INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon."IMAGE_EXT,_("Toggle show guide"));
--	INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon."IMAGE_EXT,_("Toggle snap guide"));
-+	INIT_STOCK_ICON(toggle_show_grid,"show_grid_icon." IMAGE_EXT,_("Toggle show grid"));
-+	INIT_STOCK_ICON(toggle_snap_grid,"snap_grid_icon." IMAGE_EXT,_("Toggle snap grid"));
-+	INIT_STOCK_ICON(toggle_show_guide,"show_guide_icon." IMAGE_EXT,_("Toggle show guide"));
-+	INIT_STOCK_ICON(toggle_snap_guide,"snap_guide_icon." IMAGE_EXT,_("Toggle snap guide"));
- 
--	INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon."IMAGE_EXT,_("Toggle onion skin"));
-+	INIT_STOCK_ICON(toggle_onion_skin,"onion_skin_icon." IMAGE_EXT,_("Toggle onion skin"));
- 
--	INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon."IMAGE_EXT,_("Increase resolution"));
--	INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon."IMAGE_EXT,_("Decrease resolution"));
-+	INIT_STOCK_ICON(increase_resolution,"incr_resolution_icon." IMAGE_EXT,_("Increase resolution"));
-+	INIT_STOCK_ICON(decrease_resolution,"decr_resolution_icon." IMAGE_EXT,_("Decrease resolution"));
- 
--	INIT_STOCK_ICON(preview_options,"preview_options_icon."IMAGE_EXT,_("Preview Options Dialog"));
--	INIT_STOCK_ICON(render_options,"render_options_icon."IMAGE_EXT,_("Render Options Dialog"));
-+	INIT_STOCK_ICON(preview_options,"preview_options_icon." IMAGE_EXT,_("Preview Options Dialog"));
-+	INIT_STOCK_ICON(render_options,"render_options_icon." IMAGE_EXT,_("Render Options Dialog"));
- 
--	INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon."IMAGE_EXT,_("TCB interpolation"));
--	INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon."IMAGE_EXT,_("Ease In/Out interpolation"));
--	INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon."IMAGE_EXT,_("Const interpolation"));
--	INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon."IMAGE_EXT,_("Linear interpolation"));
--	INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon."IMAGE_EXT,_("Clamped interpolation"));
-+	INIT_STOCK_ICON(interpolation_type_tcb,"interpolation_type_tcb_icon." IMAGE_EXT,_("TCB interpolation"));
-+	INIT_STOCK_ICON(interpolation_type_ease,"interpolation_type_ease_icon." IMAGE_EXT,_("Ease In/Out interpolation"));
-+	INIT_STOCK_ICON(interpolation_type_const,"interpolation_type_const_icon." IMAGE_EXT,_("Const interpolation"));
-+	INIT_STOCK_ICON(interpolation_type_linear,"interpolation_type_linear_icon." IMAGE_EXT,_("Linear interpolation"));
-+	INIT_STOCK_ICON(interpolation_type_clamped,"interpolation_type_clamped_icon." IMAGE_EXT,_("Clamped interpolation"));
- 
--	INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon."IMAGE_EXT,_("Linked"));
--	INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon."IMAGE_EXT,_("Unlinked"));
--	INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon."IMAGE_EXT,"Utils Timetrack align");
-+	INIT_STOCK_ICON(utils_chain_link_on,"utils_chain_link_on_icon." IMAGE_EXT,_("Linked"));
-+	INIT_STOCK_ICON(utils_chain_link_off,"utils_chain_link_off_icon." IMAGE_EXT,_("Unlinked"));
-+	INIT_STOCK_ICON(utils_timetrack_align,"utils_timetrack_align_icon." IMAGE_EXT,"Utils Timetrack align");
- 
- 	INIT_STOCK_ICON_CLONE(cvs_add,"gtk-add",_("CVS Add"));
- 	INIT_STOCK_ICON_CLONE(cvs_update,"gtk-open",_("CVS Update"));
diff --git a/graphics/synfigstudio/files/patch-src_gui_splash.cpp b/graphics/synfigstudio/files/patch-src_gui_splash.cpp
deleted file mode 100644
index 147d9fe06ebf..000000000000
--- a/graphics/synfigstudio/files/patch-src_gui_splash.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/gui/splash.cpp.orig	2017-04-02 22:54:21 UTC
-+++ src/gui/splash.cpp
-@@ -185,9 +185,9 @@ Splash::Splash():
- 	if(ran >0.499999)
- 		number = 2;
- 	//synfig::info("%s", strprintf("%d",number).c_str());
--	splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"."IMAGE_EXT);
-+	splash_image->set(imagepath+"splash_screen"+strprintf("%d",number)+"." IMAGE_EXT);
- 	*/
--	splash_image->set(imagepath+"splash_screen."IMAGE_EXT);
-+	splash_image->set(imagepath+"splash_screen." IMAGE_EXT);
- 	splash_image->set_alignment(0.5,0.5);
- 	splash_image->set_padding(0,0);
- 
-@@ -220,7 +220,7 @@ Splash::Splash():
-   	frame->add(*fixed);
- 
- 	// Set up the parameters for this pop-up window
--	set_title("Synfig Studio "VERSION);
-+	set_title("Synfig Studio " VERSION);
- 	set_modal(false);
- 	property_window_position().set_value(Gtk::WIN_POS_CENTER);
- 	set_resizable(false);
diff --git a/graphics/synfigstudio/pkg-plist b/graphics/synfigstudio/pkg-plist
index eec1027bef69..efe988ea0bfd 100644
--- a/graphics/synfigstudio/pkg-plist
+++ b/graphics/synfigstudio/pkg-plist
@@ -25,7 +25,6 @@ include/synfigapp-0.0/synfigapp/colorset.h
 include/synfigapp-0.0/synfigapp/cvs.h
 include/synfigapp-0.0/synfigapp/editmode.h
 include/synfigapp-0.0/synfigapp/editmodeset.h
-include/synfigapp-0.0/synfigapp/general.h
 include/synfigapp-0.0/synfigapp/gradientset.h
 include/synfigapp-0.0/synfigapp/groupaddlayers.h
 include/synfigapp-0.0/synfigapp/groupremove.h
@@ -65,6 +64,7 @@ include/synfigapp-0.0/synfigapp/layerresetpose.h
 include/synfigapp-0.0/synfigapp/layersetdesc.h
 include/synfigapp-0.0/synfigapp/layersetexcludefromrendering.h
 include/synfigapp-0.0/synfigapp/layerzdepthrangeset.h
+include/synfigapp-0.0/synfigapp/localization.h
 include/synfigapp-0.0/synfigapp/main.h
 include/synfigapp-0.0/synfigapp/pluginmanager.h
 include/synfigapp-0.0/synfigapp/selectionmanager.h
@@ -141,34 +141,42 @@ share/icons/hicolor/scalable/apps/synfig_icon.svg
 %%NLS%%share/locale/ar/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ca@valencia/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/cs_CZ/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/da/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/de/LC_MESSAGES/synfigstudio.mo
-%%NLS%%share/locale/el/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/el_GR/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/en_CZ/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/es/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/es_PY/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/eu_ES/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/he/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/hi_IN/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/it/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/ja_JP/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/lv/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/synfigstudio.mo
-%%NLS%%share/locale/no/LC_MESSAGES/synfigstudio.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/no_NO/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/pl_PL/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/ro/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/si/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sk_SK/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/sr_RS/LC_MESSAGES/synfigstudio.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/synfigstudio.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/ur/LC_MESSAGES/synfigstudio.mo
 %%NLS%%share/locale/uz@Latn/LC_MESSAGES/synfigstudio.mo