From: pabs Date: Tue, 13 Nov 2007 09:13:07 +0000 (+0000) Subject: Initial attempt at i18n support using gettext X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git Initial attempt at i18n support using gettext git-svn-id: http://svn.voria.com/code@1143 1f10aa63-cdf2-0310-b900-c93c546f37ac --- diff --git a/synfig-core/trunk/Makefile.am b/synfig-core/trunk/Makefile.am index 85e88f1..007a826 100644 --- a/synfig-core/trunk/Makefile.am +++ b/synfig-core/trunk/Makefile.am @@ -3,7 +3,7 @@ MAINTAINERCLEANFILES=COPYING INSTALL synfig.pc synfig-$(VERSION).tar.gz doxygen.cfg config/config.guess config/config.sub config/ltmain.sh config/ltmain.sh.orig config/ltmain.sh.rej config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store synfig.spec include/etl_profile.h.in libltdl/COPYING.LIB libltdl/Makefile.in libltdl/acinclude.m4 libltdl/config-h.in libltdl/configure.in libltdl/ltdl.h libltdl/Makefile.am libltdl/README libltdl/aclocal.m4 libltdl/configure libltdl/ltdl.c libltdl/stamp-h.in -SUBDIRS=libltdl src examples +SUBDIRS=libltdl src examples po # Install the pkg-config file: pkgconfigdir = $(libdir)/pkgconfig diff --git a/synfig-core/trunk/configure.ac b/synfig-core/trunk/configure.ac index b3b4fea..ab651c0 100644 --- a/synfig-core/trunk/configure.ac +++ b/synfig-core/trunk/configure.ac @@ -33,6 +33,7 @@ AC_SUBST(SVN_REPOSITORY) # -- P R O G R A M S ------------------------------------------ AC_PROG_CC +AC_GNU_SOURCE AC_PROG_CXX AC_PROG_CPP AC_PROG_CXXCPP @@ -336,6 +337,12 @@ if test $use_openexr_half = yes ; then { AC_LIB_LTDL +ALL_LINGUAS="en_AU" +AM_GNU_GETTEXT([external]) +# This is here so autoreconf will run autopoint +AM_GNU_GETTEXT_VERSION([0.16.1]) +localedir="$datadir/locale" + PKG_CHECK_MODULES(ETL, [ETL >= 0.04.10],,[ AC_MSG_ERROR([ ** You need to install the ETL (version 0.04.10 or greater).]) ]) @@ -527,8 +534,8 @@ AC_SUBST(CONFIG_CFLAGS) AC_SUBST(CONFIG_DEPS) AC_SUBST(ETL_CFLAGS) -SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $LIBSIGC_LIBS" -SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED" +SYNFIG_LIBS="$VIMAGE_LIBS $LIBXMLPP_LIBS $ETL_LIBS $LIBSIGC_LIBS $LTLIBINTL" +SYNFIG_CFLAGS="$LIBXMLPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED -DLOCALEDIR=\\\"$localedir\\\"" CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`" @@ -551,6 +558,7 @@ synfig.pc synfig.spec doxygen.cfg Makefile +po/Makefile.in src/Makefile src/synfig/Makefile src/modules/Makefile diff --git a/synfig-core/trunk/po/Makevars b/synfig-core/trunk/po/Makevars new file mode 100644 index 0000000..549d477 --- /dev/null +++ b/synfig-core/trunk/po/Makevars @@ -0,0 +1,7 @@ +DOMAIN = synfig +subdir = po +top_builddir = .. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +COPYRIGHT_HOLDER = Synfig Contributors +MSGID_BUGS_ADDRESS = http://www.synfig.com +EXTRA_LOCALE_CATEGORIES = diff --git a/synfig-core/trunk/po/POTFILES.in b/synfig-core/trunk/po/POTFILES.in new file mode 100644 index 0000000..fb3c5e2 --- /dev/null +++ b/synfig-core/trunk/po/POTFILES.in @@ -0,0 +1,339 @@ +# FIXME: move libsynfig into a separate domain +# Disabled since they are not built +# src/modules/example/filledrect.cpp +# src/modules/example/filledrect.cpp +# src/modules/example/filledrect.h +# src/modules/example/main.cpp +# src/modules/example/metaballs.cpp +# src/modules/example/metaballs.h +# src/modules/example/simplecircle.cpp +# src/modules/example/simplecircle.h +src/modules/lyr_freetype/lyr_freetype.cpp +src/modules/lyr_freetype/lyr_freetype.h +src/modules/lyr_freetype/main.cpp +src/modules/lyr_std/bevel.cpp +src/modules/lyr_std/bevel.h +src/modules/lyr_std/booleancurve.cpp +src/modules/lyr_std/booleancurve.h +src/modules/lyr_std/clamp.cpp +src/modules/lyr_std/clamp.h +src/modules/lyr_std/import.cpp +src/modules/lyr_std/import.h +src/modules/lyr_std/insideout.cpp +src/modules/lyr_std/insideout.h +src/modules/lyr_std/julia.cpp +src/modules/lyr_std/julia.h +src/modules/lyr_std/main.cpp +src/modules/lyr_std/mandelbrot.cpp +src/modules/lyr_std/mandelbrot.h +src/modules/lyr_std/rotate.cpp +src/modules/lyr_std/rotate.h +src/modules/lyr_std/shade.cpp +src/modules/lyr_std/shade.h +src/modules/lyr_std/sphere_distort.cpp +src/modules/lyr_std/sphere_distort.h +src/modules/lyr_std/stretch.cpp +src/modules/lyr_std/stretch.h +src/modules/lyr_std/supersample.cpp +src/modules/lyr_std/supersample.h +src/modules/lyr_std/timeloop.cpp +src/modules/lyr_std/timeloop.h +src/modules/lyr_std/translate.cpp +src/modules/lyr_std/translate.h +src/modules/lyr_std/twirl.cpp +src/modules/lyr_std/twirl.h +src/modules/lyr_std/warp.cpp +src/modules/lyr_std/warp.h +src/modules/lyr_std/xorpattern.cpp +src/modules/lyr_std/xorpattern.h +src/modules/lyr_std/zoom.cpp +src/modules/lyr_std/zoom.h +src/modules/mod_bmp/main.cpp +src/modules/mod_bmp/mptr_bmp.cpp +src/modules/mod_bmp/mptr_bmp.h +src/modules/mod_bmp/trgt_bmp.cpp +src/modules/mod_bmp/trgt_bmp.h +src/modules/mod_dv/main.cpp +src/modules/mod_dv/trgt_dv.cpp +src/modules/mod_dv/trgt_dv.h +src/modules/mod_ffmpeg/main.cpp +src/modules/mod_ffmpeg/mptr_ffmpeg.cpp +src/modules/mod_ffmpeg/mptr_ffmpeg.h +src/modules/mod_ffmpeg/trgt_ffmpeg.cpp +src/modules/mod_ffmpeg/trgt_ffmpeg.h +src/modules/mod_filter/blur.cpp +src/modules/mod_filter/blur.h +src/modules/mod_filter/colorcorrect.cpp +src/modules/mod_filter/colorcorrect.h +src/modules/mod_filter/halftone2.cpp +src/modules/mod_filter/halftone2.h +src/modules/mod_filter/halftone3.cpp +src/modules/mod_filter/halftone3.h +src/modules/mod_filter/halftone.cpp +src/modules/mod_filter/halftone.h +src/modules/mod_filter/lumakey.cpp +src/modules/mod_filter/lumakey.h +src/modules/mod_filter/main.cpp +src/modules/mod_filter/radialblur.cpp +src/modules/mod_filter/radialblur.h +src/modules/mod_geometry/checkerboard.cpp +src/modules/mod_geometry/checkerboard.h +src/modules/mod_geometry/circle.cpp +src/modules/mod_geometry/circle.h +src/modules/mod_geometry/main.cpp +src/modules/mod_geometry/outline.cpp +src/modules/mod_geometry/outline.h +src/modules/mod_geometry/rectangle.cpp +src/modules/mod_geometry/rectangle.h +src/modules/mod_geometry/region.cpp +src/modules/mod_geometry/region.h +src/modules/mod_geometry/star.cpp +src/modules/mod_geometry/star.h +src/modules/mod_gif/main.cpp +src/modules/mod_gif/trgt_gif.cpp +src/modules/mod_gif/trgt_gif.h +src/modules/mod_gradient/conicalgradient.cpp +src/modules/mod_gradient/conicalgradient.h +src/modules/mod_gradient/curvegradient.cpp +src/modules/mod_gradient/curvegradient.h +src/modules/mod_gradient/lineargradient.cpp +src/modules/mod_gradient/lineargradient.h +src/modules/mod_gradient/main.cpp +src/modules/mod_gradient/radialgradient.cpp +src/modules/mod_gradient/radialgradient.h +src/modules/mod_gradient/spiralgradient.cpp +src/modules/mod_gradient/spiralgradient.h +src/modules/mod_imagemagick/main.cpp +src/modules/mod_imagemagick/mptr_imagemagick.cpp +src/modules/mod_imagemagick/mptr_imagemagick.h +src/modules/mod_imagemagick/trgt_imagemagick.cpp +src/modules/mod_imagemagick/trgt_imagemagick.h +src/modules/mod_jpeg/main.cpp +src/modules/mod_jpeg/mptr_jpeg.cpp +src/modules/mod_jpeg/mptr_jpeg.h +src/modules/mod_jpeg/trgt_jpeg.cpp +src/modules/mod_jpeg/trgt_jpeg.h +src/modules/mod_libavcodec/main.cpp +src/modules/mod_libavcodec/mptr.cpp +src/modules/mod_libavcodec/mptr.h +src/modules/mod_libavcodec/trgt_av.cpp +src/modules/mod_libavcodec/trgt_av.h +src/modules/mod_magickpp/main.cpp +src/modules/mod_magickpp/trgt_magickpp.cpp +src/modules/mod_magickpp/trgt_magickpp.h +src/modules/mod_mng/main.cpp +src/modules/mod_mng/trgt_mng.cpp +src/modules/mod_mng/trgt_mng.h +src/modules/mod_noise/distort.cpp +src/modules/mod_noise/distort.h +src/modules/mod_noise/main.cpp +src/modules/mod_noise/noise.cpp +src/modules/mod_noise/noise.h +src/modules/mod_noise/random.cpp +src/modules/mod_noise/random.h +src/modules/mod_noise/valuenode_random.cpp +src/modules/mod_noise/valuenode_random.h +src/modules/mod_openexr/main.cpp +src/modules/mod_openexr/mptr_openexr.cpp +src/modules/mod_openexr/mptr_openexr.h +src/modules/mod_openexr/trgt_openexr.cpp +src/modules/mod_openexr/trgt_openexr.h +src/modules/mod_particle/main.cpp +src/modules/mod_particle/plant.cpp +src/modules/mod_particle/plant.h +src/modules/mod_particle/random.cpp +src/modules/mod_particle/random.h +src/modules/mod_png/main.cpp +src/modules/mod_png/mptr_png.cpp +src/modules/mod_png/mptr_png.h +src/modules/mod_png/trgt_png.cpp +src/modules/mod_png/trgt_png.h +src/modules/mod_ppm/main.cpp +src/modules/mod_ppm/mptr_ppm.cpp +src/modules/mod_ppm/mptr_ppm.h +src/modules/mod_ppm/trgt_mpg.cpp +src/modules/mod_ppm/trgt_mpg.h +src/modules/mod_ppm/trgt_ppm.cpp +src/modules/mod_ppm/trgt_ppm.h +src/modules/mod_yuv420p/main.cpp +src/modules/mod_yuv420p/trgt_yuv.cpp +src/modules/mod_yuv420p/trgt_yuv.h +src/modules/mptr_mplayer/main.cpp +src/modules/mptr_mplayer/mptr_mplayer.cpp +src/modules/mptr_mplayer/mptr_mplayer.h +src/synfig/activepoint.cpp +src/synfig/activepoint.h +src/synfig/angle.h +src/synfig/blinepoint.cpp +src/synfig/blinepoint.h +src/synfig/blur.cpp +src/synfig/blur.h +src/synfig/canvasbase.h +src/synfig/canvas.cpp +src/synfig/canvas.h +src/synfig/color.cpp +src/synfig/color.h +src/synfig/context.cpp +src/synfig/context.h +src/synfig/curve_helper.cpp +src/synfig/curve_helper.h +src/synfig/curveset.cpp +src/synfig/curveset.h +src/synfig/distance.cpp +src/synfig/distance.h +src/synfig/exception.cpp +src/synfig/exception.h +src/synfig/gamma.cpp +src/synfig/gamma.h +src/synfig/general.h +src/synfig/gradient.cpp +src/synfig/gradient.h +src/synfig/guid.cpp +src/synfig/guid.h +src/synfig/guidset.h +src/synfig/importer.cpp +src/synfig/importer.h +src/synfig/interpolation.h +src/synfig/keyframe.cpp +src/synfig/keyframe.h +src/synfig/layer_bitmap.cpp +src/synfig/layer_bitmap.h +src/synfig/layer_composite.cpp +src/synfig/layer_composite.h +src/synfig/layer.cpp +src/synfig/layer.h +src/synfig/layer_mime.cpp +src/synfig/layer_mime.h +src/synfig/layer_motionblur.cpp +src/synfig/layer_motionblur.h +src/synfig/layer_pastecanvas.cpp +src/synfig/layer_pastecanvas.h +src/synfig/layer_polygon.cpp +src/synfig/layer_polygon.h +src/synfig/layer_shape.cpp +src/synfig/layer_shape.h +src/synfig/layer_solidcolor.cpp +src/synfig/layer_solidcolor.h +src/synfig/listimporter.cpp +src/synfig/listimporter.h +src/synfig/loadcanvas.cpp +src/synfig/loadcanvas.h +src/synfig/main.cpp +src/synfig/main.h +src/synfig/module.cpp +src/synfig/module.h +src/synfig/mutex.cpp +src/synfig/mutex.h +src/synfig/nodebase.h +src/synfig/node.cpp +src/synfig/node.h +src/synfig/palette.cpp +src/synfig/palette.h +src/synfig/paramdesc.cpp +src/synfig/paramdesc.h +src/synfig/pch.h +src/synfig/polynomial_root.cpp +src/synfig/polynomial_root.h +src/synfig/protocol.h +src/synfig/quick_rng.h +src/synfig/real.h +src/synfig/rect.cpp +src/synfig/rect.h +src/synfig/renddesc.cpp +src/synfig/renddesc.h +src/synfig/render.cpp +src/synfig/render.h +src/synfig/savecanvas.cpp +src/synfig/savecanvas.h +src/synfig/segment.h +src/synfig/smartfile.h +src/synfig/string_decl.h +src/synfig/string.h +src/synfig/surface.cpp +src/synfig/surface.h +src/synfig/surfacenew.cpp +src/synfig/surfacenew.h +src/synfig/synfig.h +src/synfig/target.cpp +src/synfig/target.h +src/synfig/target_multi.cpp +src/synfig/target_multi.h +src/synfig/target_null.cpp +src/synfig/target_null.h +src/synfig/target_null_tile.cpp +src/synfig/target_null_tile.h +src/synfig/target_scanline.cpp +src/synfig/target_scanline.h +src/synfig/target_tile.cpp +src/synfig/target_tile.h +src/synfig/time.cpp +src/synfig/time.h +src/synfig/timepointcollect.cpp +src/synfig/timepointcollect.h +src/synfig/transform.cpp +src/synfig/transform.h +src/synfig/types.h +src/synfig/uniqueid.cpp +src/synfig/uniqueid.h +src/synfig/value.cpp +src/synfig/value.h +src/synfig/valuenode_add.cpp +src/synfig/valuenode_add.h +src/synfig/valuenode_animated.cpp +src/synfig/valuenode_animated.h +src/synfig/valuenode_blinecalctangent.cpp +src/synfig/valuenode_blinecalctangent.h +src/synfig/valuenode_blinecalcvertex.cpp +src/synfig/valuenode_blinecalcvertex.h +src/synfig/valuenode_bline.cpp +src/synfig/valuenode_bline.h +src/synfig/valuenode_composite.cpp +src/synfig/valuenode_composite.h +src/synfig/valuenode_const.cpp +src/synfig/valuenode_const.h +src/synfig/valuenode_cos.cpp +src/synfig/valuenode_cos.h +src/synfig/valuenode.cpp +src/synfig/valuenode_dynamiclist.cpp +src/synfig/valuenode_dynamiclist.h +src/synfig/valuenode_exp.cpp +src/synfig/valuenode_exp.h +src/synfig/valuenode_gradientrotate.cpp +src/synfig/valuenode_gradientrotate.h +src/synfig/valuenode.h +src/synfig/valuenode_linear.cpp +src/synfig/valuenode_linear.h +src/synfig/valuenode_radialcomposite.cpp +src/synfig/valuenode_radialcomposite.h +src/synfig/valuenode_range.cpp +src/synfig/valuenode_range.h +src/synfig/valuenode_reference.cpp +src/synfig/valuenode_reference.h +src/synfig/valuenode_repeat_gradient.cpp +src/synfig/valuenode_repeat_gradient.h +src/synfig/valuenode_scale.cpp +src/synfig/valuenode_scale.h +src/synfig/valuenode_segcalctangent.cpp +src/synfig/valuenode_segcalctangent.h +src/synfig/valuenode_segcalcvertex.cpp +src/synfig/valuenode_segcalcvertex.h +src/synfig/valuenode_sine.cpp +src/synfig/valuenode_sine.h +src/synfig/valuenode_stripes.cpp +src/synfig/valuenode_stripes.h +src/synfig/valuenode_subtract.cpp +src/synfig/valuenode_subtract.h +src/synfig/valuenode_switch.cpp +src/synfig/valuenode_switch.h +src/synfig/valuenode_timedswap.cpp +src/synfig/valuenode_timedswap.h +src/synfig/valuenode_twotone.cpp +src/synfig/valuenode_twotone.h +src/synfig/vector.h +src/synfig/version.h +src/synfig/waypoint.cpp +src/synfig/waypoint.h +# Disabled because they are not built +# src/template.cpp +# src/template.h +src/tool/main.cpp diff --git a/synfig-core/trunk/src/modules/example/filledrect.cpp b/synfig-core/trunk/src/modules/example/filledrect.cpp index 72125ee..21dbbe5 100644 --- a/synfig-core/trunk/src/modules/example/filledrect.cpp +++ b/synfig-core/trunk/src/modules/example/filledrect.cpp @@ -53,8 +53,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(FilledRect); SYNFIG_LAYER_SET_NAME(FilledRect,"rectangle"); -SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,_("Rectangle")); -SYNFIG_LAYER_SET_CATEGORY(FilledRect,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(FilledRect,N_("Rectangle")); +SYNFIG_LAYER_SET_CATEGORY(FilledRect,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(FilledRect,"0.1"); SYNFIG_LAYER_SET_CVS_ID(FilledRect,"$Id$"); diff --git a/synfig-core/trunk/src/modules/example/metaballs.cpp b/synfig-core/trunk/src/modules/example/metaballs.cpp index f7550f9..74fb884 100644 --- a/synfig-core/trunk/src/modules/example/metaballs.cpp +++ b/synfig-core/trunk/src/modules/example/metaballs.cpp @@ -53,8 +53,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Metaballs); SYNFIG_LAYER_SET_NAME(Metaballs,"metaballs"); -SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,_("Metaballs")); -SYNFIG_LAYER_SET_CATEGORY(Metaballs,_("Default")); +SYNFIG_LAYER_SET_LOCAL_NAME(Metaballs,N_("Metaballs")); +SYNFIG_LAYER_SET_CATEGORY(Metaballs,N_("Default")); SYNFIG_LAYER_SET_VERSION(Metaballs,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Metaballs,"$Id$"); diff --git a/synfig-core/trunk/src/modules/example/simplecircle.cpp b/synfig-core/trunk/src/modules/example/simplecircle.cpp index 10a27a0..fd0350e 100644 --- a/synfig-core/trunk/src/modules/example/simplecircle.cpp +++ b/synfig-core/trunk/src/modules/example/simplecircle.cpp @@ -52,8 +52,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(SimpleCircle); SYNFIG_LAYER_SET_NAME(SimpleCircle,"simple_circle"); -SYNFIG_LAYER_SET_LOCAL_NAME(SimpleCircle,_("Simple Circle")); -SYNFIG_LAYER_SET_CATEGORY(SimpleCircle,_("Do Not Use")); +SYNFIG_LAYER_SET_LOCAL_NAME(SimpleCircle,N_("Simple Circle")); +SYNFIG_LAYER_SET_CATEGORY(SimpleCircle,N_("Do Not Use")); SYNFIG_LAYER_SET_VERSION(SimpleCircle,"0.1"); SYNFIG_LAYER_SET_CVS_ID(SimpleCircle,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp index 2ef7eae..713c2ac 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -63,8 +63,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Layer_Freetype); SYNFIG_LAYER_SET_NAME(Layer_Freetype,"text"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Freetype,_("Text")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Freetype,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Freetype,N_("Text")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Freetype,N_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_Freetype,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Layer_Freetype,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/bevel.cpp b/synfig-core/trunk/src/modules/lyr_std/bevel.cpp index afe81c2..d76479b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/bevel.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/bevel.cpp @@ -64,8 +64,8 @@ using namespace std; SYNFIG_LAYER_INIT(Layer_Bevel); SYNFIG_LAYER_SET_NAME(Layer_Bevel,"bevel"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Bevel,_("Bevel")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Bevel,_("Stylize")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Bevel,N_("Bevel")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Bevel,N_("Stylize")); SYNFIG_LAYER_SET_VERSION(Layer_Bevel,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Layer_Bevel,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/clamp.cpp b/synfig-core/trunk/src/modules/lyr_std/clamp.cpp index 10e36c5..0ea7720 100644 --- a/synfig-core/trunk/src/modules/lyr_std/clamp.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/clamp.cpp @@ -51,8 +51,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Layer_Clamp); SYNFIG_LAYER_SET_NAME(Layer_Clamp,"clamp"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Clamp,_("Clamp")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Clamp,_("Filters")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Clamp,N_("Clamp")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Clamp,N_("Filters")); SYNFIG_LAYER_SET_VERSION(Layer_Clamp,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Layer_Clamp,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/import.cpp b/synfig-core/trunk/src/modules/lyr_std/import.cpp index 3fd781a..16a6595 100644 --- a/synfig-core/trunk/src/modules/lyr_std/import.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/import.cpp @@ -55,8 +55,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Import); SYNFIG_LAYER_SET_NAME(Import,"import"); -SYNFIG_LAYER_SET_LOCAL_NAME(Import,_("Import Image")); -SYNFIG_LAYER_SET_CATEGORY(Import,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Import,N_("Import Image")); +SYNFIG_LAYER_SET_CATEGORY(Import,N_("Other")); SYNFIG_LAYER_SET_VERSION(Import,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Import,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/insideout.cpp b/synfig-core/trunk/src/modules/lyr_std/insideout.cpp index fd10fa4..fed490e 100644 --- a/synfig-core/trunk/src/modules/lyr_std/insideout.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/insideout.cpp @@ -52,8 +52,8 @@ SYNFIG_LAYER_INIT(InsideOut); SYNFIG_LAYER_SET_NAME(InsideOut,"inside_out"); -SYNFIG_LAYER_SET_LOCAL_NAME(InsideOut,_("Inside Out")); -SYNFIG_LAYER_SET_CATEGORY(InsideOut,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(InsideOut,N_("Inside Out")); +SYNFIG_LAYER_SET_CATEGORY(InsideOut,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(InsideOut,"0.1"); SYNFIG_LAYER_SET_CVS_ID(InsideOut,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/julia.cpp b/synfig-core/trunk/src/modules/lyr_std/julia.cpp index 04c8c98..7f41609 100644 --- a/synfig-core/trunk/src/modules/lyr_std/julia.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/julia.cpp @@ -53,8 +53,8 @@ SYNFIG_LAYER_INIT(Julia); SYNFIG_LAYER_SET_NAME(Julia,"julia"); -SYNFIG_LAYER_SET_LOCAL_NAME(Julia,_("Julia Set")); -SYNFIG_LAYER_SET_CATEGORY(Julia,_("Fractals")); +SYNFIG_LAYER_SET_LOCAL_NAME(Julia,N_("Julia Set")); +SYNFIG_LAYER_SET_CATEGORY(Julia,N_("Fractals")); SYNFIG_LAYER_SET_VERSION(Julia,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Julia,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp index 04ddfd7..648e69b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/mandelbrot.cpp @@ -53,8 +53,8 @@ SYNFIG_LAYER_INIT(Mandelbrot); SYNFIG_LAYER_SET_NAME(Mandelbrot,"mandelbrot"); -SYNFIG_LAYER_SET_LOCAL_NAME(Mandelbrot,_("Mandelbrot Set")); -SYNFIG_LAYER_SET_CATEGORY(Mandelbrot,_("Fractals")); +SYNFIG_LAYER_SET_LOCAL_NAME(Mandelbrot,N_("Mandelbrot Set")); +SYNFIG_LAYER_SET_CATEGORY(Mandelbrot,N_("Fractals")); SYNFIG_LAYER_SET_VERSION(Mandelbrot,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Mandelbrot,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/rotate.cpp b/synfig-core/trunk/src/modules/lyr_std/rotate.cpp index 2e6c0b0..aaa226e 100644 --- a/synfig-core/trunk/src/modules/lyr_std/rotate.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/rotate.cpp @@ -51,8 +51,8 @@ SYNFIG_LAYER_INIT(Rotate); SYNFIG_LAYER_SET_NAME(Rotate,"rotate"); -SYNFIG_LAYER_SET_LOCAL_NAME(Rotate,_("Rotate")); -SYNFIG_LAYER_SET_CATEGORY(Rotate,_("Transform")); +SYNFIG_LAYER_SET_LOCAL_NAME(Rotate,N_("Rotate")); +SYNFIG_LAYER_SET_CATEGORY(Rotate,N_("Transform")); SYNFIG_LAYER_SET_VERSION(Rotate,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Rotate,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/shade.cpp b/synfig-core/trunk/src/modules/lyr_std/shade.cpp index 9ded1f1..b1746ef 100644 --- a/synfig-core/trunk/src/modules/lyr_std/shade.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/shade.cpp @@ -62,8 +62,8 @@ using namespace std; SYNFIG_LAYER_INIT(Layer_Shade); SYNFIG_LAYER_SET_NAME(Layer_Shade,"shade"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shade,_("Shade")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Shade,_("Stylize")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shade,N_("Shade")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shade,N_("Stylize")); SYNFIG_LAYER_SET_VERSION(Layer_Shade,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Layer_Shade,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp index f847739..40ee9c7 100644 --- a/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/sphere_distort.cpp @@ -69,8 +69,8 @@ enum SYNFIG_LAYER_INIT(Layer_SphereDistort); SYNFIG_LAYER_SET_NAME(Layer_SphereDistort,"spherize"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SphereDistort,_("Spherize")); -SYNFIG_LAYER_SET_CATEGORY(Layer_SphereDistort,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SphereDistort,N_("Spherize")); +SYNFIG_LAYER_SET_CATEGORY(Layer_SphereDistort,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(Layer_SphereDistort,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Layer_SphereDistort,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp index c8b5090..6bbf951 100644 --- a/synfig-core/trunk/src/modules/lyr_std/stretch.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/stretch.cpp @@ -55,8 +55,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Layer_Stretch); SYNFIG_LAYER_SET_NAME(Layer_Stretch,"stretch"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,_("Stretch")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Stretch,N_("Stretch")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Stretch,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(Layer_Stretch,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_Stretch,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp index a666363..9f762b8 100644 --- a/synfig-core/trunk/src/modules/lyr_std/supersample.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/supersample.cpp @@ -52,8 +52,8 @@ SYNFIG_LAYER_INIT(SuperSample); SYNFIG_LAYER_SET_NAME(SuperSample,"super_sample"); -SYNFIG_LAYER_SET_LOCAL_NAME(SuperSample,_("Super Sample")); -SYNFIG_LAYER_SET_CATEGORY(SuperSample,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(SuperSample,N_("Super Sample")); +SYNFIG_LAYER_SET_CATEGORY(SuperSample,N_("Other")); SYNFIG_LAYER_SET_VERSION(SuperSample,"0.1"); SYNFIG_LAYER_SET_CVS_ID(SuperSample,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp index bae1cc1..fe49550 100644 --- a/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/timeloop.cpp @@ -51,8 +51,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Layer_TimeLoop); SYNFIG_LAYER_SET_NAME(Layer_TimeLoop,"timeloop"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_TimeLoop,_("Time Loop")); -SYNFIG_LAYER_SET_CATEGORY(Layer_TimeLoop,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_TimeLoop,N_("Time Loop")); +SYNFIG_LAYER_SET_CATEGORY(Layer_TimeLoop,N_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_TimeLoop,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_TimeLoop,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/translate.cpp b/synfig-core/trunk/src/modules/lyr_std/translate.cpp index 037bdda..825ad7b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/translate.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/translate.cpp @@ -51,8 +51,8 @@ SYNFIG_LAYER_INIT(Translate); SYNFIG_LAYER_SET_NAME(Translate,"translate"); -SYNFIG_LAYER_SET_LOCAL_NAME(Translate,_("Translate")); -SYNFIG_LAYER_SET_CATEGORY(Translate,_("Transform")); +SYNFIG_LAYER_SET_LOCAL_NAME(Translate,N_("Translate")); +SYNFIG_LAYER_SET_CATEGORY(Translate,N_("Transform")); SYNFIG_LAYER_SET_VERSION(Translate,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Translate,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp b/synfig-core/trunk/src/modules/lyr_std/twirl.cpp index 1c91d0b..43851c5 100644 --- a/synfig-core/trunk/src/modules/lyr_std/twirl.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/twirl.cpp @@ -52,8 +52,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Twirl); SYNFIG_LAYER_SET_NAME(Twirl,"twirl"); -SYNFIG_LAYER_SET_LOCAL_NAME(Twirl,_("Twirl")); -SYNFIG_LAYER_SET_CATEGORY(Twirl,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(Twirl,N_("Twirl")); +SYNFIG_LAYER_SET_CATEGORY(Twirl,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(Twirl,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Twirl,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/warp.cpp b/synfig-core/trunk/src/modules/lyr_std/warp.cpp index 60a41c7..b89a1c5 100644 --- a/synfig-core/trunk/src/modules/lyr_std/warp.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/warp.cpp @@ -52,8 +52,8 @@ SYNFIG_LAYER_INIT(Warp); SYNFIG_LAYER_SET_NAME(Warp,"warp"); -SYNFIG_LAYER_SET_LOCAL_NAME(Warp,_("Warp")); -SYNFIG_LAYER_SET_CATEGORY(Warp,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(Warp,N_("Warp")); +SYNFIG_LAYER_SET_CATEGORY(Warp,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(Warp,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Warp,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp index 299a841..153f27b 100644 --- a/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/xorpattern.cpp @@ -51,8 +51,8 @@ SYNFIG_LAYER_INIT(XORPattern); SYNFIG_LAYER_SET_NAME(XORPattern,"xor_pattern"); -SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,_("XOR Pattern")); -SYNFIG_LAYER_SET_CATEGORY(XORPattern,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,N_("XOR Pattern")); +SYNFIG_LAYER_SET_CATEGORY(XORPattern,N_("Other")); SYNFIG_LAYER_SET_VERSION(XORPattern,"0.1"); SYNFIG_LAYER_SET_CVS_ID(XORPattern,"$Id$"); diff --git a/synfig-core/trunk/src/modules/lyr_std/zoom.cpp b/synfig-core/trunk/src/modules/lyr_std/zoom.cpp index d8a88bc..c667bb2 100644 --- a/synfig-core/trunk/src/modules/lyr_std/zoom.cpp +++ b/synfig-core/trunk/src/modules/lyr_std/zoom.cpp @@ -48,8 +48,8 @@ SYNFIG_LAYER_INIT(Zoom); SYNFIG_LAYER_SET_NAME(Zoom,"zoom"); -SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,_("Zoom")); -SYNFIG_LAYER_SET_CATEGORY(Zoom,_("Transform")); +SYNFIG_LAYER_SET_LOCAL_NAME(Zoom,N_("Zoom")); +SYNFIG_LAYER_SET_CATEGORY(Zoom,N_("Transform")); SYNFIG_LAYER_SET_VERSION(Zoom,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Zoom,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/blur.cpp b/synfig-core/trunk/src/modules/mod_filter/blur.cpp index 3f22b9c..40c6be0 100644 --- a/synfig-core/trunk/src/modules/mod_filter/blur.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/blur.cpp @@ -63,8 +63,8 @@ using namespace std; SYNFIG_LAYER_INIT(Blur_Layer); SYNFIG_LAYER_SET_NAME(Blur_Layer,"blur"); -SYNFIG_LAYER_SET_LOCAL_NAME(Blur_Layer,_("Blur")); -SYNFIG_LAYER_SET_CATEGORY(Blur_Layer,_("Blurs")); +SYNFIG_LAYER_SET_LOCAL_NAME(Blur_Layer,N_("Blur")); +SYNFIG_LAYER_SET_CATEGORY(Blur_Layer,N_("Blurs")); SYNFIG_LAYER_SET_VERSION(Blur_Layer,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Blur_Layer,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp index 5afce85..474d523 100644 --- a/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/colorcorrect.cpp @@ -51,8 +51,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Layer_ColorCorrect); SYNFIG_LAYER_SET_NAME(Layer_ColorCorrect,"colorcorrect"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_ColorCorrect,_("Color Correct")); -SYNFIG_LAYER_SET_CATEGORY(Layer_ColorCorrect,_("Filters")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_ColorCorrect,N_("Color Correct")); +SYNFIG_LAYER_SET_CATEGORY(Layer_ColorCorrect,N_("Filters")); SYNFIG_LAYER_SET_VERSION(Layer_ColorCorrect,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_ColorCorrect,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp index b6cad89..5ccb9e3 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone2.cpp @@ -54,8 +54,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Halftone2); SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2"); -SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,_("Halftone 2")); -SYNFIG_LAYER_SET_CATEGORY(Halftone2,_("Filters")); +SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2")); +SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters")); SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0"); SYNFIG_LAYER_SET_CVS_ID(Halftone2,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp index 5646865..6df7d5d 100644 --- a/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/halftone3.cpp @@ -54,8 +54,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Halftone3); SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3"); -SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,_("Halftone 3")); -SYNFIG_LAYER_SET_CATEGORY(Halftone3,_("Filters")); +SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,N_("Halftone 3")); +SYNFIG_LAYER_SET_CATEGORY(Halftone3,N_("Filters")); SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0"); SYNFIG_LAYER_SET_CVS_ID(Halftone3,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp b/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp index 20cf143..d629ebe 100644 --- a/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/lumakey.cpp @@ -54,8 +54,8 @@ using namespace etl; SYNFIG_LAYER_INIT(LumaKey); SYNFIG_LAYER_SET_NAME(LumaKey,"lumakey"); -SYNFIG_LAYER_SET_LOCAL_NAME(LumaKey,_("Luma Key")); -SYNFIG_LAYER_SET_CATEGORY(LumaKey,_("Filters")); +SYNFIG_LAYER_SET_LOCAL_NAME(LumaKey,N_("Luma Key")); +SYNFIG_LAYER_SET_CATEGORY(LumaKey,N_("Filters")); SYNFIG_LAYER_SET_VERSION(LumaKey,"0.1"); SYNFIG_LAYER_SET_CVS_ID(LumaKey,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp b/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp index 484c162..826d34d 100644 --- a/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp +++ b/synfig-core/trunk/src/modules/mod_filter/radialblur.cpp @@ -52,8 +52,8 @@ SYNFIG_LAYER_INIT(RadialBlur); SYNFIG_LAYER_SET_NAME(RadialBlur,"radial_blur"); -SYNFIG_LAYER_SET_LOCAL_NAME(RadialBlur,_("Radial Blur")); -SYNFIG_LAYER_SET_CATEGORY(RadialBlur,_("Blurs")); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialBlur,N_("Radial Blur")); +SYNFIG_LAYER_SET_CATEGORY(RadialBlur,N_("Blurs")); SYNFIG_LAYER_SET_VERSION(RadialBlur,"0.1"); SYNFIG_LAYER_SET_CVS_ID(RadialBlur,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp index 02e8591..bda8ab9 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/checkerboard.cpp @@ -54,8 +54,8 @@ using namespace etl; SYNFIG_LAYER_INIT(CheckerBoard); SYNFIG_LAYER_SET_NAME(CheckerBoard,"checker_board"); -SYNFIG_LAYER_SET_LOCAL_NAME(CheckerBoard,_("Checkerboard")); -SYNFIG_LAYER_SET_CATEGORY(CheckerBoard,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(CheckerBoard,N_("Checkerboard")); +SYNFIG_LAYER_SET_CATEGORY(CheckerBoard,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(CheckerBoard,"0.1"); SYNFIG_LAYER_SET_CVS_ID(CheckerBoard,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp index 5d2ae39..fca1ef7 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/circle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/circle.cpp @@ -51,8 +51,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Circle); SYNFIG_LAYER_SET_NAME(Circle,"circle"); -SYNFIG_LAYER_SET_LOCAL_NAME(Circle,_("Circle")); -SYNFIG_LAYER_SET_CATEGORY(Circle,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Circle,N_("Circle")); +SYNFIG_LAYER_SET_CATEGORY(Circle,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Circle,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Circle,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp index 4d44cf4..f2fb884 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/outline.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/outline.cpp @@ -67,8 +67,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Outline); SYNFIG_LAYER_SET_NAME(Outline,"outline"); -SYNFIG_LAYER_SET_LOCAL_NAME(Outline,_("Outline")); -SYNFIG_LAYER_SET_CATEGORY(Outline,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Outline,N_("Outline")); +SYNFIG_LAYER_SET_CATEGORY(Outline,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Outline,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Outline,"$Id$"); @@ -175,7 +175,7 @@ Outline::sync() if (!bline.get_list().size()) { - synfig::warning(string("Outline::sync():")+_("No vertices in outline " + string("\"") + get_description() + string("\""))); + synfig::warning(string("Outline::sync():")+N_("No vertices in outline " + string("\"") + get_description() + string("\""))); return; } diff --git a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp index e9c40b7..35260fe 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/rectangle.cpp @@ -55,8 +55,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Rectangle); SYNFIG_LAYER_SET_NAME(Rectangle,"rectangle"); -SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,_("Rectangle")); -SYNFIG_LAYER_SET_CATEGORY(Rectangle,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Rectangle,N_("Rectangle")); +SYNFIG_LAYER_SET_CATEGORY(Rectangle,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Rectangle,"0.2"); SYNFIG_LAYER_SET_CVS_ID(Rectangle,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_geometry/region.cpp b/synfig-core/trunk/src/modules/mod_geometry/region.cpp index 4beb9ad..854d05f 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/region.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/region.cpp @@ -60,8 +60,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Region); SYNFIG_LAYER_SET_NAME(Region,"region"); -SYNFIG_LAYER_SET_LOCAL_NAME(Region,_("Region")); -SYNFIG_LAYER_SET_CATEGORY(Region,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Region,N_("Region")); +SYNFIG_LAYER_SET_CATEGORY(Region,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Region,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Region,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_geometry/star.cpp b/synfig-core/trunk/src/modules/mod_geometry/star.cpp index eda6897..3ec522d 100644 --- a/synfig-core/trunk/src/modules/mod_geometry/star.cpp +++ b/synfig-core/trunk/src/modules/mod_geometry/star.cpp @@ -58,8 +58,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Star); SYNFIG_LAYER_SET_NAME(Star,"star"); -SYNFIG_LAYER_SET_LOCAL_NAME(Star,_("Star")); -SYNFIG_LAYER_SET_CATEGORY(Star,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Star,N_("Star")); +SYNFIG_LAYER_SET_CATEGORY(Star,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Star,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Star,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp index c4c2e62..0fc55da 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/conicalgradient.cpp @@ -53,8 +53,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(ConicalGradient); SYNFIG_LAYER_SET_NAME(ConicalGradient,"conical_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(ConicalGradient,_("Conical Gradient")); -SYNFIG_LAYER_SET_CATEGORY(ConicalGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(ConicalGradient,N_("Conical Gradient")); +SYNFIG_LAYER_SET_CATEGORY(ConicalGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(ConicalGradient,"0.1"); SYNFIG_LAYER_SET_CVS_ID(ConicalGradient,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp index 2fb682f..8f03bed 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/curvegradient.cpp @@ -54,8 +54,8 @@ SYNFIG_LAYER_INIT(CurveGradient); SYNFIG_LAYER_SET_NAME(CurveGradient,"curve_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,_("Curve Gradient")); -SYNFIG_LAYER_SET_CATEGORY(CurveGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,N_("Curve Gradient")); +SYNFIG_LAYER_SET_CATEGORY(CurveGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.0"); SYNFIG_LAYER_SET_CVS_ID(CurveGradient,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp index 182cecd..1d6d546 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/lineargradient.cpp @@ -50,8 +50,8 @@ SYNFIG_LAYER_INIT(LinearGradient); SYNFIG_LAYER_SET_NAME(LinearGradient,"linear_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,_("Linear Gradient")); -SYNFIG_LAYER_SET_CATEGORY(LinearGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(LinearGradient,N_("Linear Gradient")); +SYNFIG_LAYER_SET_CATEGORY(LinearGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(LinearGradient,"0.0"); SYNFIG_LAYER_SET_CVS_ID(LinearGradient,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp index c52616f..9d8958a 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/radialgradient.cpp @@ -53,8 +53,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(RadialGradient); SYNFIG_LAYER_SET_NAME(RadialGradient,"radial_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,_("Radial Gradient")); -SYNFIG_LAYER_SET_CATEGORY(RadialGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(RadialGradient,N_("Radial Gradient")); +SYNFIG_LAYER_SET_CATEGORY(RadialGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(RadialGradient,"0.1"); SYNFIG_LAYER_SET_CVS_ID(RadialGradient,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp index f4427b1..ed45997 100644 --- a/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp +++ b/synfig-core/trunk/src/modules/mod_gradient/spiralgradient.cpp @@ -52,8 +52,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(SpiralGradient); SYNFIG_LAYER_SET_NAME(SpiralGradient,"spiral_gradient"); -SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,_("Spiral Gradient")); -SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(SpiralGradient,N_("Spiral Gradient")); +SYNFIG_LAYER_SET_CATEGORY(SpiralGradient,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(SpiralGradient,"0.1"); SYNFIG_LAYER_SET_CVS_ID(SpiralGradient,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_noise/distort.cpp b/synfig-core/trunk/src/modules/mod_noise/distort.cpp index 950e7cc..eed77f9 100644 --- a/synfig-core/trunk/src/modules/mod_noise/distort.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/distort.cpp @@ -53,8 +53,8 @@ using namespace etl; SYNFIG_LAYER_INIT(NoiseDistort); SYNFIG_LAYER_SET_NAME(NoiseDistort,"noise_distort"); -SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,_("Noise Distort")); -SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,_("Distortions")); +SYNFIG_LAYER_SET_LOCAL_NAME(NoiseDistort,N_("Noise Distort")); +SYNFIG_LAYER_SET_CATEGORY(NoiseDistort,N_("Distortions")); SYNFIG_LAYER_SET_VERSION(NoiseDistort,"0.0"); SYNFIG_LAYER_SET_CVS_ID(NoiseDistort,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_noise/noise.cpp b/synfig-core/trunk/src/modules/mod_noise/noise.cpp index 309efc9..b0cbcc0 100644 --- a/synfig-core/trunk/src/modules/mod_noise/noise.cpp +++ b/synfig-core/trunk/src/modules/mod_noise/noise.cpp @@ -52,8 +52,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Noise); SYNFIG_LAYER_SET_NAME(Noise,"noise"); -SYNFIG_LAYER_SET_LOCAL_NAME(Noise,_("Noise Gradient")); -SYNFIG_LAYER_SET_CATEGORY(Noise,_("Gradients")); +SYNFIG_LAYER_SET_LOCAL_NAME(Noise,N_("Noise Gradient")); +SYNFIG_LAYER_SET_CATEGORY(Noise,N_("Gradients")); SYNFIG_LAYER_SET_VERSION(Noise,"0.0"); SYNFIG_LAYER_SET_CVS_ID(Noise,"$Id$"); diff --git a/synfig-core/trunk/src/modules/mod_particle/plant.cpp b/synfig-core/trunk/src/modules/mod_particle/plant.cpp index 3cad963..234ce89 100644 --- a/synfig-core/trunk/src/modules/mod_particle/plant.cpp +++ b/synfig-core/trunk/src/modules/mod_particle/plant.cpp @@ -65,8 +65,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Plant); SYNFIG_LAYER_SET_NAME(Plant,"plant"); -SYNFIG_LAYER_SET_LOCAL_NAME(Plant,_("Plant")); -SYNFIG_LAYER_SET_CATEGORY(Plant,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Plant,N_("Plant")); +SYNFIG_LAYER_SET_CATEGORY(Plant,N_("Other")); SYNFIG_LAYER_SET_VERSION(Plant,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Plant,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/general.h b/synfig-core/trunk/src/synfig/general.h index 38b4565..238f78e 100644 --- a/synfig-core/trunk/src/synfig/general.h +++ b/synfig-core/trunk/src/synfig/general.h @@ -31,15 +31,13 @@ #include "string.h" #include "version.h" #include +#include /* === M A C R O S ========================================================= */ -// Quick hack to keep stuff working until gettext support is added -#ifndef _ -#define _(x) (x) -#define N_(x) (x) -//#define gettext(x) (x) -#endif +#define _(x) dgettext("synfig",x) +#define gettext_noop(x) x +#define N_(x) gettext_noop(x) #define SYNFIG_COPYRIGHT "Copyright (c) 2001-2005 Robert B. Quattlebaum Jr., Adrian Bentley" diff --git a/synfig-core/trunk/src/synfig/layer.cpp b/synfig-core/trunk/src/synfig/layer.cpp index 2ff73c4..14ff7a4 100644 --- a/synfig-core/trunk/src/synfig/layer.cpp +++ b/synfig-core/trunk/src/synfig/layer.cpp @@ -96,7 +96,7 @@ Layer::subsys_init() { _layer_book=new Book(); -#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,class::local_name__,class::category__,class::cvs_id__,class::version__) +#define INCLUDE_LAYER(class) synfig::Layer::book()[synfig::String(class::name__)]=BookEntry(class::create,class::name__,dgettext("synfig",class::local_name__),dgettext("synfig",class::category__),class::cvs_id__,class::version__) #define LAYER_ALIAS(class,alias) synfig::Layer::book()[synfig::String(alias)]=synfig::Layer::BookEntry(class::create,alias,alias,_("Do Not Use"),class::cvs_id__,class::version__); INCLUDE_LAYER(Layer_SolidColor); LAYER_ALIAS(Layer_SolidColor, "solid_color"); @@ -500,7 +500,7 @@ Layer::get_name()const String Layer::get_local_name()const { - return get_param("local_name__").get(String()); + return dgettext("synfig",get_param("local_name__").get(String())); } diff --git a/synfig-core/trunk/src/synfig/layer.h b/synfig-core/trunk/src/synfig/layer.h index a3ae3b7..e8cf1a6 100644 --- a/synfig-core/trunk/src/synfig/layer.h +++ b/synfig-core/trunk/src/synfig/layer.h @@ -77,7 +77,7 @@ #define EXPORT(x) EXPORT_AS(x,#x) //! \writeme -#define EXPORT_NAME() if(param=="Name" || param=="name" || param=="name__") { return name__; } if(param=="local_name__") { return local_name__; } +#define EXPORT_NAME() if(param=="Name" || param=="name" || param=="name__") { return name__; } if(param=="local_name__") { return dgettext("synfig",local_name__); } //! \writeme #define EXPORT_VERSION() if(param=="Version" || param=="version" || param=="version__") { return version__; } diff --git a/synfig-core/trunk/src/synfig/layer_motionblur.cpp b/synfig-core/trunk/src/synfig/layer_motionblur.cpp index b02ba72..691197d 100644 --- a/synfig-core/trunk/src/synfig/layer_motionblur.cpp +++ b/synfig-core/trunk/src/synfig/layer_motionblur.cpp @@ -53,8 +53,8 @@ using namespace std; SYNFIG_LAYER_INIT(Layer_MotionBlur); SYNFIG_LAYER_SET_NAME(Layer_MotionBlur,"MotionBlur"); // todo: use motion_blur -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,_("Motion Blur")); -SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,_("Blurs")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_MotionBlur,N_("Motion Blur")); +SYNFIG_LAYER_SET_CATEGORY(Layer_MotionBlur,N_("Blurs")); SYNFIG_LAYER_SET_VERSION(Layer_MotionBlur,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_MotionBlur,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp index 89b3f28..4095de7 100644 --- a/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp +++ b/synfig-core/trunk/src/synfig/layer_pastecanvas.cpp @@ -71,8 +71,8 @@ public: SYNFIG_LAYER_INIT(Layer_PasteCanvas); SYNFIG_LAYER_SET_NAME(Layer_PasteCanvas,"PasteCanvas"); // todo: use paste_canvas -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,_("Paste Canvas")); -SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,_("Other")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_PasteCanvas,N_("Paste Canvas")); +SYNFIG_LAYER_SET_CATEGORY(Layer_PasteCanvas,N_("Other")); SYNFIG_LAYER_SET_VERSION(Layer_PasteCanvas,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_PasteCanvas,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/layer_polygon.cpp b/synfig-core/trunk/src/synfig/layer_polygon.cpp index 94de2b9..067f3bd 100644 --- a/synfig-core/trunk/src/synfig/layer_polygon.cpp +++ b/synfig-core/trunk/src/synfig/layer_polygon.cpp @@ -56,8 +56,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Layer_Polygon); SYNFIG_LAYER_SET_NAME(Layer_Polygon,"polygon"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Polygon,_("Polygon")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Polygon,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Polygon,N_("Polygon")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Polygon,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Layer_Polygon,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_Polygon,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/layer_shape.cpp b/synfig-core/trunk/src/synfig/layer_shape.cpp index a686bcf..2d8af12 100644 --- a/synfig-core/trunk/src/synfig/layer_shape.cpp +++ b/synfig-core/trunk/src/synfig/layer_shape.cpp @@ -60,8 +60,8 @@ using namespace etl; SYNFIG_LAYER_INIT(Layer_Shape); SYNFIG_LAYER_SET_NAME(Layer_Shape,"shape"); -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shape,_("Shape")); -SYNFIG_LAYER_SET_CATEGORY(Layer_Shape,_("Internal")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Shape,N_("Shape")); +SYNFIG_LAYER_SET_CATEGORY(Layer_Shape,N_("Internal")); SYNFIG_LAYER_SET_VERSION(Layer_Shape,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_Shape,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp index c92148c..5e226e4 100644 --- a/synfig-core/trunk/src/synfig/layer_solidcolor.cpp +++ b/synfig-core/trunk/src/synfig/layer_solidcolor.cpp @@ -52,8 +52,8 @@ using namespace synfig; SYNFIG_LAYER_INIT(Layer_SolidColor); SYNFIG_LAYER_SET_NAME(Layer_SolidColor,"SolidColor"); // todo: use solid_color -SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,_("Solid Color")); -SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,_("Geometry")); +SYNFIG_LAYER_SET_LOCAL_NAME(Layer_SolidColor,N_("Solid Color")); +SYNFIG_LAYER_SET_CATEGORY(Layer_SolidColor,N_("Geometry")); SYNFIG_LAYER_SET_VERSION(Layer_SolidColor,"0.1"); SYNFIG_LAYER_SET_CVS_ID(Layer_SolidColor,"$Id$"); diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp index 2c5be13..da9cd31 100644 --- a/synfig-core/trunk/src/synfig/main.cpp +++ b/synfig-core/trunk/src/synfig/main.cpp @@ -219,6 +219,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb): // Add initialization after this point + bindtextdomain("synfig", LOCALEDIR); CHECK_EXPIRE_TIME(); diff --git a/synfig-core/trunk/src/tool/main.cpp b/synfig-core/trunk/src/tool/main.cpp index 8141c00..6a20447 100644 --- a/synfig-core/trunk/src/tool/main.cpp +++ b/synfig-core/trunk/src/tool/main.cpp @@ -57,6 +57,9 @@ using namespace synfig; /* === M A C R O S ========================================================= */ +#undef _ +#define _(x) gettext(x) + enum exit_code { SYNFIGTOOL_OK = 0, @@ -836,6 +839,10 @@ int main(int argc, char *argv[]) arg_list_t arg_list; job_list_t job_list; + setlocale(LC_ALL, ""); + bindtextdomain("synfig", LOCALEDIR); + textdomain("synfig"); + progname=argv[0]; Progress p(argv[0]); diff --git a/synfig-studio/trunk/Makefile.am b/synfig-studio/trunk/Makefile.am index fa4503e..e30abb0 100644 --- a/synfig-studio/trunk/Makefile.am +++ b/synfig-studio/trunk/Makefile.am @@ -2,7 +2,7 @@ MAINTAINERCLEANFILES=COPYING INSTALL config/ltmain.sh config/config.guess config/config.sub config/ltmain.sh config/install-sh config/mkinstalldirs config/aclocal.m4 config/missing config/texinfo.tex config/depcomp aclocal.m4 config.h.in configure stamp-h.in Makefile.in config.log config.status .doc_stamp .DS_Store synfigstudio.spec -SUBDIRS=src images +SUBDIRS=src images po EXTRA_DIST=COPYING TODO m4/subs.m4 macosxbuild.sh win32build.sh win32inst.nsi.in config/package config/depcomp m4/cxx_macros.m4 synfigstudio.spec synfigstudio.spec.in m4/ETL.m4 ChangeLog.old synfigstudio.xml.in synfigstudio-thumbnailer.schemas.in diff --git a/synfig-studio/trunk/configure.ac b/synfig-studio/trunk/configure.ac index ce4e74c..858ea45 100755 --- a/synfig-studio/trunk/configure.ac +++ b/synfig-studio/trunk/configure.ac @@ -22,6 +22,7 @@ SVN_REPOSITORY=http://svn.voria.com/code/synfig-studio # -- P R O G R A M S ------------------------------------------ AC_PROG_CC +AC_GNU_SOURCE AC_PROG_CXX AC_PROG_CPP AC_PROG_CXXCPP @@ -56,11 +57,13 @@ AC_PROG_LIBTOOL AC_SUBST(LIBTOOL_DEPS) AC_LIBTOOL_PATCH - - - - -dnl AC_PROG_INTLTOOL(0.11) +## FIXME: add i18n for .desktop and other non-compiled files +## AM_GLIB_GNU_GETTEXT([external]) +## AC_PROG_INTLTOOL(0.11) +ALL_LINGUAS="en_AU" +AM_GNU_GETTEXT([external]) +# This is here so autoreconf will run autopoint +AM_GNU_GETTEXT_VERSION([0.16.1]) case "$host" in *mingw* | *cygwin*) @@ -167,6 +170,7 @@ AC_SUBST(imagedir) AC_OUTPUT( Makefile +po/Makefile.in synfigstudio.spec synfigstudio.desktop synfigstudio.mime diff --git a/synfig-studio/trunk/po/Makevars b/synfig-studio/trunk/po/Makevars new file mode 100644 index 0000000..2c76ef8 --- /dev/null +++ b/synfig-studio/trunk/po/Makevars @@ -0,0 +1,7 @@ +DOMAIN = synfigstudio +subdir = po +top_builddir = .. +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ +COPYRIGHT_HOLDER = Synfig Contributors +MSGID_BUGS_ADDRESS = http://www.synfig.com +EXTRA_LOCALE_CATEGORIES = diff --git a/synfig-studio/trunk/po/POTFILES.in b/synfig-studio/trunk/po/POTFILES.in new file mode 100644 index 0000000..f44d82d --- /dev/null +++ b/synfig-studio/trunk/po/POTFILES.in @@ -0,0 +1,405 @@ +src/gtkmm/about.cpp +src/gtkmm/about.h +src/gtkmm/adjust_window.cpp +src/gtkmm/adjust_window.h +src/gtkmm/app.cpp +src/gtkmm/app.h +src/gtkmm/asyncrenderer.cpp +src/gtkmm/asyncrenderer.h +src/gtkmm/audiocontainer.cpp +src/gtkmm/audiocontainer.h +src/gtkmm/autorecover.cpp +src/gtkmm/autorecover.h +src/gtkmm/canvasoptions.cpp +src/gtkmm/canvasoptions.h +src/gtkmm/canvasproperties.cpp +src/gtkmm/canvasproperties.h +src/gtkmm/canvastreestore.cpp +src/gtkmm/canvastreestore.h +src/gtkmm/canvasview.cpp +src/gtkmm/canvasview.h +src/gtkmm/cellrenderer_gradient.cpp +src/gtkmm/cellrenderer_gradient.h +src/gtkmm/cellrenderer_time.cpp +src/gtkmm/cellrenderer_time.h +src/gtkmm/cellrenderer_timetrack.cpp +src/gtkmm/cellrenderer_timetrack.h +src/gtkmm/cellrenderer_value.cpp +src/gtkmm/cellrenderer_value.h +src/gtkmm/childrentree.cpp +src/gtkmm/childrentree.h +src/gtkmm/childrentreestore.cpp +src/gtkmm/childrentreestore.h +src/gtkmm/compview.cpp +src/gtkmm/compview.h +src/gtkmm/devicetracker.cpp +src/gtkmm/devicetracker.h +src/gtkmm/dialog_color.cpp +src/gtkmm/dialog_color.h +src/gtkmm/dialog_gradient.cpp +src/gtkmm/dialog_gradient.h +src/gtkmm/dialog_keyframe.cpp +src/gtkmm/dialog_keyframe.h +src/gtkmm/dialog_preview.cpp +src/gtkmm/dialog_preview.h +src/gtkmm/dialogsettings.cpp +src/gtkmm/dialogsettings.h +src/gtkmm/dialog_setup.cpp +src/gtkmm/dialog_setup.h +src/gtkmm/dialog_soundselect.cpp +src/gtkmm/dialog_soundselect.h +src/gtkmm/dialog_tooloptions.cpp +src/gtkmm/dialog_tooloptions.h +src/gtkmm/dialog_waypoint.cpp +src/gtkmm/dialog_waypoint.h +src/gtkmm/dockable.cpp +src/gtkmm/dockable.h +src/gtkmm/dockbook.cpp +src/gtkmm/dockbook.h +src/gtkmm/dock_canvases.cpp +src/gtkmm/dock_canvases.h +src/gtkmm/dock_canvasspecific.cpp +src/gtkmm/dock_canvasspecific.h +src/gtkmm/dock_children.cpp +src/gtkmm/dock_children.h +src/gtkmm/dock_curves.cpp +src/gtkmm/dock_curves.h +src/gtkmm/dockdialog.cpp +src/gtkmm/dockdialog.h +src/gtkmm/dock_history.cpp +src/gtkmm/dock_history.h +src/gtkmm/dock_info.cpp +src/gtkmm/dock_info.h +src/gtkmm/dock_keyframes.cpp +src/gtkmm/dock_keyframes.h +src/gtkmm/dock_layergroups.cpp +src/gtkmm/dock_layergroups.h +src/gtkmm/dock_layers.cpp +src/gtkmm/dock_layers.h +src/gtkmm/dockmanager.cpp +src/gtkmm/dockmanager.h +src/gtkmm/dock_metadata.cpp +src/gtkmm/dock_metadata.h +src/gtkmm/dock_navigator.cpp +src/gtkmm/dock_navigator.h +src/gtkmm/dock_params.cpp +src/gtkmm/dock_params.h +src/gtkmm/dock_timetrack.cpp +src/gtkmm/dock_timetrack.h +src/gtkmm/duck.cpp +src/gtkmm/duck.h +src/gtkmm/duckmatic.cpp +src/gtkmm/duckmatic.h +src/gtkmm/ducktransform_rotate.h +src/gtkmm/ducktransform_scale.h +src/gtkmm/ducktransform_translate.h +src/gtkmm/eventkey.h +src/gtkmm/event_layerclick.h +src/gtkmm/event_mouse.h +src/gtkmm/groupactionmanager.cpp +src/gtkmm/groupactionmanager.h +src/gtkmm/historytreestore.cpp +src/gtkmm/historytreestore.h +src/gtkmm/iconcontroller.cpp +src/gtkmm/iconcontroller.h +src/gtkmm/instance.cpp +src/gtkmm/instance.h +src/gtkmm/ipc.cpp +src/gtkmm/ipc.h +src/gtkmm/keyframeactionmanager.cpp +src/gtkmm/keyframeactionmanager.h +src/gtkmm/keyframetree.cpp +src/gtkmm/keyframetree.h +src/gtkmm/keyframetreestore.cpp +src/gtkmm/keyframetreestore.h +src/gtkmm/keymapsettings.cpp +src/gtkmm/keymapsettings.h +src/gtkmm/layeractionmanager.cpp +src/gtkmm/layeractionmanager.h +src/gtkmm/layergrouptree.cpp +src/gtkmm/layergrouptree.h +src/gtkmm/layergrouptreestore.cpp +src/gtkmm/layergrouptreestore.h +src/gtkmm/layerparamtreestore.cpp +src/gtkmm/layerparamtreestore.h +src/gtkmm/layertree.cpp +src/gtkmm/layertree.h +src/gtkmm/layertreestore.cpp +src/gtkmm/layertreestore.h +src/gtkmm/main.cpp +src/gtkmm/metadatatreestore.cpp +src/gtkmm/metadatatreestore.h +src/gtkmm/mod_mirror/mod_mirror.cpp +src/gtkmm/mod_mirror/mod_mirror.h +src/gtkmm/mod_mirror/state_mirror.cpp +src/gtkmm/mod_mirror/state_mirror.h +src/gtkmm/mod_palette/dock_palbrowse.cpp +src/gtkmm/mod_palette/dock_palbrowse.h +src/gtkmm/mod_palette/dock_paledit.cpp +src/gtkmm/mod_palette/dock_paledit.h +src/gtkmm/mod_palette/mod_palette.cpp +src/gtkmm/mod_palette/mod_palette.h +src/gtkmm/module.cpp +src/gtkmm/module.h +src/gtkmm/onemoment.cpp +src/gtkmm/onemoment.h +src/gtkmm/preview.cpp +src/gtkmm/preview.h +src/gtkmm/renddesc.cpp +src/gtkmm/renddesc.h +src/gtkmm/render.cpp +src/gtkmm/renderer_bbox.cpp +src/gtkmm/renderer_bbox.h +src/gtkmm/renderer_canvas.cpp +src/gtkmm/renderer_canvas.h +src/gtkmm/renderer_dragbox.cpp +src/gtkmm/renderer_dragbox.h +src/gtkmm/renderer_ducks.cpp +src/gtkmm/renderer_ducks.h +src/gtkmm/renderer_grid.cpp +src/gtkmm/renderer_grid.h +src/gtkmm/renderer_guides.cpp +src/gtkmm/renderer_guides.h +src/gtkmm/renderer_timecode.cpp +src/gtkmm/renderer_timecode.h +src/gtkmm/render.h +src/gtkmm/smach.h +src/gtkmm/state_bline.cpp +src/gtkmm/state_bline.h +src/gtkmm/state_circle.cpp +src/gtkmm/state_circle.h +src/gtkmm/state_draw.cpp +src/gtkmm/state_draw.h +src/gtkmm/state_eyedrop.cpp +src/gtkmm/state_eyedrop.h +src/gtkmm/state_fill.cpp +src/gtkmm/state_fill.h +src/gtkmm/state_gradient.cpp +src/gtkmm/state_gradient.h +src/gtkmm/statemanager.cpp +src/gtkmm/statemanager.h +src/gtkmm/state_normal.cpp +src/gtkmm/state_normal.h +src/gtkmm/state_polygon.cpp +src/gtkmm/state_polygon.h +src/gtkmm/state_rectangle.cpp +src/gtkmm/state_rectangle.h +src/gtkmm/state_rotate.cpp +src/gtkmm/state_rotate.h +src/gtkmm/state_scale.cpp +src/gtkmm/state_scale.h +src/gtkmm/state_sketch.cpp +src/gtkmm/state_sketch.h +src/gtkmm/state_smoothmove.cpp +src/gtkmm/state_smoothmove.h +src/gtkmm/state_stroke.cpp +src/gtkmm/state_stroke.h +src/gtkmm/state_width.cpp +src/gtkmm/state_width.h +src/gtkmm/state_zoom.cpp +src/gtkmm/state_zoom.h +src/gtkmm/toolbox.cpp +src/gtkmm/toolbox.h +src/gtkmm/valuelink.cpp +src/gtkmm/valuelink.h +src/gtkmm/widget_canvaschooser.cpp +src/gtkmm/widget_canvaschooser.h +src/gtkmm/widget_color.cpp +src/gtkmm/widget_coloredit.cpp +src/gtkmm/widget_coloredit.h +src/gtkmm/widget_color.h +src/gtkmm/widget_compselect.cpp +src/gtkmm/widget_compselect.h +src/gtkmm/widget_curves.cpp +src/gtkmm/widget_curves.h +src/gtkmm/widget_defaults.cpp +src/gtkmm/widget_defaults.h +src/gtkmm/widget_distance.cpp +src/gtkmm/widget_distance.h +src/gtkmm/widget_enum.cpp +src/gtkmm/widget_enum.h +src/gtkmm/widget_filename.cpp +src/gtkmm/widget_filename.h +src/gtkmm/widget_gradient.cpp +src/gtkmm/widget_gradient.h +src/gtkmm/widget_sound.cpp +src/gtkmm/widget_sound.h +src/gtkmm/widget_time.cpp +src/gtkmm/widget_time.h +src/gtkmm/widget_timeslider.cpp +src/gtkmm/widget_timeslider.h +src/gtkmm/widget_value.cpp +src/gtkmm/widget_value.h +src/gtkmm/widget_vector.cpp +src/gtkmm/widget_vector.h +src/gtkmm/widget_waypoint.cpp +src/gtkmm/widget_waypoint.h +src/gtkmm/widget_waypointmodel.cpp +src/gtkmm/widget_waypointmodel.h +src/gtkmm/workarea.cpp +src/gtkmm/workarea.h +src/gtkmm/workarearenderer.cpp +src/gtkmm/workarearenderer.h +src/gtkmm/zoomdial.cpp +src/gtkmm/zoomdial.h +# FIXME: Split these out into a libsynfigapp domain +src/synfigapp/action.cpp +src/synfigapp/action.h +src/synfigapp/action_param.cpp +src/synfigapp/action_param.h +src/synfigapp/actions/activepointadd.cpp +src/synfigapp/actions/activepointadd.h +src/synfigapp/actions/activepointremove.cpp +src/synfigapp/actions/activepointremove.h +src/synfigapp/actions/activepointset.cpp +src/synfigapp/actions/activepointset.h +src/synfigapp/actions/activepointsetoff.cpp +src/synfigapp/actions/activepointsetoff.h +src/synfigapp/actions/activepointseton.cpp +src/synfigapp/actions/activepointseton.h +src/synfigapp/actions/activepointsetsmart.cpp +src/synfigapp/actions/activepointsetsmart.h +src/synfigapp/actions/activepointsimpleadd.cpp +src/synfigapp/actions/activepointsimpleadd.h +src/synfigapp/actions/blinepointtangentmerge.cpp +src/synfigapp/actions/blinepointtangentmerge.h +src/synfigapp/actions/blinepointtangentsplit.cpp +src/synfigapp/actions/blinepointtangentsplit.h +src/synfigapp/actions/canvasadd.cpp +src/synfigapp/actions/canvasadd.h +src/synfigapp/actions/canvasremove.cpp +src/synfigapp/actions/canvasremove.h +src/synfigapp/actions/canvasrenddescset.cpp +src/synfigapp/actions/canvasrenddescset.h +src/synfigapp/actions/colorset.cpp +src/synfigapp/actions/colorset.h +src/synfigapp/actions/editmodeset.cpp +src/synfigapp/actions/editmodeset.h +src/synfigapp/actions/gradientset.cpp +src/synfigapp/actions/gradientset.h +src/synfigapp/actions/groupaddlayers.cpp +src/synfigapp/actions/groupaddlayers.h +src/synfigapp/actions/groupremove.cpp +src/synfigapp/actions/groupremove.h +src/synfigapp/actions/groupremovelayers.cpp +src/synfigapp/actions/groupremovelayers.h +src/synfigapp/actions/grouprename.cpp +src/synfigapp/actions/grouprename.h +src/synfigapp/actions/keyframeadd.cpp +src/synfigapp/actions/keyframeadd.h +src/synfigapp/actions/keyframeduplicate.cpp +src/synfigapp/actions/keyframeduplicate.h +src/synfigapp/actions/keyframeremove.cpp +src/synfigapp/actions/keyframeremove.h +src/synfigapp/actions/keyframeset.cpp +src/synfigapp/actions/keyframesetdelta.cpp +src/synfigapp/actions/keyframesetdelta.h +src/synfigapp/actions/keyframeset.h +src/synfigapp/actions/keyframewaypointset.cpp +src/synfigapp/actions/keyframewaypointset.h +src/synfigapp/actions/layeractivate.cpp +src/synfigapp/actions/layeractivate.h +src/synfigapp/actions/layeradd.cpp +src/synfigapp/actions/layeradd.h +src/synfigapp/actions/layerduplicate.cpp +src/synfigapp/actions/layerduplicate.h +src/synfigapp/actions/layerencapsulate.cpp +src/synfigapp/actions/layerencapsulate.h +src/synfigapp/actions/layerlower.cpp +src/synfigapp/actions/layerlower.h +src/synfigapp/actions/layermove.cpp +src/synfigapp/actions/layermove.h +src/synfigapp/actions/layerparamconnect.cpp +src/synfigapp/actions/layerparamconnect.h +src/synfigapp/actions/layerparamdisconnect.cpp +src/synfigapp/actions/layerparamdisconnect.h +src/synfigapp/actions/layerparamset.cpp +src/synfigapp/actions/layerparamset.h +src/synfigapp/actions/layerraise.cpp +src/synfigapp/actions/layerraise.h +src/synfigapp/actions/layerremove.cpp +src/synfigapp/actions/layerremove.h +src/synfigapp/actions/layersetdesc.cpp +src/synfigapp/actions/layersetdesc.h +src/synfigapp/actions/timepointscopy.cpp +src/synfigapp/actions/timepointscopy.h +src/synfigapp/actions/timepointsdelete.cpp +src/synfigapp/actions/timepointsdelete.h +src/synfigapp/actions/timepointsmove.cpp +src/synfigapp/actions/timepointsmove.h +src/synfigapp/actions/valuedescconnect.cpp +src/synfigapp/actions/valuedescconnect.h +src/synfigapp/actions/valuedescconvert.cpp +src/synfigapp/actions/valuedescconvert.h +src/synfigapp/actions/valuedescdisconnect.cpp +src/synfigapp/actions/valuedescdisconnect.h +src/synfigapp/actions/valuedescexport.cpp +src/synfigapp/actions/valuedescexport.h +src/synfigapp/actions/valuedesclink.cpp +src/synfigapp/actions/valuedesclink.h +src/synfigapp/actions/valuedescset.cpp +src/synfigapp/actions/valuedescset.h +src/synfigapp/actions/valuenodeadd.cpp +src/synfigapp/actions/valuenodeadd.h +src/synfigapp/actions/valuenodeconstset.cpp +src/synfigapp/actions/valuenodeconstset.h +src/synfigapp/actions/valuenodedynamiclistinsert.cpp +src/synfigapp/actions/valuenodedynamiclistinsert.h +src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp +src/synfigapp/actions/valuenodedynamiclistinsertsmart.h +src/synfigapp/actions/valuenodedynamiclistloop.cpp +src/synfigapp/actions/valuenodedynamiclistloop.h +src/synfigapp/actions/valuenodedynamiclistremove.cpp +src/synfigapp/actions/valuenodedynamiclistremove.h +src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp +src/synfigapp/actions/valuenodedynamiclistremovesmart.h +src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp +src/synfigapp/actions/valuenodedynamiclistrotateorder.h +src/synfigapp/actions/valuenodedynamiclistunloop.cpp +src/synfigapp/actions/valuenodedynamiclistunloop.h +src/synfigapp/actions/valuenodelinkconnect.cpp +src/synfigapp/actions/valuenodelinkconnect.h +src/synfigapp/actions/valuenodelinkdisconnect.cpp +src/synfigapp/actions/valuenodelinkdisconnect.h +src/synfigapp/actions/valuenoderemove.cpp +src/synfigapp/actions/valuenoderemove.h +src/synfigapp/actions/valuenoderename.cpp +src/synfigapp/actions/valuenoderename.h +src/synfigapp/actions/valuenodereplace.cpp +src/synfigapp/actions/valuenodereplace.h +src/synfigapp/actions/waypointadd.cpp +src/synfigapp/actions/waypointadd.h +src/synfigapp/actions/waypointremove.cpp +src/synfigapp/actions/waypointremove.h +src/synfigapp/actions/waypointset.cpp +src/synfigapp/actions/waypointset.h +src/synfigapp/actions/waypointsetsmart.cpp +src/synfigapp/actions/waypointsetsmart.h +src/synfigapp/actions/waypointsimpleadd.cpp +src/synfigapp/actions/waypointsimpleadd.h +src/synfigapp/action_system.cpp +src/synfigapp/action_system.h +src/synfigapp/blineconvert.cpp +src/synfigapp/blineconvert.h +src/synfigapp/canvasinterface.cpp +src/synfigapp/canvasinterface.h +src/synfigapp/cvs.cpp +src/synfigapp/cvs.h +src/synfigapp/editmode.h +src/synfigapp/inputdevice.cpp +src/synfigapp/inputdevice.h +src/synfigapp/instance.cpp +src/synfigapp/instance.h +src/synfigapp/main.cpp +src/synfigapp/main.h +src/synfigapp/selectionmanager.h +src/synfigapp/settings.cpp +src/synfigapp/settings.h +src/synfigapp/timegather.cpp +src/synfigapp/timegather.h +src/synfigapp/uimanager.cpp +src/synfigapp/uimanager.h +src/synfigapp/value_desc.h +# Disabled because they are not built +# src/template.cpp +# src/template.h diff --git a/synfig-studio/trunk/src/gtkmm/Makefile.am b/synfig-studio/trunk/src/gtkmm/Makefile.am index 97a71ca..5e25f26 100644 --- a/synfig-studio/trunk/src/gtkmm/Makefile.am +++ b/synfig-studio/trunk/src/gtkmm/Makefile.am @@ -51,4 +51,4 @@ bin_PROGRAMS = synfigstudio synfigstudio_SOURCES = $(MOD_MIRROR_CC) $(MOD_MIRROR_HH) $(PALETTE_CC) $(PALETTE_HH) $(WORKAREARENDERER_CC) $(WORKAREARENDERER_HH) $(ACTION_MANAGERS_HH) $(ACTION_MANAGERS_CC) $(DOCK_HH) $(DOCK_CC) $(OTHER_HH) $(OTHER_CC) $(EVENTS_HH) $(EVENTS_CC) $(DUCKTRANSFORM_HH) $(DUCKTRANSFORM_CC) $(TREEVIEW_HH) $(TREEVIEW_CC) $(TREESTORE_HH) $(TREESTORE_CC) $(STATE_CC) $(STATE_HH) $(WIDGET_CC) $(WIDGET_HH) $(DIALOG_HH) $(DIALOG_CC) $(CELLRENDERER_HH) $(CELLRENDERER_CC) synfigstudio_LDADD = -L../synfigapp -lsynfigapp @SYNFIG_LIBS@ @GTKMM_LIBS@ @FMOD_LIBS@ synfigstudio_LDFLAGS=-dlopen self -synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(imagedir)\" -DIMAGE_EXT=\"$(imageext)\" +synfigstudio_CXXFLAGS=@SYNFIG_CFLAGS@ @GTKMM_CFLAGS@ -DIMAGE_DIR=\"$(imagedir)\" -DIMAGE_EXT=\"$(imageext)\" "-DLOCALEDIR=\"$(localedir)\"" diff --git a/synfig-studio/trunk/src/gtkmm/about.cpp b/synfig-studio/trunk/src/gtkmm/about.cpp index 656a871..21d3d9a 100644 --- a/synfig-studio/trunk/src/gtkmm/about.cpp +++ b/synfig-studio/trunk/src/gtkmm/about.cpp @@ -48,6 +48,8 @@ #include "about.h" #include "app.h" +#include "general.h" + #endif using namespace std; diff --git a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp index 4fcea60..62823fb 100644 --- a/synfig-studio/trunk/src/gtkmm/adjust_window.cpp +++ b/synfig-studio/trunk/src/gtkmm/adjust_window.cpp @@ -32,6 +32,8 @@ #include "adjust_window.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp index e4b0268..e0be7b0 100644 --- a/synfig-studio/trunk/src/gtkmm/app.cpp +++ b/synfig-studio/trunk/src/gtkmm/app.cpp @@ -123,6 +123,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp index d68f762..0758c99 100644 --- a/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/asyncrenderer.cpp @@ -53,6 +53,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp index 8d6a30d..2420133 100644 --- a/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp +++ b/synfig-studio/trunk/src/gtkmm/audiocontainer.cpp @@ -54,6 +54,8 @@ #include #endif +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/autorecover.cpp b/synfig-studio/trunk/src/gtkmm/autorecover.cpp index a4b45d4..ed30406 100644 --- a/synfig-studio/trunk/src/gtkmm/autorecover.cpp +++ b/synfig-studio/trunk/src/gtkmm/autorecover.cpp @@ -62,6 +62,8 @@ #include #endif +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp index e1a7d21..79cfbd2 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasoptions.cpp @@ -38,6 +38,8 @@ #include "canvasview.h" #include "workarea.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp index f437c12..132d6ee 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasproperties.cpp @@ -40,6 +40,8 @@ #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp index 7ecc044..32d63a2 100644 --- a/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvastreestore.cpp @@ -40,6 +40,8 @@ #include "cellrenderer_timetrack.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp index 1d75c65..626374b 100644 --- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp +++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp @@ -99,6 +99,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp index c5a93e7..ffbc218 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_gradient.cpp @@ -35,6 +35,8 @@ #include "widget_gradient.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -46,10 +48,6 @@ using namespace studio; /* === M A C R O S ========================================================= */ -#if ! defined(_) -#define _(x) (x) -#endif - /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp index 25b1e89..cd94e4e 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_time.cpp @@ -35,6 +35,8 @@ #include "app.h" #include "widget_time.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -46,10 +48,6 @@ using namespace studio; /* === M A C R O S ========================================================= */ -#if ! defined(_) -#define _(x) (x) -#endif - /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp index 514f170..847a349 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp @@ -48,6 +48,8 @@ #include +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp index 9c4a372..71738e3 100644 --- a/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_value.cpp @@ -54,6 +54,8 @@ #include "dialog_color.h" #include +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp index a4e736c..c4177a3 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp @@ -36,6 +36,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp index 0e7e133..fecae7b 100644 --- a/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/childrentreestore.cpp @@ -36,6 +36,8 @@ #include #include +#include "general.h" + class Profiler : private etl::clock { const std::string name; diff --git a/synfig-studio/trunk/src/gtkmm/compview.cpp b/synfig-studio/trunk/src/gtkmm/compview.cpp index 416ea82..161cde5 100644 --- a/synfig-studio/trunk/src/gtkmm/compview.cpp +++ b/synfig-studio/trunk/src/gtkmm/compview.cpp @@ -43,6 +43,8 @@ #include "canvasview.h" #include +#include "general.h" + #endif /* === M A C R O S ========================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/devicetracker.cpp b/synfig-studio/trunk/src/gtkmm/devicetracker.cpp index e01d96b..6d2d516 100644 --- a/synfig-studio/trunk/src/gtkmm/devicetracker.cpp +++ b/synfig-studio/trunk/src/gtkmm/devicetracker.cpp @@ -33,6 +33,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_color.cpp b/synfig-studio/trunk/src/gtkmm/dialog_color.cpp index 02b85e2..1903ec8 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_color.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_color.cpp @@ -45,6 +45,8 @@ #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp index d506058..8cff502 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp @@ -42,6 +42,8 @@ #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp index 9b0c08f..79962e6 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_keyframe.cpp @@ -36,6 +36,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp index ff7f025..22bf351 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_preview.cpp @@ -35,6 +35,8 @@ #include #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp index bb12d26..4aa9ed0 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_setup.cpp @@ -41,6 +41,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp index 52056a3..264b027 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_soundselect.cpp @@ -32,6 +32,8 @@ #include "dialog_soundselect.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp b/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp index 02e938c..a96c817 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_tooloptions.cpp @@ -33,6 +33,8 @@ #include #include #include "dialog_tooloptions.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp index 10335b2..5fbf61c 100644 --- a/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp @@ -42,6 +42,8 @@ #include "widget_time.h" #include "widget_waypoint.h" +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/dialogsettings.cpp b/synfig-studio/trunk/src/gtkmm/dialogsettings.cpp index 1705087..c11ef4e 100644 --- a/synfig-studio/trunk/src/gtkmm/dialogsettings.cpp +++ b/synfig-studio/trunk/src/gtkmm/dialogsettings.cpp @@ -32,6 +32,8 @@ #include "dialogsettings.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp index 125df3f..cecf5f6 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_canvases.cpp @@ -32,6 +32,8 @@ #include "dock_canvases.h" #include "app.h" #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp index 179f7c0..e05a8e3 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.cpp @@ -43,6 +43,8 @@ #include "canvasview.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_children.cpp b/synfig-studio/trunk/src/gtkmm/dock_children.cpp index f8f9a92..88407d7 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_children.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_children.cpp @@ -43,6 +43,8 @@ #include "childrentree.h" #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp index 7c81e89..bc1a73c 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_curves.cpp @@ -47,6 +47,8 @@ #include #include "widget_timeslider.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_history.cpp b/synfig-studio/trunk/src/gtkmm/dock_history.cpp index 248f554..3aeaa11 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_history.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_history.cpp @@ -44,6 +44,8 @@ #include #include "historytreestore.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_info.cpp b/synfig-studio/trunk/src/gtkmm/dock_info.cpp index 498f3c8..42c8a82 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_info.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_info.cpp @@ -41,6 +41,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp index f9688af..30f19a9 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp @@ -43,6 +43,8 @@ #include "canvasview.h" #include "keyframeactionmanager.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp index 921d742..d831317 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layergroups.cpp @@ -45,6 +45,8 @@ #include "layergrouptree.h" #include "groupactionmanager.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp index 10cc043..2df3b43 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp @@ -46,6 +46,8 @@ #include "layeractionmanager.h" //#include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp b/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp index 21a46e7..66798d6 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_metadata.cpp @@ -41,6 +41,8 @@ #include "metadatatreestore.h" #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp index c558960..d332518 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp @@ -44,6 +44,8 @@ #include "asyncrenderer.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_params.cpp b/synfig-studio/trunk/src/gtkmm/dock_params.cpp index e17a53b..1e4a621 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_params.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_params.cpp @@ -42,6 +42,8 @@ #include "layerparamtreestore.h" #include "workarea.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp index d2f0651..8b1e312 100644 --- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp +++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp @@ -44,6 +44,8 @@ #include "workarea.h" #include "widget_timeslider.h" #include "layerparamtreestore.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dockable.cpp b/synfig-studio/trunk/src/gtkmm/dockable.cpp index 341d223..cedaa39 100644 --- a/synfig-studio/trunk/src/gtkmm/dockable.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockable.cpp @@ -40,6 +40,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dockbook.cpp b/synfig-studio/trunk/src/gtkmm/dockbook.cpp index a7f0b6a..5d1a460 100644 --- a/synfig-studio/trunk/src/gtkmm/dockbook.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockbook.cpp @@ -38,6 +38,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp index a445309..2257a2c 100644 --- a/synfig-studio/trunk/src/gtkmm/dockdialog.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockdialog.cpp @@ -50,6 +50,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp index b483ae8..0da07eb 100644 --- a/synfig-studio/trunk/src/gtkmm/dockmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockmanager.cpp @@ -38,6 +38,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/duck.cpp b/synfig-studio/trunk/src/gtkmm/duck.cpp index ec67e16..8500b89 100644 --- a/synfig-studio/trunk/src/gtkmm/duck.cpp +++ b/synfig-studio/trunk/src/gtkmm/duck.cpp @@ -32,6 +32,8 @@ #include "duck.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp index 767b217..fec7061 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.cpp +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.cpp @@ -56,6 +56,8 @@ #include "onemoment.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/general.h b/synfig-studio/trunk/src/gtkmm/general.h new file mode 100644 index 0000000..d8a2854 --- /dev/null +++ b/synfig-studio/trunk/src/gtkmm/general.h @@ -0,0 +1,47 @@ +/* === S Y N F I G ========================================================= */ +/*! \file synfigstudio/src/gtkmm/general.h +** \brief General header file for synfigstudio +** +** $Id$ +** +** \legal +** Copyright 2007 Paul Wise +** +** This package 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 of +** the License, or (at your option) any later version. +** +** This package 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. +** \endlegal +*/ +/* ========================================================================= */ + +/* === S T A R T =========================================================== */ + +#ifndef __SYNFIGSTUDIO_GENERAL_H +#define __SYNFIGSTUDIO_GENERAL_H + +/* === H E A D E R S ======================================================= */ + +#include + +/* === M A C R O S ========================================================= */ + +#undef _ +#undef gettext_noop +#undef N_ +#define _(x) gettext(x) +#define gettext_noop(x) x +#define N_(x) gettext_noop(x) + +/* === T Y P E D E F S ===================================================== */ + +/* === C L A S S E S & S T R U C T S ======================================= */ + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp index bcfc879..b95e52b 100644 --- a/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/groupactionmanager.cpp @@ -36,6 +36,8 @@ #include "instance.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp index f9a1b8b..ad4fe57 100644 --- a/synfig-studio/trunk/src/gtkmm/historytreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/historytreestore.cpp @@ -37,6 +37,8 @@ #include #include "instance.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp index 38e6b2a..95b4596 100644 --- a/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp +++ b/synfig-studio/trunk/src/gtkmm/iconcontroller.cpp @@ -36,6 +36,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -47,12 +49,6 @@ using namespace synfig; /* === M A C R O S ========================================================= */ -// Quick hack to keep stuff working until gettext support is added -#ifndef _ -#define _(x) (x) -#define N_(x) (x) -#endif - #ifdef WIN32 # ifdef IMAGE_DIR # undef IMAGE_DIR diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 93333d8..61dbabc 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -54,6 +54,8 @@ #include #include +#include "general.h" + #endif using namespace std; diff --git a/synfig-studio/trunk/src/gtkmm/ipc.cpp b/synfig-studio/trunk/src/gtkmm/ipc.cpp index e6587b9..bf9f890 100644 --- a/synfig-studio/trunk/src/gtkmm/ipc.cpp +++ b/synfig-studio/trunk/src/gtkmm/ipc.cpp @@ -67,6 +67,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp index 79d8e5e..e15e4d9 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframeactionmanager.cpp @@ -35,6 +35,8 @@ #include #include "instance.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/keyframetree.cpp b/synfig-studio/trunk/src/gtkmm/keyframetree.cpp index 54f5bd2..6ecb948 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetree.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetree.cpp @@ -34,6 +34,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp index 095ec2c..b6cc877 100644 --- a/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/keyframetreestore.cpp @@ -46,6 +46,8 @@ #include "onemoment.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp index f0f41b3..f0e4d2c 100644 --- a/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp +++ b/synfig-studio/trunk/src/gtkmm/keymapsettings.cpp @@ -35,6 +35,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp index 0fa5bed..ea27c87 100644 --- a/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/layeractionmanager.cpp @@ -36,6 +36,8 @@ #include "instance.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp index 9fcc62b..05831c8 100644 --- a/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layergrouptree.cpp @@ -34,6 +34,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp index de98228..d6d3293 100644 --- a/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layergrouptreestore.cpp @@ -43,6 +43,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp index d583be8..fd9d191 100644 --- a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp @@ -39,6 +39,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp index a9f2f0a..8df5ef2 100644 --- a/synfig-studio/trunk/src/gtkmm/layertree.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp @@ -41,6 +41,8 @@ #include "instance.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp index ffc5cc7..894563c 100644 --- a/synfig-studio/trunk/src/gtkmm/layertreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/layertreestore.cpp @@ -41,6 +41,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/main.cpp b/synfig-studio/trunk/src/gtkmm/main.cpp index e6485bc..5dd69d2 100644 --- a/synfig-studio/trunk/src/gtkmm/main.cpp +++ b/synfig-studio/trunk/src/gtkmm/main.cpp @@ -35,6 +35,8 @@ #include "ipc.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -56,6 +58,11 @@ using namespace studio; int main(int argc, char **argv) { + + setlocale(LC_ALL, ""); + bindtextdomain("synfigstudio", LOCALEDIR); + textdomain("synfigstudio"); + { SmartFILE file(IPC::make_connection()); if(file) diff --git a/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp b/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp index fc1d645..b253041 100644 --- a/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp +++ b/synfig-studio/trunk/src/gtkmm/metadatatreestore.cpp @@ -32,6 +32,8 @@ #include "metadatatreestore.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/mod_mirror/mod_mirror.cpp b/synfig-studio/trunk/src/gtkmm/mod_mirror/mod_mirror.cpp index 148fee4..03667bf 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_mirror/mod_mirror.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_mirror/mod_mirror.cpp @@ -35,6 +35,8 @@ #include "../app.h" #include "../statemanager.h" +#include "../general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp index ef430c9..9250ea0 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_mirror/state_mirror.cpp @@ -49,6 +49,8 @@ #include "../duck.h" #include +#include "../general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_palbrowse.cpp b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_palbrowse.cpp index 7c4f9f4..dbaff71 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_palbrowse.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_palbrowse.cpp @@ -33,6 +33,8 @@ #include "dock_paledit.h" #include "mod_palette.h" +#include "../general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp index 331c4b7..0109157 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp @@ -44,6 +44,8 @@ #include "../app.h" #include "../dialog_color.h" +#include "../general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp b/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp index f3b362f..53d5fc5 100644 --- a/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp +++ b/synfig-studio/trunk/src/gtkmm/mod_palette/mod_palette.cpp @@ -36,6 +36,8 @@ #include "../app.h" #include "../dockmanager.h" +#include "../general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/module.cpp b/synfig-studio/trunk/src/gtkmm/module.cpp index 7c6afed..ad95ae4 100644 --- a/synfig-studio/trunk/src/gtkmm/module.cpp +++ b/synfig-studio/trunk/src/gtkmm/module.cpp @@ -31,6 +31,8 @@ #include "module.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/onemoment.cpp b/synfig-studio/trunk/src/gtkmm/onemoment.cpp index 546ed19..f0dd3c7 100644 --- a/synfig-studio/trunk/src/gtkmm/onemoment.cpp +++ b/synfig-studio/trunk/src/gtkmm/onemoment.cpp @@ -48,6 +48,8 @@ #include "onemoment.h" #include "app.h" +#include "general.h" + #endif using namespace std; diff --git a/synfig-studio/trunk/src/gtkmm/preview.cpp b/synfig-studio/trunk/src/gtkmm/preview.cpp index 78f8749..ee6ecf8 100644 --- a/synfig-studio/trunk/src/gtkmm/preview.cpp +++ b/synfig-studio/trunk/src/gtkmm/preview.cpp @@ -41,6 +41,9 @@ #include #include "asyncrenderer.h" + +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renddesc.cpp b/synfig-studio/trunk/src/gtkmm/renddesc.cpp index 4d87a82..4eae765 100644 --- a/synfig-studio/trunk/src/gtkmm/renddesc.cpp +++ b/synfig-studio/trunk/src/gtkmm/renddesc.cpp @@ -39,6 +39,8 @@ #include //#include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -58,10 +60,6 @@ using namespace studio; #define SYNFIG_MAX_PIXEL_HEIGHT (~(1<<31)) #endif -#if ! defined(_) -#define _(x) (x) -#endif - #ifndef DPM2DPI #define DPM2DPI(x) ((x)/39.3700787402) #define DPI2DPM(x) ((x)*39.3700787402) diff --git a/synfig-studio/trunk/src/gtkmm/render.cpp b/synfig-studio/trunk/src/gtkmm/render.cpp index 95243be..2ac8737 100644 --- a/synfig-studio/trunk/src/gtkmm/render.cpp +++ b/synfig-studio/trunk/src/gtkmm/render.cpp @@ -38,6 +38,8 @@ #include #include "asyncrenderer.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp b/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp index 35c94ef..727ad02 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_bbox.cpp @@ -32,6 +32,8 @@ #include "renderer_bbox.h" #include "workarea.h" #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp index 6b9d31d..0901bff 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_canvas.cpp @@ -34,6 +34,8 @@ #include "workarea.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp index fada69a..a177154 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_dragbox.cpp @@ -33,6 +33,8 @@ #include "workarea.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp index 735d2a1..55d09f9 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp @@ -38,6 +38,8 @@ #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp index 727f7b4..b00a593 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_grid.cpp @@ -33,6 +33,8 @@ #include "workarea.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp index 09937ec..c1f5d9f 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_guides.cpp @@ -33,6 +33,8 @@ #include "workarea.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp b/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp index 259df23..48cc42b 100644 --- a/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp +++ b/synfig-studio/trunk/src/gtkmm/renderer_timecode.cpp @@ -38,6 +38,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_bline.cpp b/synfig-studio/trunk/src/gtkmm/state_bline.cpp index 4f21886..934a7f3 100644 --- a/synfig-studio/trunk/src/gtkmm/state_bline.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_bline.cpp @@ -51,6 +51,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_circle.cpp b/synfig-studio/trunk/src/gtkmm/state_circle.cpp index f4e0768..1208572 100644 --- a/synfig-studio/trunk/src/gtkmm/state_circle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_circle.cpp @@ -50,6 +50,8 @@ #include "widget_enum.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp index 9782f91..457cd5b 100644 --- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp @@ -62,6 +62,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp index bafaab0..74eb7d8 100644 --- a/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_eyedrop.cpp @@ -40,6 +40,8 @@ #include "canvasview.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_fill.cpp b/synfig-studio/trunk/src/gtkmm/state_fill.cpp index 19c674b..51ab488 100644 --- a/synfig-studio/trunk/src/gtkmm/state_fill.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_fill.cpp @@ -40,6 +40,8 @@ #include "canvasview.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp index f4f1963..804813f 100644 --- a/synfig-studio/trunk/src/gtkmm/state_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_gradient.cpp @@ -51,6 +51,8 @@ #include "widget_enum.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_normal.cpp b/synfig-studio/trunk/src/gtkmm/state_normal.cpp index 467cb5d..3378c6a 100644 --- a/synfig-studio/trunk/src/gtkmm/state_normal.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_normal.cpp @@ -41,6 +41,8 @@ #include #include #include "canvasview.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp index 4adbebe..09caf4f 100644 --- a/synfig-studio/trunk/src/gtkmm/state_polygon.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_polygon.cpp @@ -47,6 +47,8 @@ #include "dialog_tooloptions.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp index c58d6bd..830bdb1 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rectangle.cpp @@ -49,6 +49,8 @@ #include "duck.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_rotate.cpp b/synfig-studio/trunk/src/gtkmm/state_rotate.cpp index 95a66b1..655bc52 100644 --- a/synfig-studio/trunk/src/gtkmm/state_rotate.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_rotate.cpp @@ -50,6 +50,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_scale.cpp b/synfig-studio/trunk/src/gtkmm/state_scale.cpp index fcab54b..62a6642 100644 --- a/synfig-studio/trunk/src/gtkmm/state_scale.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_scale.cpp @@ -49,6 +49,8 @@ #include "duck.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp index 45ca674..5a8ec15 100644 --- a/synfig-studio/trunk/src/gtkmm/state_sketch.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_sketch.cpp @@ -60,6 +60,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp index a29f6f1..85587cd 100644 --- a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp @@ -50,6 +50,8 @@ #include "onemoment.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp index 309099c..088a978 100644 --- a/synfig-studio/trunk/src/gtkmm/state_stroke.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_stroke.cpp @@ -47,6 +47,8 @@ #include "toolbox.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_width.cpp b/synfig-studio/trunk/src/gtkmm/state_width.cpp index 468377f..6f63fe3 100644 --- a/synfig-studio/trunk/src/gtkmm/state_width.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_width.cpp @@ -55,6 +55,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp index 81ca2d6..66b8d4e 100644 --- a/synfig-studio/trunk/src/gtkmm/state_zoom.cpp +++ b/synfig-studio/trunk/src/gtkmm/state_zoom.cpp @@ -45,6 +45,8 @@ #include "toolbox.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/statemanager.cpp b/synfig-studio/trunk/src/gtkmm/statemanager.cpp index efc8386..4a6828c 100644 --- a/synfig-studio/trunk/src/gtkmm/statemanager.cpp +++ b/synfig-studio/trunk/src/gtkmm/statemanager.cpp @@ -37,6 +37,8 @@ #include "app.h" #include "toolbox.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp index 5b83382..7bcdd14 100644 --- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp +++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp @@ -79,6 +79,8 @@ #include +#include "general.h" + #endif using namespace std; diff --git a/synfig-studio/trunk/src/gtkmm/valuelink.cpp b/synfig-studio/trunk/src/gtkmm/valuelink.cpp index 7732d33..28d55a4 100644 --- a/synfig-studio/trunk/src/gtkmm/valuelink.cpp +++ b/synfig-studio/trunk/src/gtkmm/valuelink.cpp @@ -31,6 +31,8 @@ #include "valuelink.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp index c2ab9c0..c91a45c 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp @@ -34,6 +34,8 @@ #include #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_color.cpp b/synfig-studio/trunk/src/gtkmm/widget_color.cpp index 6c72d48..2e009b1 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_color.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_color.cpp @@ -34,6 +34,8 @@ #include "app.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp index 2d7940e..bd71591 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_coloredit.cpp @@ -40,6 +40,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp index 4ffa511..f4ce475 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp @@ -35,6 +35,8 @@ #include #include "instance.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp index 08a8a14..cc79cf8 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_curves.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_curves.cpp @@ -38,6 +38,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp index b791ecf..4e85ffe 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_defaults.cpp @@ -43,6 +43,8 @@ #include "widget_distance.h" #include "widget_enum.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_distance.cpp b/synfig-studio/trunk/src/gtkmm/widget_distance.cpp index 32c84df..a2afcd9 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_distance.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_distance.cpp @@ -34,6 +34,8 @@ #include "widget_distance.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -45,10 +47,6 @@ using namespace studio; /* === M A C R O S ========================================================= */ -#if ! defined(_) -#define _(x) (x) -#endif - /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_enum.cpp b/synfig-studio/trunk/src/gtkmm/widget_enum.cpp index a4d9161..2a58909 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_enum.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_enum.cpp @@ -34,6 +34,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_filename.cpp b/synfig-studio/trunk/src/gtkmm/widget_filename.cpp index 6eeeb62..9959e51 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_filename.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_filename.cpp @@ -34,6 +34,8 @@ #include "widget_filename.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -45,10 +47,6 @@ using namespace studio; /* === M A C R O S ========================================================= */ -#if ! defined(_) -#define _(x) (x) -#endif - /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp index 80738cb..f5ac42f 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_gradient.cpp @@ -36,6 +36,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp index f0f914b..3d43731 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_sound.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_sound.cpp @@ -37,6 +37,8 @@ #include "widget_sound.h" #include "audiocontainer.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_time.cpp b/synfig-studio/trunk/src/gtkmm/widget_time.cpp index 04b898b..e818c65 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_time.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_time.cpp @@ -34,6 +34,8 @@ #include "widget_time.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -45,10 +47,6 @@ using namespace studio; /* === M A C R O S ========================================================= */ -#if ! defined(_) -#define _(x) (x) -#endif - /* === G L O B A L S ======================================================= */ /* === P R O C E D U R E S ================================================= */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp index 26f40cc..54b4ec6 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_timeslider.cpp @@ -36,6 +36,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_value.cpp b/synfig-studio/trunk/src/gtkmm/widget_value.cpp index e6e3070..82bbdda 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_value.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_value.cpp @@ -49,6 +49,8 @@ #include "app.h" #include "widget_distance.h" +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp index c948fe0..1b83214 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp @@ -34,6 +34,8 @@ #include "widget_distance.h" #include "app.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp index c6ca087..1644ac4 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp @@ -43,6 +43,8 @@ #include #include "widget_time.h" #include "widget_waypoint.h" +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp index fcad219..60a7c8d 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp @@ -38,6 +38,8 @@ #include #include "widget_time.h" #include "widget_waypointmodel.h" +#include "general.h" + #endif using namespace synfig; diff --git a/synfig-studio/trunk/src/gtkmm/workarea.cpp b/synfig-studio/trunk/src/gtkmm/workarea.cpp index 3a9cd03..dc8b12d 100644 --- a/synfig-studio/trunk/src/gtkmm/workarea.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarea.cpp @@ -72,6 +72,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp b/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp index c69a9ff..303bc03 100644 --- a/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp +++ b/synfig-studio/trunk/src/gtkmm/workarearenderer.cpp @@ -32,6 +32,8 @@ #include "workarearenderer.h" #include "workarea.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/gtkmm/zoomdial.cpp b/synfig-studio/trunk/src/gtkmm/zoomdial.cpp index ca00bf7..130c105 100644 --- a/synfig-studio/trunk/src/gtkmm/zoomdial.cpp +++ b/synfig-studio/trunk/src/gtkmm/zoomdial.cpp @@ -31,6 +31,8 @@ //#include "zoomdial.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/Makefile.am b/synfig-studio/trunk/src/synfigapp/Makefile.am index 6db4722..83831c5 100644 --- a/synfig-studio/trunk/src/synfigapp/Makefile.am +++ b/synfig-studio/trunk/src/synfigapp/Makefile.am @@ -43,7 +43,7 @@ synfiglibdir=@synfiglibdir@ lib_LTLIBRARIES = libsynfigapp.la libsynfigapp_la_SOURCES = $(SYNFIGAPPHH) $(ACTIONCC) blineconvert.cpp cvs.cpp main.cpp action_param.cpp action.cpp action_system.cpp canvasinterface.cpp instance.cpp uimanager.cpp inputdevice.cpp settings.cpp libsynfigapp_la_LIBADD = @SYNFIG_LIBS@ -libsynfigapp_la_CXXFLAGS = @SYNFIG_CFLAGS@ +libsynfigapp_la_CXXFLAGS = @SYNFIG_CFLAGS@ "-DLOCALEDIR=\"$(localedir)\"" libsynfigapp_la_LDFLAGS = -export-dynamic -no-undefined include_synfigappdir=$(prefix)/include/synfigapp-0.0/synfigapp diff --git a/synfig-studio/trunk/src/synfigapp/action.cpp b/synfig-studio/trunk/src/synfigapp/action.cpp index c3e2aac..a1fdd69 100644 --- a/synfig-studio/trunk/src/synfigapp/action.cpp +++ b/synfig-studio/trunk/src/synfigapp/action.cpp @@ -110,6 +110,8 @@ #include "canvasinterface.h" +#include "general.h" + #endif using namespace std; @@ -128,7 +130,7 @@ synfigapp::Action::Book *book_; #define ADD_ACTION(x) { BookEntry &be(book()[x::name__]); \ be.name=x::name__; \ - be.local_name=x::local_name__; \ + be.local_name=gettext(x::local_name__); \ be.version=x::version__; \ be.task=x::task__; \ be.priority=x::priority__; \ diff --git a/synfig-studio/trunk/src/synfigapp/action_param.cpp b/synfig-studio/trunk/src/synfigapp/action_param.cpp index 578b00f..3e45ce2 100644 --- a/synfig-studio/trunk/src/synfigapp/action_param.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_param.cpp @@ -33,6 +33,8 @@ #include "action.h" #include "canvasinterface.h" +#include "general.h" + #endif using namespace std; diff --git a/synfig-studio/trunk/src/synfigapp/action_system.cpp b/synfig-studio/trunk/src/synfigapp/action_system.cpp index 48579b5..daeab59 100644 --- a/synfig-studio/trunk/src/synfigapp/action_system.cpp +++ b/synfig-studio/trunk/src/synfigapp/action_system.cpp @@ -33,6 +33,8 @@ #include "instance.h" #include "canvasinterface.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp index c1d223b..2840796 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointadd.cpp @@ -32,6 +32,8 @@ #include "activepointadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointAdd); ACTION_SET_NAME(Action::ActivepointAdd,"activepoint_add"); -ACTION_SET_LOCAL_NAME(Action::ActivepointAdd,"Add Activepoint"); +ACTION_SET_LOCAL_NAME(Action::ActivepointAdd,N_("Add Activepoint")); ACTION_SET_TASK(Action::ActivepointAdd,"add"); ACTION_SET_CATEGORY(Action::ActivepointAdd,Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::ActivepointAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp index b7d2973..7626eb0 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointremove.cpp @@ -32,6 +32,8 @@ #include "activepointremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointRemove); ACTION_SET_NAME(Action::ActivepointRemove,"activepoint_remove"); -ACTION_SET_LOCAL_NAME(Action::ActivepointRemove,"Remove Activepoint"); +ACTION_SET_LOCAL_NAME(Action::ActivepointRemove,N_("Remove Activepoint")); ACTION_SET_TASK(Action::ActivepointRemove,"remove"); ACTION_SET_CATEGORY(Action::ActivepointRemove,Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::ActivepointRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp index d55464e..904b556 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointset.cpp @@ -32,6 +32,8 @@ #include "activepointset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointSet); ACTION_SET_NAME(Action::ActivepointSet,"activepoint_set"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSet,"Set Activepoint"); +ACTION_SET_LOCAL_NAME(Action::ActivepointSet,N_("Set Activepoint")); ACTION_SET_TASK(Action::ActivepointSet,"set"); ACTION_SET_CATEGORY(Action::ActivepointSet,Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::ActivepointSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp index cea48cd..b1c7156 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetoff.cpp @@ -40,6 +40,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -52,7 +54,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointSetOff); ACTION_SET_NAME(Action::ActivepointSetOff,"activepoint_set_off"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSetOff,_("Mark Activepoint as \"Off\"")); +ACTION_SET_LOCAL_NAME(Action::ActivepointSetOff,N_("Mark Activepoint as \"Off\"")); ACTION_SET_TASK(Action::ActivepointSetOff,"set_off"); ACTION_SET_CATEGORY(Action::ActivepointSetOff,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ActivepointSetOff,-9); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp index b5e3ac4..3f48f05 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointseton.cpp @@ -40,6 +40,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -52,7 +54,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointSetOn); ACTION_SET_NAME(Action::ActivepointSetOn,"activepoint_set_on"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,_("Mark Activepoint as \"On\"")); +ACTION_SET_LOCAL_NAME(Action::ActivepointSetOn,N_("Mark Activepoint as \"On\"")); ACTION_SET_TASK(Action::ActivepointSetOn,"set_on"); ACTION_SET_CATEGORY(Action::ActivepointSetOn,Action::CATEGORY_ACTIVEPOINT|Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ActivepointSetOn,-10); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp index 1110f96..16e4069 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsetsmart.cpp @@ -39,6 +39,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -51,7 +53,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointSetSmart); ACTION_SET_NAME(Action::ActivepointSetSmart,"activepoint_set_smart"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,_("Set Activepoint (Smart)")); +ACTION_SET_LOCAL_NAME(Action::ActivepointSetSmart,N_("Set Activepoint (Smart)")); ACTION_SET_TASK(Action::ActivepointSetSmart,"set"); ACTION_SET_CATEGORY(Action::ActivepointSetSmart,Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::ActivepointSetSmart,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp index e22a050..049a9bd 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/activepointsimpleadd.cpp @@ -32,6 +32,8 @@ #include "activepointsimpleadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ActivepointSimpleAdd); ACTION_SET_NAME(Action::ActivepointSimpleAdd,"waypoint_simpleadd"); -ACTION_SET_LOCAL_NAME(Action::ActivepointSimpleAdd,"Simply Add Waypoint"); +ACTION_SET_LOCAL_NAME(Action::ActivepointSimpleAdd,N_("Simply Add Waypoint")); ACTION_SET_TASK(Action::ActivepointSimpleAdd,"add"); ACTION_SET_CATEGORY(Action::ActivepointSimpleAdd,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::ActivepointSimpleAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp index d6dfab2..8556af9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentmerge.cpp @@ -39,6 +39,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -51,7 +53,7 @@ using namespace Action; ACTION_INIT(Action::BLinePointTangentMerge); ACTION_SET_NAME(Action::BLinePointTangentMerge,"bline_point_tangent_merge"); -ACTION_SET_LOCAL_NAME(Action::BLinePointTangentMerge,_("Merge Tangents")); +ACTION_SET_LOCAL_NAME(Action::BLinePointTangentMerge,N_("Merge Tangents")); ACTION_SET_TASK(Action::BLinePointTangentMerge,"merge"); ACTION_SET_CATEGORY(Action::BLinePointTangentMerge,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::BLinePointTangentMerge,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp index 4ce4e3a..3ac1f36 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/blinepointtangentsplit.cpp @@ -39,6 +39,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -51,7 +53,7 @@ using namespace Action; ACTION_INIT(Action::BLinePointTangentSplit); ACTION_SET_NAME(Action::BLinePointTangentSplit,"bline_point_tangent_split"); -ACTION_SET_LOCAL_NAME(Action::BLinePointTangentSplit,_("Split Tangents")); +ACTION_SET_LOCAL_NAME(Action::BLinePointTangentSplit,N_("Split Tangents")); ACTION_SET_TASK(Action::BLinePointTangentSplit,"split"); ACTION_SET_CATEGORY(Action::BLinePointTangentSplit,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::BLinePointTangentSplit,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp index 0302b7c..afec584 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasadd.cpp @@ -32,6 +32,8 @@ #include "canvasadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::CanvasAdd); ACTION_SET_NAME(Action::CanvasAdd,"canvas_add"); -ACTION_SET_LOCAL_NAME(Action::CanvasAdd,"Add Child Canvas"); +ACTION_SET_LOCAL_NAME(Action::CanvasAdd,N_("Add Child Canvas")); ACTION_SET_TASK(Action::CanvasAdd,"add"); ACTION_SET_CATEGORY(Action::CanvasAdd,Action::CATEGORY_CANVAS); ACTION_SET_PRIORITY(Action::CanvasAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp index d8888fc..8db1490 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasremove.cpp @@ -32,6 +32,8 @@ #include "canvasremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::CanvasRemove); ACTION_SET_NAME(Action::CanvasRemove,"canvas_remove"); -ACTION_SET_LOCAL_NAME(Action::CanvasRemove,"Remove Canvas"); +ACTION_SET_LOCAL_NAME(Action::CanvasRemove,N_("Remove Canvas")); ACTION_SET_TASK(Action::CanvasRemove,"remove"); ACTION_SET_CATEGORY(Action::CanvasRemove,Action::CATEGORY_CANVAS); ACTION_SET_PRIORITY(Action::CanvasRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp index 19a408f..498726d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/canvasrenddescset.cpp @@ -32,6 +32,8 @@ #include "canvasrenddescset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::CanvasRendDescSet); ACTION_SET_NAME(Action::CanvasRendDescSet,"canvas_rend_desc_set"); -ACTION_SET_LOCAL_NAME(Action::CanvasRendDescSet,"Set Canvas RendDesc"); +ACTION_SET_LOCAL_NAME(Action::CanvasRendDescSet,N_("Set Canvas RendDesc")); ACTION_SET_TASK(Action::CanvasRendDescSet,"set"); ACTION_SET_CATEGORY(Action::CanvasRendDescSet,Action::CATEGORY_CANVAS); ACTION_SET_PRIORITY(Action::CanvasRendDescSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp index 42c23ce..7668997 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/colorset.cpp @@ -38,6 +38,8 @@ #include #include +#include + #endif using namespace std; @@ -50,7 +52,7 @@ using namespace Action; ACTION_INIT(Action::ColorSet); ACTION_SET_NAME(Action::ColorSet,"color_set"); -ACTION_SET_LOCAL_NAME(Action::ColorSet,"Apply Default Color"); +ACTION_SET_LOCAL_NAME(Action::ColorSet,N_("Apply Default Color")); ACTION_SET_TASK(Action::ColorSet,"set"); ACTION_SET_CATEGORY(Action::ColorSet,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ColorSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp index 03ab75b..f473ace 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/editmodeset.cpp @@ -32,6 +32,8 @@ #include "editmodeset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::EditModeSet); ACTION_SET_NAME(Action::EditModeSet,"edit_mode_set"); -ACTION_SET_LOCAL_NAME(Action::EditModeSet,"Set Edit Mode"); +ACTION_SET_LOCAL_NAME(Action::EditModeSet,N_("Set Edit Mode")); ACTION_SET_TASK(Action::EditModeSet,"set"); ACTION_SET_CATEGORY(Action::EditModeSet,Action::CATEGORY_OTHER); ACTION_SET_PRIORITY(Action::EditModeSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp index a137841..d97b91a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/gradientset.cpp @@ -38,6 +38,8 @@ #include #include +#include + #endif using namespace std; @@ -50,7 +52,7 @@ using namespace Action; ACTION_INIT(Action::GradientSet); ACTION_SET_NAME(Action::GradientSet,"gradient_set"); -ACTION_SET_LOCAL_NAME(Action::GradientSet,"Apply Default Gradient"); +ACTION_SET_LOCAL_NAME(Action::GradientSet,N_("Apply Default Gradient")); ACTION_SET_TASK(Action::GradientSet,"set"); ACTION_SET_CATEGORY(Action::GradientSet,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::GradientSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp index 0ffa6f9..cec7de6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupaddlayers.cpp @@ -32,6 +32,8 @@ #include "groupaddlayers.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::GroupAddLayers); ACTION_SET_NAME(Action::GroupAddLayers,"group_add_layers"); -ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,"Add Layers to Group"); +ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,N_("Add Layers to Group")); ACTION_SET_TASK(Action::GroupAddLayers,"add"); ACTION_SET_CATEGORY(Action::GroupAddLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP); ACTION_SET_PRIORITY(Action::GroupAddLayers,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp index ccbdfb4..6b4591f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremove.cpp @@ -32,6 +32,8 @@ #include "groupremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::GroupRemove); ACTION_SET_NAME(Action::GroupRemove,"group_remove"); -ACTION_SET_LOCAL_NAME(Action::GroupRemove,"Remove Group"); +ACTION_SET_LOCAL_NAME(Action::GroupRemove,N_("Remove Group")); ACTION_SET_TASK(Action::GroupRemove,"remove"); ACTION_SET_CATEGORY(Action::GroupRemove,Action::CATEGORY_GROUP); ACTION_SET_PRIORITY(Action::GroupRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp index 149fa63..11bbe18 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/groupremovelayers.cpp @@ -32,6 +32,8 @@ #include "groupremovelayers.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::GroupRemoveLayers); ACTION_SET_NAME(Action::GroupRemoveLayers,"group_remove_layers"); -ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,"Remove Layers from a Group"); +ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,N_("Remove Layers from a Group")); ACTION_SET_TASK(Action::GroupRemoveLayers,"remove"); ACTION_SET_CATEGORY(Action::GroupRemoveLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP); ACTION_SET_PRIORITY(Action::GroupRemoveLayers,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp index b9c529b..4a10dfb 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/grouprename.cpp @@ -32,6 +32,8 @@ #include "grouprename.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::GroupRename); ACTION_SET_NAME(Action::GroupRename,"group_rename"); -ACTION_SET_LOCAL_NAME(Action::GroupRename,"Rename Group"); +ACTION_SET_LOCAL_NAME(Action::GroupRename,N_("Rename Group")); ACTION_SET_TASK(Action::GroupRename,"rename"); ACTION_SET_CATEGORY(Action::GroupRename,Action::CATEGORY_GROUP); ACTION_SET_PRIORITY(Action::GroupRename,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp index cbd1aa6..a0fcae3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeadd.cpp @@ -32,6 +32,8 @@ #include "keyframeadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeAdd); ACTION_SET_NAME(Action::KeyframeAdd,"keyframe_add"); -ACTION_SET_LOCAL_NAME(Action::KeyframeAdd,"Add Keyframe"); +ACTION_SET_LOCAL_NAME(Action::KeyframeAdd,N_("Add Keyframe")); ACTION_SET_TASK(Action::KeyframeAdd,"add"); ACTION_SET_CATEGORY(Action::KeyframeAdd,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp index 6a331ae..5351dcc 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeduplicate.cpp @@ -36,6 +36,8 @@ #include "activepointsetsmart.h" #include "waypointsetsmart.h" +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeDuplicate); ACTION_SET_NAME(Action::KeyframeDuplicate,"keyframe_duplicate"); -ACTION_SET_LOCAL_NAME(Action::KeyframeDuplicate,"Duplicate Keyframe"); +ACTION_SET_LOCAL_NAME(Action::KeyframeDuplicate,N_("Duplicate Keyframe")); ACTION_SET_TASK(Action::KeyframeDuplicate,"duplicate"); ACTION_SET_CATEGORY(Action::KeyframeDuplicate,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeDuplicate,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp index a0686ce..655448b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeremove.cpp @@ -36,6 +36,8 @@ #include "activepointremove.h" #include "waypointremove.h" +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeRemove); ACTION_SET_NAME(Action::KeyframeRemove,"keyframe_remove"); -ACTION_SET_LOCAL_NAME(Action::KeyframeRemove,"Remove Keyframe"); +ACTION_SET_LOCAL_NAME(Action::KeyframeRemove,N_("Remove Keyframe")); ACTION_SET_TASK(Action::KeyframeRemove,"remove"); ACTION_SET_CATEGORY(Action::KeyframeRemove,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp index ac787b2..d829225 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframeset.cpp @@ -36,6 +36,8 @@ #include "activepointsetsmart.h" #include "waypointsetsmart.h" +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeSet); ACTION_SET_NAME(Action::KeyframeSet,"keyframe_set"); -ACTION_SET_LOCAL_NAME(Action::KeyframeSet,"Set Keyframe"); +ACTION_SET_LOCAL_NAME(Action::KeyframeSet,N_("Set Keyframe")); ACTION_SET_TASK(Action::KeyframeSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeSet,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::KeyframeSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp index a4c879d..666fc80 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframesetdelta.cpp @@ -36,6 +36,8 @@ #include "activepointsetsmart.h" #include "waypointsetsmart.h" +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeSetDelta); ACTION_SET_NAME(Action::KeyframeSetDelta,"keyframe_set_delta"); -ACTION_SET_LOCAL_NAME(Action::KeyframeSetDelta,"Set Keyframe Delta"); +ACTION_SET_LOCAL_NAME(Action::KeyframeSetDelta,N_("Set Keyframe Delta")); ACTION_SET_TASK(Action::KeyframeSetDelta,"set"); ACTION_SET_CATEGORY(Action::KeyframeSetDelta,Action::CATEGORY_KEYFRAME|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::KeyframeSetDelta,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp index b6d0c28..1e9e4ad 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/keyframewaypointset.cpp @@ -36,6 +36,8 @@ #include "activepointsetsmart.h" #include "waypointsetsmart.h" +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::KeyframeWaypointSet); ACTION_SET_NAME(Action::KeyframeWaypointSet,"keyframe_waypoint_set"); -ACTION_SET_LOCAL_NAME(Action::KeyframeWaypointSet,"Set Waypoints at Keyframe"); +ACTION_SET_LOCAL_NAME(Action::KeyframeWaypointSet,N_("Set Waypoints at Keyframe")); ACTION_SET_TASK(Action::KeyframeWaypointSet,"set"); ACTION_SET_CATEGORY(Action::KeyframeWaypointSet,Action::CATEGORY_KEYFRAME); ACTION_SET_PRIORITY(Action::KeyframeWaypointSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp index 5d5937c..a051e01 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeractivate.cpp @@ -32,6 +32,8 @@ #include "layeractivate.h" #include +#include + #endif using namespace std; @@ -47,7 +49,7 @@ using namespace Action; ACTION_INIT2(Action::LayerActivate); ACTION_SET_NAME(Action::LayerActivate,"layer_activate"); -ACTION_SET_LOCAL_NAME(Action::LayerActivate,_("Activate Layer")); +ACTION_SET_LOCAL_NAME(Action::LayerActivate,N_("Activate Layer")); ACTION_SET_TASK(Action::LayerActivate,"activate"); ACTION_SET_CATEGORY(Action::LayerActivate,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerActivate,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp index 41cfe1a..9275d0a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layeradd.cpp @@ -32,6 +32,8 @@ #include "layeradd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerAdd); ACTION_SET_NAME(Action::LayerAdd,"layer_add"); -ACTION_SET_LOCAL_NAME(Action::LayerAdd,"Add Layer"); +ACTION_SET_LOCAL_NAME(Action::LayerAdd,N_("Add Layer")); ACTION_SET_TASK(Action::LayerAdd,"add"); ACTION_SET_CATEGORY(Action::LayerAdd,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp index ff5726e..6036b92 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerduplicate.cpp @@ -33,6 +33,8 @@ #include "layeradd.h" #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::LayerDuplicate); ACTION_SET_NAME(Action::LayerDuplicate,"layer_duplicate"); -ACTION_SET_LOCAL_NAME(Action::LayerDuplicate,"Duplicate Layer"); +ACTION_SET_LOCAL_NAME(Action::LayerDuplicate,N_("Duplicate Layer")); ACTION_SET_TASK(Action::LayerDuplicate,"duplicate"); ACTION_SET_CATEGORY(Action::LayerDuplicate,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerDuplicate,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp index 1ee585c..e548ab4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerencapsulate.cpp @@ -35,6 +35,8 @@ #include "layerremove.h" #include +#include + #endif using namespace std; @@ -47,7 +49,7 @@ using namespace Action; ACTION_INIT(Action::LayerEncapsulate); ACTION_SET_NAME(Action::LayerEncapsulate,"layer_encapsulate"); -ACTION_SET_LOCAL_NAME(Action::LayerEncapsulate,"Encapsulate"); +ACTION_SET_LOCAL_NAME(Action::LayerEncapsulate,N_("Encapsulate")); ACTION_SET_TASK(Action::LayerEncapsulate,"encapsulate"); ACTION_SET_CATEGORY(Action::LayerEncapsulate,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerEncapsulate,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp index 1e329e3..99f0156 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerlower.cpp @@ -33,6 +33,8 @@ #include "layermove.h" #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::LayerLower); ACTION_SET_NAME(Action::LayerLower,"layer_lower"); -ACTION_SET_LOCAL_NAME(Action::LayerLower,"Lower Layer"); +ACTION_SET_LOCAL_NAME(Action::LayerLower,N_("Lower Layer")); ACTION_SET_TASK(Action::LayerLower,"lower"); ACTION_SET_CATEGORY(Action::LayerLower,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerLower,10); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp index b3399b4..3c0fdf4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layermove.cpp @@ -32,6 +32,8 @@ #include "layermove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerMove); ACTION_SET_NAME(Action::LayerMove,"layer_move"); -ACTION_SET_LOCAL_NAME(Action::LayerMove,_("Move Layer")); +ACTION_SET_LOCAL_NAME(Action::LayerMove,N_("Move Layer")); ACTION_SET_TASK(Action::LayerMove,"move"); ACTION_SET_CATEGORY(Action::LayerMove,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerMove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp index cc054a7..fbec3d5 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamconnect.cpp @@ -32,6 +32,8 @@ #include "layerparamconnect.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerParamConnect); ACTION_SET_NAME(Action::LayerParamConnect,"layer_param_connect"); -ACTION_SET_LOCAL_NAME(Action::LayerParamConnect,_("Connect Layer Parameter")); +ACTION_SET_LOCAL_NAME(Action::LayerParamConnect,N_("Connect Layer Parameter")); ACTION_SET_TASK(Action::LayerParamConnect,"connect"); ACTION_SET_CATEGORY(Action::LayerParamConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::LayerParamConnect,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp index 75d64d7..a25ff13 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamdisconnect.cpp @@ -33,6 +33,8 @@ #include #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::LayerParamDisconnect); ACTION_SET_NAME(Action::LayerParamDisconnect,"layer_param_disconnect"); -ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,_("Disconnect Layer Parameter")); +ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,N_("Disconnect Layer Parameter")); ACTION_SET_TASK(Action::LayerParamDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::LayerParamDisconnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::LayerParamDisconnect,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp index 68b3a2c..f507212 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerparamset.cpp @@ -32,6 +32,8 @@ #include "layerparamset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerParamSet); ACTION_SET_NAME(Action::LayerParamSet,"layer_param_set"); -ACTION_SET_LOCAL_NAME(Action::LayerParamSet,_("Set Layer Parameter")); +ACTION_SET_LOCAL_NAME(Action::LayerParamSet,N_("Set Layer Parameter")); ACTION_SET_TASK(Action::LayerParamSet,"set"); ACTION_SET_CATEGORY(Action::LayerParamSet,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerParamSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp index fbf68bd..a58c6b8 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerraise.cpp @@ -33,6 +33,8 @@ #include "layermove.h" #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::LayerRaise); ACTION_SET_NAME(Action::LayerRaise,"layer_raise"); -ACTION_SET_LOCAL_NAME(Action::LayerRaise,"Raise Layer"); +ACTION_SET_LOCAL_NAME(Action::LayerRaise,N_("Raise Layer")); ACTION_SET_TASK(Action::LayerRaise,"raise"); ACTION_SET_CATEGORY(Action::LayerRaise,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerRaise,9); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp index f62a7bf..ed8d4b1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layerremove.cpp @@ -32,6 +32,8 @@ #include "layerremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerRemove); ACTION_SET_NAME(Action::LayerRemove,"layer_remove"); -ACTION_SET_LOCAL_NAME(Action::LayerRemove,"Remove Layer"); +ACTION_SET_LOCAL_NAME(Action::LayerRemove,N_("Remove Layer")); ACTION_SET_TASK(Action::LayerRemove,"remove"); ACTION_SET_CATEGORY(Action::LayerRemove,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp index e0e2cf5..3bd636c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/layersetdesc.cpp @@ -32,6 +32,8 @@ #include "layersetdesc.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::LayerSetDesc); ACTION_SET_NAME(Action::LayerSetDesc,"layer_set_desc"); -ACTION_SET_LOCAL_NAME(Action::LayerSetDesc,_("Set Layer Description")); +ACTION_SET_LOCAL_NAME(Action::LayerSetDesc,N_("Set Layer Description")); ACTION_SET_TASK(Action::LayerSetDesc,"set_desc"); ACTION_SET_CATEGORY(Action::LayerSetDesc,Action::CATEGORY_LAYER); ACTION_SET_PRIORITY(Action::LayerSetDesc,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp index 1d2751c..e1cc4a9 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointscopy.cpp @@ -41,6 +41,8 @@ #include +#include + #endif using namespace std; @@ -53,7 +55,7 @@ using namespace Action; ACTION_INIT(Action::TimepointsCopy); ACTION_SET_NAME(Action::TimepointsCopy,"timepoint_copy"); -ACTION_SET_LOCAL_NAME(Action::TimepointsCopy,"Copy Time Points"); +ACTION_SET_LOCAL_NAME(Action::TimepointsCopy,N_("Copy Time Points")); ACTION_SET_TASK(Action::TimepointsCopy,"copy"); ACTION_SET_CATEGORY(Action::TimepointsCopy,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::TimepointsCopy,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp index 89cb535..afe6c27 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsdelete.cpp @@ -41,6 +41,8 @@ #include +#include + #endif using namespace std; @@ -53,7 +55,7 @@ using namespace Action; ACTION_INIT(Action::TimepointsDelete); ACTION_SET_NAME(Action::TimepointsDelete,"timepoint_delete"); -ACTION_SET_LOCAL_NAME(Action::TimepointsDelete,"Delete Time Points"); +ACTION_SET_LOCAL_NAME(Action::TimepointsDelete,N_("Delete Time Points")); ACTION_SET_TASK(Action::TimepointsDelete,"delete"); ACTION_SET_CATEGORY(Action::TimepointsDelete,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::TimepointsDelete,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp index 45fd1ea..793b7e1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/timepointsmove.cpp @@ -41,6 +41,8 @@ #include +#include + #endif using namespace std; @@ -53,7 +55,7 @@ using namespace Action; ACTION_INIT(Action::TimepointsMove); ACTION_SET_NAME(Action::TimepointsMove,"timepoint_move"); -ACTION_SET_LOCAL_NAME(Action::TimepointsMove,"Move Time Points"); +ACTION_SET_LOCAL_NAME(Action::TimepointsMove,N_("Move Time Points")); ACTION_SET_TASK(Action::TimepointsMove,"move"); ACTION_SET_CATEGORY(Action::TimepointsMove,Action::CATEGORY_WAYPOINT|Action::CATEGORY_ACTIVEPOINT); ACTION_SET_PRIORITY(Action::TimepointsMove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp index 1a17678..fe4714b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconnect.cpp @@ -36,6 +36,8 @@ #include "valuedescconnect.h" #include +#include + #endif using namespace std; @@ -48,7 +50,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescConnect); ACTION_SET_NAME(Action::ValueDescConnect,"value_desc_connect"); -ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,"Connect"); +ACTION_SET_LOCAL_NAME(Action::ValueDescConnect,N_("Connect")); ACTION_SET_TASK(Action::ValueDescConnect,"connect"); ACTION_SET_CATEGORY(Action::ValueDescConnect,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueDescConnect,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp index acfef98..3911d7d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescconvert.cpp @@ -42,6 +42,8 @@ #include #include +#include + #endif using namespace std; @@ -54,7 +56,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescConvert); ACTION_SET_NAME(Action::ValueDescConvert,"value_desc_convert"); -ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,"Convert"); +ACTION_SET_LOCAL_NAME(Action::ValueDescConvert,N_("Convert")); ACTION_SET_TASK(Action::ValueDescConvert,"convert"); ACTION_SET_CATEGORY(Action::ValueDescConvert,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescConvert,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp index bede403..bb94e8f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescdisconnect.cpp @@ -37,6 +37,8 @@ #include #include +#include + #endif using namespace std; @@ -49,7 +51,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescDisconnect); ACTION_SET_NAME(Action::ValueDescDisconnect,"value_desc_disconnect"); -ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,"Disconnect"); +ACTION_SET_LOCAL_NAME(Action::ValueDescDisconnect,N_("Disconnect")); ACTION_SET_TASK(Action::ValueDescDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::ValueDescDisconnect,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescDisconnect,-100); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp index b0e839a..0ae1453 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescexport.cpp @@ -38,6 +38,8 @@ #include #include +#include + #endif using namespace std; @@ -50,7 +52,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescExport); ACTION_SET_NAME(Action::ValueDescExport,"value_desc_export"); -ACTION_SET_LOCAL_NAME(Action::ValueDescExport,"Export"); +ACTION_SET_LOCAL_NAME(Action::ValueDescExport,N_("Export")); ACTION_SET_TASK(Action::ValueDescExport,"export"); ACTION_SET_CATEGORY(Action::ValueDescExport,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescExport,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp index bce9607..6ba086e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedesclink.cpp @@ -35,6 +35,8 @@ #include #include +#include + #endif using namespace std; @@ -47,7 +49,7 @@ using namespace Action; ACTION_INIT(Action::ValueDescLink); ACTION_SET_NAME(Action::ValueDescLink,"value_desc_link"); -ACTION_SET_LOCAL_NAME(Action::ValueDescLink,"Link"); +ACTION_SET_LOCAL_NAME(Action::ValueDescLink,N_("Link")); ACTION_SET_TASK(Action::ValueDescLink,"connect"); ACTION_SET_CATEGORY(Action::ValueDescLink,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescLink,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp index 09624a9..3e2e3dd 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuedescset.cpp @@ -42,6 +42,8 @@ #include #include +#include + #endif using namespace std; @@ -57,7 +59,7 @@ using namespace Action; ACTION_INIT2(Action::ValueDescSet); ACTION_SET_NAME(Action::ValueDescSet,"value_desc_set"); -ACTION_SET_LOCAL_NAME(Action::ValueDescSet,"Set ValueDesc"); +ACTION_SET_LOCAL_NAME(Action::ValueDescSet,N_("Set ValueDesc")); ACTION_SET_TASK(Action::ValueDescSet,"set"); ACTION_SET_CATEGORY(Action::ValueDescSet,Action::CATEGORY_VALUEDESC); ACTION_SET_PRIORITY(Action::ValueDescSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp index 23729ce..4e4c5e1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeadd.cpp @@ -32,6 +32,8 @@ #include "valuenodeadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeAdd); ACTION_SET_NAME(Action::ValueNodeAdd,"value_node_add"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeAdd,"Add ValueNode"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeAdd,N_("Add ValueNode")); ACTION_SET_TASK(Action::ValueNodeAdd,"add"); ACTION_SET_CATEGORY(Action::ValueNodeAdd,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp index 33b78ea..d8a455b 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodeconstset.cpp @@ -32,6 +32,8 @@ #include "valuenodeconstset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeConstSet); ACTION_SET_NAME(Action::ValueNodeConstSet,"value_node_const_set"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeConstSet,_("Set ValueNode_Const")); +ACTION_SET_LOCAL_NAME(Action::ValueNodeConstSet,N_("Set ValueNode_Const")); ACTION_SET_TASK(Action::ValueNodeConstSet,"set"); ACTION_SET_CATEGORY(Action::ValueNodeConstSet,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeConstSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp index 9d2e4cf..46078ab 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsert.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistinsert.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListInsert); ACTION_SET_NAME(Action::ValueNodeDynamicListInsert,"value_node_dynamic_list_insert"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,"Insert Item"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsert,N_("Insert Item")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsert,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsert,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsert,-20); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp index b9ef272..0e0dbe4 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistinsertsmart.cpp @@ -34,6 +34,8 @@ #include "valuenodedynamiclistinsert.h" #include +#include + #endif using namespace std; @@ -46,7 +48,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListInsertSmart); ACTION_SET_NAME(Action::ValueNodeDynamicListInsertSmart,"value_node_dynamic_list_insert_smart"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,"Insert Item (Smart)"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListInsertSmart,N_("Insert Item (Smart)")); ACTION_SET_TASK(Action::ValueNodeDynamicListInsertSmart,"insert"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListInsertSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListInsertSmart,-20); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp index 2a8f5bd..8b618d1 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistloop.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistloop.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListLoop); ACTION_SET_NAME(Action::ValueNodeDynamicListLoop,"value_node_dynamic_list_loop"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListLoop,"Loop"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListLoop,N_("Loop")); ACTION_SET_TASK(Action::ValueNodeDynamicListLoop,"loop"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListLoop,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp index 9496549..1c4f1b0 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremove.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListRemove); ACTION_SET_NAME(Action::ValueNodeDynamicListRemove,"value_node_dynamic_list_remove"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemove,"Remove Item"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemove,N_("Remove Item")); ACTION_SET_TASK(Action::ValueNodeDynamicListRemove,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemove,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE|Action::CATEGORY_HIDDEN); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRemove,-19); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp index 2c3d8ab..e7b315c 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistremovesmart.cpp @@ -33,6 +33,8 @@ #include "valuenodedynamiclistremove.h" #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListRemoveSmart); ACTION_SET_NAME(Action::ValueNodeDynamicListRemoveSmart,"value_node_dynamic_list_remove_smart"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,"Remove Item (Smart)"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRemoveSmart,N_("Remove Item (Smart)")); ACTION_SET_TASK(Action::ValueNodeDynamicListRemoveSmart,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRemoveSmart,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRemoveSmart,-19); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp index a7bfcf8..a9d1ff6 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistrotateorder.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistrotateorder.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListRotateOrder); ACTION_SET_NAME(Action::ValueNodeDynamicListRotateOrder,"value_node_dynamic_list_rotate_order"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,"Rotate Order"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListRotateOrder,N_("Rotate Order")); ACTION_SET_TASK(Action::ValueNodeDynamicListRotateOrder,"rotate"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListRotateOrder,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListRotateOrder,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp index 4e4aab5..ff3056f 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodedynamiclistunloop.cpp @@ -32,6 +32,8 @@ #include "valuenodedynamiclistunloop.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeDynamicListUnLoop); ACTION_SET_NAME(Action::ValueNodeDynamicListUnLoop,"value_node_dynamic_list_unloop"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,"Unloop"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeDynamicListUnLoop,N_("Unloop")); ACTION_SET_TASK(Action::ValueNodeDynamicListUnLoop,"unloop"); ACTION_SET_CATEGORY(Action::ValueNodeDynamicListUnLoop,Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeDynamicListUnLoop,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp index 61fc2f7..f5f433d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkconnect.cpp @@ -32,6 +32,8 @@ #include "valuenodelinkconnect.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeLinkConnect); ACTION_SET_NAME(Action::ValueNodeLinkConnect,"value_node_link_connect"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkConnect,_("Connect ValueNode Link")); +ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkConnect,N_("Connect ValueNode Link")); ACTION_SET_TASK(Action::ValueNodeLinkConnect,"connect"); ACTION_SET_CATEGORY(Action::ValueNodeLinkConnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeLinkConnect,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp index 0a9d603..6e06b7d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodelinkdisconnect.cpp @@ -33,6 +33,8 @@ #include #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeLinkDisconnect); ACTION_SET_NAME(Action::ValueNodeLinkDisconnect,"value_node_link_disconnect"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkDisconnect,_("Disconnect ValueNode Link")); +ACTION_SET_LOCAL_NAME(Action::ValueNodeLinkDisconnect,N_("Disconnect ValueNode Link")); ACTION_SET_TASK(Action::ValueNodeLinkDisconnect,"disconnect"); ACTION_SET_CATEGORY(Action::ValueNodeLinkDisconnect,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeLinkDisconnect,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp index 8af0a22..bfbc03d 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderemove.cpp @@ -32,6 +32,8 @@ #include "valuenoderemove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeRemove); ACTION_SET_NAME(Action::ValueNodeRemove,"value_node_remove"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeRemove,_("Unexport")); +ACTION_SET_LOCAL_NAME(Action::ValueNodeRemove,N_("Unexport")); ACTION_SET_TASK(Action::ValueNodeRemove,"remove"); ACTION_SET_CATEGORY(Action::ValueNodeRemove,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp index d917143..54957b2 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenoderename.cpp @@ -32,6 +32,8 @@ #include "valuenoderename.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeRename); ACTION_SET_NAME(Action::ValueNodeRename,"value_node_rename"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeRename,_("Rename ValueNode")); +ACTION_SET_LOCAL_NAME(Action::ValueNodeRename,N_("Rename ValueNode")); ACTION_SET_TASK(Action::ValueNodeRename,"rename"); ACTION_SET_CATEGORY(Action::ValueNodeRename,Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::ValueNodeRename,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp index c0228fe..6e92937 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/valuenodereplace.cpp @@ -32,6 +32,8 @@ #include "valuenodereplace.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::ValueNodeReplace); ACTION_SET_NAME(Action::ValueNodeReplace,"value_node_replace"); -ACTION_SET_LOCAL_NAME(Action::ValueNodeReplace,"Replace ValueNode"); +ACTION_SET_LOCAL_NAME(Action::ValueNodeReplace,N_("Replace ValueNode")); ACTION_SET_TASK(Action::ValueNodeReplace,"replace"); ACTION_SET_CATEGORY(Action::ValueNodeReplace,Action::CATEGORY_VALUENODE|Action::CATEGORY_DRAG); ACTION_SET_PRIORITY(Action::ValueNodeReplace,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp index 3354c8c..8912b3a 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointadd.cpp @@ -33,6 +33,8 @@ #include #include +#include + #endif using namespace std; @@ -45,7 +47,7 @@ using namespace Action; ACTION_INIT(Action::WaypointAdd); ACTION_SET_NAME(Action::WaypointAdd,"waypoint_add"); -ACTION_SET_LOCAL_NAME(Action::WaypointAdd,"Add Waypoint"); +ACTION_SET_LOCAL_NAME(Action::WaypointAdd,N_("Add Waypoint")); ACTION_SET_TASK(Action::WaypointAdd,"add"); ACTION_SET_CATEGORY(Action::WaypointAdd,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::WaypointAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp index cc5755b..8c32c1e 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointremove.cpp @@ -32,6 +32,8 @@ #include "waypointremove.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::WaypointRemove); ACTION_SET_NAME(Action::WaypointRemove,"waypoint_remove"); -ACTION_SET_LOCAL_NAME(Action::WaypointRemove,"Remove Waypoint"); +ACTION_SET_LOCAL_NAME(Action::WaypointRemove,N_("Remove Waypoint")); ACTION_SET_TASK(Action::WaypointRemove,"remove"); ACTION_SET_CATEGORY(Action::WaypointRemove,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::WaypointRemove,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp index 6570516..47afde3 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointset.cpp @@ -32,6 +32,8 @@ #include "waypointset.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::WaypointSet); ACTION_SET_NAME(Action::WaypointSet,"waypoint_set"); -ACTION_SET_LOCAL_NAME(Action::WaypointSet,"Set Waypoint"); +ACTION_SET_LOCAL_NAME(Action::WaypointSet,N_("Set Waypoint")); ACTION_SET_TASK(Action::WaypointSet,"set"); ACTION_SET_CATEGORY(Action::WaypointSet,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::WaypointSet,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp index 416b448..97bbb28 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsetsmart.cpp @@ -42,6 +42,8 @@ #include #include +#include + #endif using namespace std; @@ -54,7 +56,7 @@ using namespace Action; ACTION_INIT(Action::WaypointSetSmart); ACTION_SET_NAME(Action::WaypointSetSmart,"waypoint_set_smart"); -ACTION_SET_LOCAL_NAME(Action::WaypointSetSmart,"Add Waypoint"); +ACTION_SET_LOCAL_NAME(Action::WaypointSetSmart,N_("Add Waypoint")); ACTION_SET_TASK(Action::WaypointSetSmart,"set"); ACTION_SET_CATEGORY(Action::WaypointSetSmart,Action::CATEGORY_WAYPOINT|Action::CATEGORY_VALUEDESC|Action::CATEGORY_VALUENODE); ACTION_SET_PRIORITY(Action::WaypointSetSmart,0); diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp index 86906be..c6c2f08 100644 --- a/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp +++ b/synfig-studio/trunk/src/synfigapp/actions/waypointsimpleadd.cpp @@ -32,6 +32,8 @@ #include "waypointsimpleadd.h" #include +#include + #endif using namespace std; @@ -44,7 +46,7 @@ using namespace Action; ACTION_INIT(Action::WaypointSimpleAdd); ACTION_SET_NAME(Action::WaypointSimpleAdd,"waypoint_simpleadd"); -ACTION_SET_LOCAL_NAME(Action::WaypointSimpleAdd,"Simply Add Waypoint"); +ACTION_SET_LOCAL_NAME(Action::WaypointSimpleAdd,N_("Simply Add Waypoint")); ACTION_SET_TASK(Action::WaypointSimpleAdd,"add"); ACTION_SET_CATEGORY(Action::WaypointSimpleAdd,Action::CATEGORY_WAYPOINT); ACTION_SET_PRIORITY(Action::WaypointSimpleAdd,0); diff --git a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp index 2b29594..71214c9 100644 --- a/synfig-studio/trunk/src/synfigapp/blineconvert.cpp +++ b/synfig-studio/trunk/src/synfigapp/blineconvert.cpp @@ -39,6 +39,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp index 030fb87..0de2d97 100644 --- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp @@ -60,6 +60,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/cvs.cpp b/synfig-studio/trunk/src/synfigapp/cvs.cpp index 227a6a8..7173785 100644 --- a/synfig-studio/trunk/src/synfigapp/cvs.cpp +++ b/synfig-studio/trunk/src/synfigapp/cvs.cpp @@ -43,6 +43,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/general.h b/synfig-studio/trunk/src/synfigapp/general.h new file mode 100644 index 0000000..ac1708b --- /dev/null +++ b/synfig-studio/trunk/src/synfigapp/general.h @@ -0,0 +1,47 @@ +/* === S Y N F I G ========================================================= */ +/*! \file synfigstudio/src/synfigapp/general.h +** \brief Te +** +** $Id$ +** +** \legal +** Copyright 2007 Paul Wise +** +** This package 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 of +** the License, or (at your option) any later version. +** +** This package 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. +** \endlegal +*/ +/* ========================================================================= */ + +/* === S T A R T =========================================================== */ + +#ifndef __SYNFIGAPP_GENERAL_H +#define __SYNFIGAPP_GENERAL_H + +/* === H E A D E R S ======================================================= */ + +#include + +/* === M A C R O S ========================================================= */ + +#undef _ +#undef gettext_noop +#undef N_ +#define _(x) dgettext("synfigstudio",x) +#define gettext_noop(x) x +#define N_(x) gettext_noop(x) + +/* === T Y P E D E F S ===================================================== */ + +/* === C L A S S E S & S T R U C T S ======================================= */ + +/* === E N D =============================================================== */ + +#endif diff --git a/synfig-studio/trunk/src/synfigapp/inputdevice.cpp b/synfig-studio/trunk/src/synfigapp/inputdevice.cpp index 7d6f882..4169471 100644 --- a/synfig-studio/trunk/src/synfigapp/inputdevice.cpp +++ b/synfig-studio/trunk/src/synfigapp/inputdevice.cpp @@ -35,6 +35,8 @@ #include #include "main.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp index 1dd1171..6c048b2 100644 --- a/synfig-studio/trunk/src/synfigapp/instance.cpp +++ b/synfig-studio/trunk/src/synfigapp/instance.cpp @@ -40,6 +40,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/main.cpp b/synfig-studio/trunk/src/synfigapp/main.cpp index ef9df72..0403926 100644 --- a/synfig-studio/trunk/src/synfigapp/main.cpp +++ b/synfig-studio/trunk/src/synfigapp/main.cpp @@ -39,6 +39,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -95,6 +97,9 @@ synfigapp::Main::Main(const synfig::String &basepath,ProgressCallback *cb): ref_count_=synfigapp_ref_count_; // Add initialization after this point + + bindtextdomain("synfigstudio", LOCALEDIR); + action_main=new synfigapp::Action::Main(); settings_.construct(); diff --git a/synfig-studio/trunk/src/synfigapp/settings.cpp b/synfig-studio/trunk/src/synfigapp/settings.cpp index 3c502bd..43fcb8f 100644 --- a/synfig-studio/trunk/src/synfigapp/settings.cpp +++ b/synfig-studio/trunk/src/synfigapp/settings.cpp @@ -35,6 +35,8 @@ #include "settings.h" #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/timegather.cpp b/synfig-studio/trunk/src/synfigapp/timegather.cpp index 7e2f34a..9b8ada1 100644 --- a/synfig-studio/trunk/src/synfigapp/timegather.cpp +++ b/synfig-studio/trunk/src/synfigapp/timegather.cpp @@ -34,6 +34,8 @@ #include +#include "general.h" + #endif /* === U S I N G =========================================================== */ diff --git a/synfig-studio/trunk/src/synfigapp/uimanager.cpp b/synfig-studio/trunk/src/synfigapp/uimanager.cpp index 0aa0450..9ee6af2 100644 --- a/synfig-studio/trunk/src/synfigapp/uimanager.cpp +++ b/synfig-studio/trunk/src/synfigapp/uimanager.cpp @@ -33,6 +33,8 @@ #include #include +#include "general.h" + #endif /* === U S I N G =========================================================== */