Spiro refactor

(bzr r11950.1.42)

46 files changed, 4580 insertions, 3331 deletions

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 3a6b6c44f..a0e66c579 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -46,7 +46,7 @@ if(WITH_GNOME_VFS)
 endif()
 
 if(ENABLE_LCMS)
-	find_package(GnomeVFS2)
+	find_package(LCMS)
 	if(LCMS_FOUND)
 		list(APPEND INKSCAPE_INCS_SYS ${LCMS_INCLUDE_DIRS})
 		list(APPEND INKSCAPE_LIBS ${LCMS_LIBRARIES})
diff --git a/Makefile.am b/Makefile.am
index 6d6b2a168..66035791a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
 SUBDIRS = src doc share po
 
 Graphicsdir = $(datadir)/applications
diff --git a/acinclude.m4 b/acinclude.m4
index 50ede11c2..36275e22f 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,4 +1,3 @@
 m4_include([m4/ac_define_dir.m4])
-m4_include([m4/ax_openmp.m4])
 m4_include([m4/relaytool.m4])
 m4_include([m4/ink_bzr_snapshot_build.m4])
diff --git a/autogen.sh b/autogen.sh
index 5e9822c2c..081a5e904 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash -e
 
 # This script does all the magic calls to automake/autoconf and
 # friends that are needed to configure a cvs checkout.  As described in
@@ -9,188 +9,26 @@
 # tools and you shouldn't use this script.  Just call ./configure
 # directly.
 
+test -n "$srcdir" || srcdir=`dirname "$0"`
+test -n "$srcdir" || srcdir=.
 
-PROJECT="Inkscape"
-TEST_TYPE=-f
-FILE=inkscape.spec.in
+olddir=`pwd`
+cd $srcdir
 
-AUTOCONF_REQUIRED_VERSION=2.52
-AUTOMAKE_REQUIRED_VERSION=1.10
-GLIB_REQUIRED_VERSION=2.0.0
-INTLTOOL_REQUIRED_VERSION=0.17
-
-srcdir=`dirname "$0"`
-test -z "$srcdir" && srcdir=.
-ORIGDIR=`pwd`
-cd "$srcdir"
-
-./tools-version.sh
-
-check_version ()
-{
-MAJOR1=`echo "$1" | cut -d"." -f1`;
-MINOR1=`echo "$1" | cut -s -d"." -f2`;
-MAJOR2=`echo "$2" | cut -d"." -f1`;
-MINOR2=`echo "$2" | cut -d"." -f2;`
-test -z "$MINOR1" && MINOR1="0";
-
-if [ "$MAJOR1" -gt "$MAJOR2" ] || [ "$MAJOR1" -eq "$MAJOR2" -a "$MINOR1" -ge "$MINOR2" ]; then
-        echo "yes (version $1)"
-    else
-        echo "Too old (found version $1)!"
-        DIE=1
-    fi
-}
-
-attempt_command () {
-    IGNORE=$1
-    shift
-
-    echo "Running $@ ..."
-    ERR="`$@ 2>&1`"
-    errcode=$?
-    if [ "x$IGNORE" = "x" ]; then
-        ERR=`echo "$ERR"`
-    else
-        ERR=`echo "$ERR" | egrep -v "$IGNORE"`
-    fi
-    if [ "x$ERR" != "x" ]; then
-        echo "$ERR" | awk '{print "  " $0}'
-    fi
-    if [ $errcode -gt 0 ]; then
-        echo "Please fix the error conditions and try again."
+AUTORECONF=`which autoreconf`
+if test -z $AUTORECONF; then
+        echo "*** No autoreconf found, please install it ***"
         exit 1
-    fi
-}
-
-echo
-echo "I am testing that you have the required versions of autoconf,"
-echo "automake, glib-gettextize and intltoolize. This test is not foolproof and"
-echo "if anything goes wrong, there may be guidance in the file HACKING.txt"
-echo
-
-DIE=0
-
-echo -n "checking for autoconf >= $AUTOCONF_REQUIRED_VERSION ... "
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-    VER=`autoconf --version \
-         | grep -iw autoconf | sed -n 's/.* \([0-9.]*\)[-a-z0-9]*$/\1/p'`
-    check_version "$VER" "$AUTOCONF_REQUIRED_VERSION"
-else
-    echo
-    echo "  You must have autoconf installed to compile $PROJECT."
-    echo "  Download the appropriate package for your distribution,"
-    echo "  or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
-    DIE=1;
-fi
-
-echo -n "checking for automake >= $AUTOMAKE_REQUIRED_VERSION ... "
-# Prefer earlier versions just so that the earliest supported version gets test coverage by developers.
-if (automake-1.11 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.11
-   ACLOCAL=aclocal-1.11
-elif (automake-1.10 --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake-1.10
-   ACLOCAL=aclocal-1.10
-elif (automake --version) < /dev/null > /dev/null 2>&1; then
-   # Leave unversioned automake for a last resort: it may be a version earlier
-   # than what we require.
-   # (In particular, it might mean automake 1.4: that version didn't default to
-   #  installing a versioned name.)
-   AUTOMAKE=automake
-   ACLOCAL=aclocal
-else
-    echo
-    echo "  You must have automake 1.10 or newer installed to compile $PROJECT."
-    DIE=1
-fi
-if test x$AUTOMAKE != x; then
-    VER=`$AUTOMAKE --version \
-         | grep automake | sed -n 's/.* \([0-9.]*\)[-a-z0-9]*$/\1/p'`
-    check_version "$VER" "$AUTOMAKE_REQUIRED_VERSION"
-fi
-
-echo -n "checking for glib-gettextize >= $GLIB_REQUIRED_VERSION ... "
-if (glib-gettextize --version) < /dev/null > /dev/null 2>&1; then
-    VER=`glib-gettextize --version \
-         | grep glib-gettextize | sed -n 's/.* \([0-9.]*\)/\1/p'`
-    check_version "$VER" "$GLIB_REQUIRED_VERSION"
-else
-    echo
-    echo "  You must have glib-gettextize installed to compile $PROJECT."
-    echo "  glib-gettextize is part of glib-2.0, so you should already"
-    echo "  have it. Make sure it is in your PATH."
-    DIE=1
 fi
 
-echo -n "checking for intltool >= $INTLTOOL_REQUIRED_VERSION ... "
-if (intltoolize --version) < /dev/null > /dev/null 2>&1; then
-    VER=`intltoolize --version \
-         | grep intltoolize | sed -n 's/.* \([0-9.]*\)/\1/p'`
-    check_version "$VER" "$INTLTOOL_REQUIRED_VERSION"
-else
-    echo
-    echo "  You must have intltool installed to compile $PROJECT."
-    echo "  Get the latest version from"
-    echo "  ftp://ftp.gnome.org/pub/GNOME/sources/intltool/"
-    DIE=1
-fi
-
-if test "$DIE" -eq 1; then
-    echo
-    echo "Please install/upgrade the missing tools and call me again."
-    echo	
-    exit 1
-fi
-
-
-test $TEST_TYPE $FILE || {
-    echo
-    echo "You must run this script in the top-level $PROJECT directory."
-    echo
-    exit 1
-}
-
-
-if test -z "$ACLOCAL_FLAGS"; then
-
-    acdir=`$ACLOCAL --print-ac-dir`
-    m4list="glib-2.0.m4 glib-gettext.m4 gtk-2.0.m4 intltool.m4 pkg.m4 libtool.m4"
-
-    for file in $m4list
-    do
-    if [ ! -f "$acdir/$file" ]; then
-        echo
-        echo "WARNING: aclocal's directory is $acdir, but..."
-            echo "         no file $acdir/$file"
-            echo "         You may see fatal macro warnings below."
-            echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
-            echo "         environment variable to \"-I /some/dir\", or install"
-            echo "         $acdir/$file."
-            echo
-        fi
-    done
+INTLTOOLIZE=`which intltoolize`
+if test -z $INTLTOOLIZE; then
+        echo "*** No intltoolize found, please install the intltool package ***"
+        exit 1
 fi
 
-echo ""
-
-attempt_command 'underquoted definition of|[\)\#]Extending' \
-	$ACLOCAL $ACLOCAL_FLAGS
-
-# optionally feature autoheader
-(autoheader --version)  < /dev/null > /dev/null 2>&1 && {
-	attempt_command '' autoheader
-}
-
-# use glibtoolize if it is available (darwin)
-(glibtoolize --version) < /dev/null > /dev/null 2>&1 && LIBTOOLIZE=glibtoolize || LIBTOOLIZE=libtoolize
-
-attempt_command '' $LIBTOOLIZE
-attempt_command '' $AUTOMAKE --copy --force --add-missing
-attempt_command '' autoconf
-attempt_command '^(Please add the files|  codeset|  progtest|from the|or directly|You will also|ftp://ftp.gnu.org|$)' \
-	glib-gettextize --copy --force
-attempt_command '' intltoolize --copy --force --automake
+autopoint --force
+AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose
 
-echo ""
-echo "Done!  Please run './configure' now."
+cd $olddir
+test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
diff --git a/build.xml b/build.xml
index 8b5163877..f22186b0d 100644
--- a/build.xml
+++ b/build.xml
@@ -153,7 +153,7 @@
         #define HAVE_OPENMP                   1
         #define HAVE_TR1_UNORDERED_SET        1
 
-        #define HAVE_LIBLCMS1                 1
+        #define HAVE_LIBLCMS2                 1
 
         #define WITH_GTKMM_2_24               1
 
@@ -487,7 +487,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
@@ -559,7 +559,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
@@ -609,7 +609,7 @@
            -liconv
            ${pcl.Magick++}
            ${pcl.fontconfig} ${pcl.freetype2}
-           ${pcl.lcms}
+           ${pcl.lcms2}
            ${pcl.gsl}
            -lpng -ljpeg -ltiff -lexif -lpopt -lz
            -lgc
diff --git a/configure.ac b/configure.ac
index cd45078ef..e64176671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,16 +1,24 @@
 dnl Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.53)
+AC_PREREQ([2.64])
 
 # Always use 0.xx+devel instead of 0.xxdevel for the version, e.g. 0.46+devel.
 # Rationale: (i) placate simple version comparison software such as
 # `dpkg --compare-versions'.  (ii) We don't always know what the next
 # version is going to be called until about the time we release it
 # (whereas we always know what the previous version was called).
-AC_INIT(inkscape, 0.48+devel)
+AC_INIT([inkscape],
+        [0.48+devel],
+        [http://bugs.launchpad.net/inkscape/+filebug],
+        [inkscape],
+        [http://inkscape.org/])
 
-AC_CANONICAL_HOST
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_SRCDIR([src/main.cpp])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CANONICAL_HOST
+
 AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax])
 
 AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [
@@ -21,24 +29,39 @@ AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build config
   export CC CXX
 ])
 
-AM_CONFIG_HEADER(config.h)
-
 AC_LANG(C++)
-AC_ISC_POSIX
 AC_PROG_CXX
-AM_PROG_CC_STDC
+AC_PROG_CC
 AM_PROG_AS
 AC_PROG_RANLIB
-AC_PROG_INTLTOOL(0.22)
-AC_PROG_LIBTOOL
+# Initialize libtool
+LT_PREREQ([2.2])
+LT_INIT
 AC_HEADER_STDC
 INK_BZR_SNAPSHOT_BUILD
 
 dnl If automake 1.11 shave the output to look nice
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+dnl *********************************************************
+dnl Configure a strict set of build rules to prevent usage of 
+dnl deprecated features in external libraries and code that
+dnl triggers compiler warnings.
+dnl *********************************************************
+AC_ARG_ENABLE(strict-build,
+	      [AS_HELP_STRING([--enable-strict-build], [Enable strict build configuration [[default=yes]].  Usage of most deprecated symbols is forbidden by default.  Set the argument to "high" to introduce very strict checking that will cause the build to fail on many systems.])],
+	      [enable_strict_build=$enableval],
+	      [enable_strict_build=yes])
+
+if test "x$enable_strict_build" = "xno"; then
+	AC_MSG_WARN([Strict build options disabled])
+elif test "x$enable_strict_build" = "xhigh"; then
+	AC_MSG_WARN([Strictest build options enabled.  This will cause build failure on most systems])
+else
+	AC_MSG_RESULT([Strict build options enabled])
+fi
+
 dnl These next few lines are needed only while libcroco is in our source tree.
-AC_PROG_CC
 AM_PROG_CC_C_O
 if test "$GCC" = "yes"; then
   # Enable some warnings from gcc.
@@ -57,12 +80,12 @@ if test "$GCC" = "yes"; then
 
   # Permit only top-level Glib headers to be used.
   # 
-  # TODO: This is already the case for Glib >= 2.32 so this flag can be dropped
-  #       when all targeted distros use higher Glib versions.
+  # TODO: This is already used in Glib >= 2.32 so this flag can be 
+  #       dropped when all targeted distros use higher Glib versions.
   CPPFLAGS="-DG_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
 
-  # Ensure that private GTK+ fields are not accessible. This is the case for
-  # GTK+ 3, so it is important to avoid using them in GTK+ 2.
+  # Ensure that private GTK+ fields are not accessible. This strictly
+  # enforced in Gtk+ 3, so it is important to check this in Gtk+ 2 builds
   CPPFLAGS="-DGSEAL_ENABLE $CPPFLAGS"
 
   # Test for -Werror=... (introduced some time post-4.0)
@@ -70,7 +93,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([compiler support for -Werror=format-security])
   ink_svd_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="-Werror=format-security $CPPFLAGS"
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CPPFLAGS="$ink_svd_CPPFLAGS"
@@ -84,7 +107,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([compiler support for -Wno-pointer-sign])
   ink_svd_CFLAGS="$CFLAGS"
   CFLAGS="-Wno-pointer-sign $CFLAGS"
-  AC_COMPILE_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     CFLAGS="$ink_svd_CFLAGS"
@@ -97,7 +120,7 @@ if test "$GCC" = "yes"; then
   AC_MSG_CHECKING([linker tolerates -z relro])
   ink_svd_LDFLAGS="$LDFLAGS"
   LDFLAGS="-Wl,-z,relro $LDFLAGS"
-  AC_LINK_IFELSE(AC_LANG_PROGRAM([]), [ink_opt_ok=yes], [ink_opt_ok=no])
+  AC_LINK_IFELSE([AC_LANG_PROGRAM([])], [ink_opt_ok=yes], [ink_opt_ok=no])
   AC_MSG_RESULT([$ink_opt_ok])
   if test "x$ink_opt_ok" != "xyes"; then
     LDFLAGS="$ink_svd_LDFLAGS"
@@ -108,9 +131,6 @@ if test "$GCC" = "yes"; then
   # C++-specific flags are defined further below.  Look for CXXFLAGS...
 fi
 
-dnl Honor aclocal flags
-ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
-
 dnl Verify our GCC version
 if test "x$GXX" = "xyes"; then
 	AC_MSG_CHECKING([GNU compiler version])
@@ -138,14 +158,12 @@ fi
 
 # Detect a working version of unordered containers.
 AC_MSG_CHECKING([TR1 unordered_set usability])
-AC_COMPILE_IFELSE([
-#include <tr1/unordered_set>
-int main() {
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <tr1/unordered_set>]],
+[[
   std::tr1::unordered_set<int> i, j;
   i = j;
-  return 0;
-}
-], [unordered_set_works=yes], [unordered_set_works=no])
+]])],
+[unordered_set_works=yes], [unordered_set_works=no])
 if test "x$unordered_set_works" = "xyes"; then
 	AC_MSG_RESULT([ok])
 	AC_DEFINE(HAVE_TR1_UNORDERED_SET, 1, [Has working standard TR1 unordered_set])
@@ -162,13 +180,13 @@ AC_MSG_CHECKING([for overzealous strict aliasing warnings])
 ignore_strict_aliasing=no
 CXXFLAGS_SAVE=$CXXFLAGS
 CXXFLAGS="$CXXFLAGS -Werror=strict-aliasing"
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #include <boost/optional.hpp>
 boost::optional<int> x;
 int func() {
   return *x;
 }
-], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
+])], [ignore_strict_aliasing=no], [ignore_strict_aliasing=yes])
 AC_MSG_RESULT($ignore_strict_aliasing)
 CXXFLAGS=$CXXFLAGS_SAVE
 if test "x$ignore_strict_aliasing" = "xyes"; then
@@ -178,12 +196,14 @@ fi
 dnl ******************************
 dnl Gettext stuff
 dnl ******************************
+IT_PROG_INTLTOOL([0.40.0])
+
+AM_GNU_GETTEXT_VERSION([0.17])
+AM_GNU_GETTEXT([external])
+
 GETTEXT_PACKAGE="AC_PACKAGE_NAME"
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Translation domain used])
-dnl Add the languages which your application supports here.
-ALL_LINGUAS="am ar az be bg bn bn_BD br ca ca@valencia cs da de dz el en_AU en_CA en_GB en_US@piglatin eo es_MX es et eu fa fi fr ga gl he hr hu hy id it ja km ko lt lv mk mn nb ne nl nn pa pl pt_BR pt ro ru rw sk sl sq sr@latin sr sv te_IN th tr uk vi zh_CN zh_TW"
-AM_GLIB_GNU_GETTEXT
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -196,32 +216,24 @@ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 
 dnl ******************************
 dnl Check for OpenMP 
-dnl Replace this with AC_OPENMP once Autoconf 2.62 is widespread
 dnl ******************************
-AX_OPENMP([openmp_ok=yes],[openmp_ok=no])
-if test "x$openmp_ok" = "xyes"; then
+AC_OPENMP
+if test "x$ac_cv_prog_cxx_openmp" != "xunsupported"; then
+	openmp_ok=yes
 	dnl We have it, now set up the flags
 	CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-	AC_CHECK_HEADER(omp.h)
 	AC_DEFINE(HAVE_OPENMP, 1, [Use OpenMP])
 fi
 
 dnl ******************************
-dnl Check for libpng 
-dnl ******************************
-AC_CHECK_LIB(png, png_read_info, [AC_CHECK_HEADER(png.h, png_ok=yes, png_ok=no)], png_ok=no, -lz -lm)
-if test "x$png_ok" != "xyes"; then
-	AC_MSG_ERROR([libpng >= 1.2 is needed to compile inkscape])
-fi
-
-dnl ******************************
 dnl Check for libexif
 dnl ******************************
-AC_CHECK_LIB(exif, exif_data_new_from_file, [AC_CHECK_HEADER(libexif/exif-data.h, exif_ok=yes, exif_ok=no)], exif_ok=no, -lm)
+PKG_CHECK_MODULES(EXIF, libexif, exif_ok=yes, exif_ok=no)
 if test "x$exif_ok" = "xyes"; then
-   LIBS="-lexif $LIBS"
    AC_DEFINE(HAVE_EXIF, 1, [Use libexif])
 fi
+AC_SUBST(EXIF_LIBS)
+AC_SUBST(EXIF_CFLAGS)
 
 dnl ******************************
 dnl Check for libjpeg
@@ -232,76 +244,6 @@ if test "x$jpeg_ok" = "xyes"; then
    AC_DEFINE(HAVE_JPEG, 1, [Use libjpeg])
 fi
 
-dnl Handle possible dlopen requirement for libgc
-dnl Isn't this internal to something in autoconf?  Couldn't find it...
-AC_CHECK_LIB([dld], [shl_load], [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], [AC_CHECK_FUNC([dlopen],
-          [lt_cv_dlopen="dlopen"],
-      [AC_CHECK_LIB([dl], [dlopen],
-            [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-        [AC_CHECK_LIB([svld], [dlopen],
-              [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-          [AC_CHECK_LIB([dld], [dld_link],
-                [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-          ])
-        ])
-      ])
-    ])
-
-AC_CHECK_HEADERS([gc.h gc/gc.h],
-                 [
-		    # To test for the different required libs, I have to
-		    # overcome autoconf's caching system, so I change the
-		    # desired function name.  They're all in libgc.
-		    # The "break" will exit from the top level
-                    # AC_CHECK_HEADERS.
-		    gc_libs=""
-		    AC_CHECK_LIB(gc, GC_init,
-                                 [gc_ok=yes;
-				  LIBS="-lgc $gc_libs $LIBS";
-				  break], [gc_ok=no], [$gc_libs])
-		    gc_libs="-lpthread"
-		    AC_CHECK_LIB(gc, GC_malloc,
-                                 [gc_ok=yes;
-				  LIBS="-lgc $gc_libs $LIBS";
-                                  break], [gc_ok=no], [$gc_libs])
-		    gc_libs="$lt_cv_dlopen_libs"
-		    AC_CHECK_LIB(gc, GC_realloc,
-                                 [gc_ok=yes;
-				  LIBS="-lgc $gc_libs $LIBS";
-                                  break], [gc_ok=no], [$gc_libs])
-		    gc_libs="-lpthread $lt_cv_dlopen_libs"
-		    AC_CHECK_LIB(gc, GC_free,
-                                 [gc_ok=yes;
-				  LIBS="-lgc $gc_libs $LIBS";
-				  break], [gc_ok=no], [$gc_libs])
-		    break],
-                 [gc_ok=no])
-if test "x$gc_ok" = "xyes" && test "x$cross_compiling" = "xno" ; then 
-	AC_MSG_CHECKING([libgc version 6.4+])
-	AC_RUN_IFELSE(
-		[AC_LANG_SOURCE([[
-			#ifdef HAVE_GC_GC_H
-			# include <gc/gc.h>
-			#else
-			# include <gc.h>
-			#endif
-			#include <stdio.h>
-			extern unsigned GC_version;
-			int main(void){
-				unsigned min = ((6 << 16) | (4 << 8) | 0);
-				printf("%d.%d.%d ",GC_version >> 16, (GC_version >> 8) & 0xFF, GC_version & 0xFF);
-				if (GC_version>=min) return 0;
-				return 1;
-			}]])],
-		[gc_ok=yes],
-		[gc_ok=no]
-	)
-	AC_MSG_RESULT([$gc_ok])
-fi
-if test "x$gc_ok" != "xyes"; then
-	AC_MSG_ERROR([libgc (the Boehm Conservative Collector) 6.4+, is needed to compile inkscape -- http://www.hpl.hp.com/personal/Hans_Boehm/gc])
-fi
-
 dnl This check is to get a FIONREAD definition on Solaris 8
 AC_CHECK_HEADERS([sys/filio.h])
 
@@ -374,7 +316,7 @@ dnl gnome vfs checking
 dnl ******************************
 
 AC_ARG_WITH(gnome-vfs,
-	AC_HELP_STRING([--with-gnome-vfs], [use gnome vfs for loading files]),
+	AS_HELP_STRING([--with-gnome-vfs],[use gnome vfs for loading files]),
 	[with_gnome_vfs=$withval], [with_gnome_vfs=auto])
 
 if test "x$with_gnome_vfs" = "xno"; then
@@ -408,7 +350,7 @@ dnl libinkjar checking
 dnl ******************************
 
 AC_ARG_WITH(inkjar,
-	AC_HELP_STRING([--without-inkjar], [disable openoffice files (SVG jars)]),[with_ij=$withval], [with_ij=yes])
+	AS_HELP_STRING([--without-inkjar],[disable openoffice files (SVG jars)]),[with_ij=$withval], [with_ij=yes])
 
 if test "x$with_ij" = "xyes"; then
 	AC_DEFINE(WITH_INKJAR, 1, [enable openoffice files (SVG jars)])
@@ -426,7 +368,7 @@ dnl ******************************
 
 AC_MSG_CHECKING(for Perl development environment)
 AC_ARG_WITH(perl,
-            AC_HELP_STRING([--with-perl], [use Perl for embedded scripting (EXPERIMENTAL)]),
+            AS_HELP_STRING([--with-perl],[use Perl for embedded scripting (EXPERIMENTAL)]),
             [with_perl=$withval], [with_perl=skipped])
 
 if test "x$with_perl" = "xyes"; then
@@ -469,7 +411,7 @@ dnl ******************************
 
 AC_MSG_CHECKING(for Python development environment)
 AC_ARG_WITH(python,
-            AC_HELP_STRING([--with-python], [use Python for embedded scripting (EXPERIMENTAL)]),
+            AS_HELP_STRING([--with-python],[use Python for embedded scripting (EXPERIMENTAL)]),
             [with_python=$withval], [with_python=skipped])
 
 if test "x$with_python" = "xyes"; then
@@ -506,12 +448,13 @@ AM_CONDITIONAL(WITH_PYTHON, test "x$with_python" = "xyes")
 AC_SUBST(PYTHON_CFLAGS)
 AC_SUBST(PYTHON_LIBS)
 
+
 dnl ******************************
 dnl LittleCms checking
 dnl ******************************
 
 AC_ARG_ENABLE(lcms,
-	AC_HELP_STRING([--enable-lcms], [enable LittleCms for color management]),
+	AS_HELP_STRING([--enable-lcms],[enable LittleCms for color management]),
 	[enable_lcms=$enableval], [enable_lcms=yes])
 
 if test "x$enable_lcms" = "xno"; then
@@ -549,7 +492,7 @@ dnl Libpoppler checking
 dnl ******************************
 
 AC_ARG_ENABLE(poppler-cairo,
-	AC_HELP_STRING([--enable-poppler-cairo], [Enable libpoppler-cairo for rendering PDF preview]),
+	AS_HELP_STRING([--enable-poppler-cairo],[Enable libpoppler-cairo for rendering PDF preview]),
 	[enable_poppler_cairo=$enableval], [enable_poppler_cairo=yes])
 
 POPPLER_CFLAGS=""
@@ -610,16 +553,13 @@ LIBS="$LIBS $POPPLER_LIBS"
 
 AC_MSG_CHECKING(for new color space API in Poppler)
 popplercolor="no"
-AC_COMPILE_IFELSE([
-#include <GfxState.h>
-
-int main() {
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <GfxState.h>]],
+[[
   typedef GfxColorSpace *(*parse_p)(Object *, Gfx *);
-  parse_p p;
-  p = &GfxColorSpace::parse;
-  return 0;
-}
-], [popplercolor=yes])
+  parse_p p = &GfxColorSpace::parse;
+]])],
+[popplercolor=yes])
+
 if test "x$popplercolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_COLOR_SPACE_API, 1, [Use color space API from Poppler >= 0.12.2])
 	AC_MSG_RESULT(yes)
@@ -628,17 +568,15 @@ else
 fi
 
 # Poppler's b604a008 commit changes this
-AC_MSG_CHECKING([whether Poppler's GfxPatch no longer uses GfxColor])
+AC_MSG_CHECKING([whether GfxPatch in Poppler no longer uses GfxColor])
 popplergfxcolor="no"
-AC_COMPILE_IFELSE([
-#include <GfxState.h>
-
-int main() {
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+		  [[#include <GfxState.h>]],
+[[
   GfxPatch::ColorValue color = {c: {0}};
   GfxPatch patch;
-  patch.color[[0]][[0]] = color;
-  return 0;
-}
+  patch.color[0][0] = color;
+]])
 ], [popplergfxcolor=yes])
 if test "x$popplergfxcolor" = "xyes"; then
 	AC_DEFINE(POPPLER_NEW_GFXPATCH, 1, [GfxPatch no longer uses GfxColor in >= 0.15.1])
@@ -798,7 +736,7 @@ dnl *********************************
 dnl   Allow experimental GTK+3 build
 dnl *********************************
 AC_ARG_ENABLE(gtk3-experimental,
-	AC_HELP_STRING([--enable-gtk3-experimental], [enable compilation with GTK+3 (EXPERIMENTAL!)]),
+	AS_HELP_STRING([--enable-gtk3-experimental], [enable compilation with GTK+3 (EXPERIMENTAL!)]),
 	[enable_gtk3=$enableval], [enable_gtk3=no])
 
 with_gtkmm_3_0="no"
@@ -810,7 +748,7 @@ if test "x$enable_gtk3" = "xyes"; then
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi
 
-	PKG_CHECK_MODULES(INKSCAPE, gtkmm-3.0 >= 3.2  gdkmm-3.0 >= 3.2 gtk+-3.0 >= 3.2 gdk-3.0 >= 3.2 gdl-3.0 > 3.3.4 glib-2.0 >= 2.28  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4 pango >= 1.24 pangoft2 >= 1.24, with_gtkmm_3_0=yes, with_gtkmm_3_0=no)
+	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  gtkmm-3.0 >= 3.2  gdkmm-3.0 >= 3.2 gtk+-3.0 >= 3.2 gdk-3.0 >= 3.2 gdl-3.0 > 3.3.4 glib-2.0 >= 2.28  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4 pango >= 1.24 pangoft2 >= 1.24, with_gtkmm_3_0=yes, with_gtkmm_3_0=no)
 
 	if test "x$with_gtkmm_3_0" = "xyes"; then
 		AC_MSG_RESULT([Using EXPERIMENTAL Gtkmm 3 build])
@@ -821,6 +759,24 @@ if test "x$enable_gtk3" = "xyes"; then
 	else
 		AC_MSG_ERROR([Some dependencies were not fulfilled for the experimental GTK+ 3 build. One possible cause for this is a new dependency on the gdl-3.0 development package.])
 	fi
+
+	# Enable strict build options that should work on most systems unless
+	# the build has been configured not to do so
+	if test "x$enable_strict_build" != "xno"; then
+		# Add build flags here as soon as Inkscape trunk can build
+		# against Gtk+ 3 with the option enabled
+		echo ""
+	fi
+
+	# Enable strict build options that are known to cause failure in
+	# Gtk+ 3 builds
+	if test "x$enable_strict_build" = "xhigh"; then
+		# Disable deprecated Gtk+ symbols that have been removed since
+		# Gtk+ 3.
+		CPPFLAGS="-DGTKMM_DISABLE_DEPRECATED $CPPFLAGS"
+		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+		CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS"
+	fi
 else
 
 	ink_spell_pkg=
@@ -829,50 +785,80 @@ else
 		AC_DEFINE(WITH_GTKSPELL, 1, [enable gtk spelling widget])
 	fi
 
-	PKG_CHECK_MODULES(INKSCAPE, glib-2.0 >= 2.28  gtk+-2.0 >= 2.24  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4  gdkmm-2.4  gtkmm-2.4 >= 2.24 pango >= 1.24 pangoft2 >= 1.24)
+	PKG_CHECK_MODULES(INKSCAPE, bdw-gc >= 7.1  glib-2.0 >= 2.28  gtk+-2.0 >= 2.24  libxml-2.0 >= 2.6.11  libxslt >= 1.0.15  cairo >= 1.10 cairomm-1.0 >= 1.9.8 sigc++-2.0 >= $min_sigc_version  $ink_spell_pkg  gthread-2.0 >= 2.0 libpng >= 1.2 gsl  glibmm-2.4 >= 2.28 giomm-2.4  gdkmm-2.4  gtkmm-2.4 >= 2.24 pango >= 1.24 pangoft2 >= 1.24)
 	
-	# Disable deprecated symbols to make GTK+ 3 migration easier.
-	# This should also be applied to GTK+ 3 builds too,
-	# once the migration is complete.
-	CPPFLAGS="-DGTKMM_DISABLE_DEPRECATED $CPPFLAGS"
-	CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
-	CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS"
-  
-	# Allow only top-level GTK+ headers to be used.  This is mandatory
-	# for GTK+ >= 3.0 so there is no need to apply the flag in GTK+ 3
-	# builds.
-	CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
-
-	# FIXME: This is disabled because our internal
-	# copy of GDL still uses deprecated GTK+ 2 symbols.
-	# 
-	# This shouldn't be a big problem for GTK+ 3 builds because 
-	# we can build against external GDL >= 3.3.4 rather than using
-	# the deprecated internal code
-#	CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+	# Enable build strict options that should work on most systems unless
+	# the build has been configured explicitly not to do so
+	if test "x$enable_strict_build" != "xno"; then
+		# Prevent usage of deprecated Gtk+ symbols.  These have all
+		# been removed in Gtk+ 3 so these checks are important.
+		CPPFLAGS="-DGTKMM_DISABLE_DEPRECATED $CPPFLAGS"
+		CPPFLAGS="-DGTK_DISABLE_DEPRECATED $CPPFLAGS"
+		CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS"
+		
+		# Allow only top-level GTK+ headers to be used.  This is mandatory
+		# for GTK+ >= 3.0 so there is no need to apply the flag in GTK+ 3
+		# builds.
+		CPPFLAGS="-DGTK_DISABLE_SINGLE_INCLUDES $CPPFLAGS"
+	fi
+
+	# Optionally enable strict build options that are known to cause build
+	# failure in many/most systems
+	if test "x$enable_strict_build" == "xhigh"; then
+		# FIXME: This causes build failure because our internal
+		# copy of GDL uses deprecated GDK symbols.
+		# 
+		# This specific issue isn't a problem for GTK+ 3 builds because 
+		# we build against external GDL >= 3.3.4 rather than using
+		# the deprecated internal code
+		CPPFLAGS="-DGDK_DISABLE_DEPRECATED $CPPFLAGS"
+	fi
 fi
 
 AM_CONDITIONAL(WITH_EXT_GDL, test "x$with_gtkmm_3_0" = "xyes")
 
-dnl Pango 1.32.4 uses a deprecated Glib symbol:
-dnl   https://bugzilla.gnome.org/show_bug.cgi?id=689843
-dnl 
-dnl TODO: Get rid of this check once we are sure that all targeted
-dnl       platforms have got rid of this Pango version.  Apply the
-dnl       G_DISABLE_DEPRECATED flag to all builds.
-with_pango_1_32_4="no"
-PKG_CHECK_MODULES(PANGO_1_32_4, pango = 1.32.4, with_pango_1_32_4=yes, with_pango_1_32_4=no)
-
-if test "x$with_pango_1_32_4" = "xyes"; then
-	AC_MSG_WARN([Pango 1.32.4 detected.  Deprecated Glib symbol usage will be allowed])
-else
+# Prevent usage of deprecated Glib and Glibmm symbols unless strict build
+# checking has been disabled
+if test "x$enable_strict_build" != "xno"; then
 	# Ensure that no deprecated glibmm symbols are introduced.
 	# lp:inkscape builds cleanly with this option at r10957
 	CPPFLAGS="-DGLIBMM_DISABLE_DEPRECATED $CPPFLAGS"
-	CPPFLAGS="-DG_DISABLE_DEPRECATED $CPPFLAGS"
+	
+	
+	dnl Pango 1.32.4 uses a deprecated Glib symbol:
+	dnl   https://bugzilla.gnome.org/show_bug.cgi?id=689843
+	dnl 
+	dnl TODO: Get rid of this check once we are sure that all targeted
+	dnl       platforms have got rid of this Pango version.  Apply the
+	dnl       G_DISABLE_DEPRECATED flag to all builds.
+	pango_uses_deprecated_glib_symbols=no
+
+	PKG_CHECK_MODULES(PANGO_USES_DEPRECATED_GLIB_SYMBOLS,
+			  pango = 1.32.4,
+			  pango_uses_deprecated_glib_symbols=yes,
+			  pango_uses_deprecated_glib_symbols=no)
+
+	dnl Glib 2.35 deprecated the GThread API.  Glibmm didn't catch up with
+	dnl this change until v2.35.8 was released so we cannot disable
+	dnl deprecated Glib symbols in this case.
+	glibmm_uses_deprecated_glib_symbols=no
+
+	PKG_CHECK_MODULES(GLIBMM_USES_DEPRECATED_GLIB_SYMBOLS,
+			  glib-2.0 >= 2.35 glibmm-2.4 < 2.35.8,
+			  glibmm_uses_deprecated_glib_symbols=yes,
+			  glibmm_uses_deprecated_glib_symbols=no)
+
+	# Don't disable deprecated Glib symbols if it will break stuff in an
+	# external library header that we use
+	if test "x$pango_uses_deprecated_glib_symbols" = "xyes"; then
+		AC_MSG_WARN([The available version of Pango uses deprecated Glib symbols.  Deprecated Glib symbol usage will be allowed])
+	elif test "x$glibmm_uses_deprecated_glib_symbols" = "xyes"; then
+		AC_MSG_WARN([The available version of Glibmm uses deprecated Glib symbols.  Deprecated Glib symbol usage will be allowed])
+	else
+		CPPFLAGS="-DG_DISABLE_DEPRECATED $CPPFLAGS"
+	fi
 fi
 
-
 # Check for GTK+ backend target
 AC_MSG_CHECKING([for GTK+ backend target])
 gtk_backend_target=`pkg-config --variable=target gtk+-2.0`
@@ -886,9 +872,9 @@ fi
 # Check for Apple Mac OS X Carbon framework
 carbon_ok=no
 AC_MSG_CHECKING([for Mac OS X Carbon support])
-AC_COMPILE_IFELSE([
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <Carbon/Carbon.h>
-#include <CoreServices/CoreServices.h>
+#include <CoreServices/CoreServices.h>]], [])
 ], [carbon_ok=yes])
 AC_MSG_RESULT($carbon_ok)
 if test "x$carbon_ok" = "xyes"; then
@@ -906,8 +892,8 @@ if test "x$cairo_pdf" = "xyes"; then
   AC_DEFINE(HAVE_CAIRO_PDF, 1, [Whether the Cairo PDF backend is available])
 fi
 
-dnl Shouldn't we test for libpng and libz?
-INKSCAPE_LIBS="$INKSCAPE_LIBS -lpng -lz -lxml2 -ldl"
+dnl Shouldn't we test for libz?
+INKSCAPE_LIBS="$INKSCAPE_LIBS -lz -lxml2 -ldl"
 if test "x$openmp_ok" = "xyes"; then
 	INKSCAPE_LIBS="$INKSCAPE_LIBS -lgomp"
 fi
@@ -1033,7 +1019,6 @@ AC_HEADER_STAT
 AC_HEADER_TIME
 AC_STRUCT_TM
 AC_TYPE_MODE_T
-AC_TYPE_SIGNAL
 
 dnl Work around broken gcc 3.3 (seen on OSX) where "ENABLE_NLS" isn't
 dnl set correctly because the gettext function isn't noticed.
@@ -1056,7 +1041,7 @@ if test "$GXX" = "yes"; then
   ink_svd_CXXFLAGS="$CXXFLAGS"
   CXXFLAGS="-Wno-unused-parameter $CXXFLAGS"
   # -Wno-unused-parameter isn't accepted by gcc 2.95.
-  AC_COMPILE_IFELSE([int dummy;
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([int dummy;])
 ], , CXXFLAGS="-Wno-unused $ink_svd_CXXFLAGS",)
   # Note: At least one bug has been caught from unused parameter warnings,
   # so it might be worth trying not to disable it.
@@ -1076,7 +1061,7 @@ dnl ******************************
 dnl   libinkscape
 dnl ******************************
 dnl
-dnl AC_ARG_ENABLE(libinkscape, AC_HELP_STRING([--enable-libinkscape], [Compile dynamic library (experimental)]), [splib=$enableval], [splib=no])
+dnl AC_ARG_ENABLE(libinkscape, AS_HELP_STRING([--enable-libinkscape],[Compile dynamic library (experimental)]), [splib=$enableval], [splib=no])
 dnl
 dnl AM_CONDITIONAL(ENABLE_LIBINKSCAPE, test "x$splib" != "xno")
 dnl
diff --git a/m4/Makefile.am b/m4/Makefile.am
index 6817876cb..e1b0207fe 100644
--- a/m4/Makefile.am
+++ b/m4/Makefile.am
@@ -1,6 +1,5 @@
 EXTRA_DIST = \
 	ac_define_dir.m4 \
-	ax_openmp.m4 \
 	codeset.m4 \
 	gettext.m4 \
 	glibc21.m4 \
diff --git a/m4/ax_openmp.m4 b/m4/ax_openmp.m4
deleted file mode 100644
index b50cb1643..000000000
--- a/m4/ax_openmp.m4
+++ /dev/null
@@ -1,101 +0,0 @@
-# ===========================================================================
-#               http://autoconf-archive.cryp.to/ax_openmp.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_OPENMP([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
-#
-# DESCRIPTION
-#
-#   This macro tries to find out how to compile programs that use OpenMP a
-#   standard API and set of compiler directives for parallel programming
-#   (see http://www-unix.mcs/)
-#
-#   On success, it sets the OPENMP_CFLAGS/OPENMP_CXXFLAGS/OPENMP_F77FLAGS
-#   output variable to the flag (e.g. -omp) used both to compile *and* link
-#   OpenMP programs in the current language.
-#
-#   NOTE: You are assumed to not only compile your program with these flags,
-#   but also link it with them as well.
-#
-#   If you want to compile everything with OpenMP, you should set:
-#
-#       CFLAGS="$CFLAGS $OPENMP_CFLAGS"
-#       #OR#  CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
-#       #OR#  FFLAGS="$FFLAGS $OPENMP_FFLAGS"
-#
-#   (depending on the selected language).
-#
-#   The user can override the default choice by setting the corresponding
-#   environment variable (e.g. OPENMP_CFLAGS).
-#
-#   ACTION-IF-FOUND is a list of shell commands to run if an OpenMP flag is
-#   found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it is
-#   not found. If ACTION-IF-FOUND is not specified, the default action will
-#   define HAVE_OPENMP.
-#
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
-#
-#   Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu>
-#
-#   This program is free software: you can redistribute it and/or modify it
-#   under the terms of the GNU General Public License as published by the
-#   Free Software Foundation, either version 3 of the License, or (at your
-#   option) any later version.
-#
-#   This program is distributed in the hope that it will be useful, but
-#   WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
-#   Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#   As a special exception, the respective Autoconf Macro's copyright owner
-#   gives unlimited permission to copy, distribute and modify the configure
-#   scripts that are the output of Autoconf when processing the Macro. You
-#   need not follow the terms of the GNU General Public License when using
-#   or distributing such scripts, even though portions of the text of the
-#   Macro appear in them. The GNU General Public License (GPL) does govern
-#   all other use of the material that constitutes the Autoconf Macro.
-#
-#   This special exception to the GPL applies to versions of the Autoconf
-#   Macro released by the Autoconf Macro Archive. When you make and
-#   distribute a modified version of the Autoconf Macro, you may extend this
-#   special exception to the GPL to apply to your modified version as well.
-
-AC_DEFUN([AX_OPENMP], [
-AC_PREREQ(2.59) dnl for _AC_LANG_PREFIX
-
-AC_CACHE_CHECK([for OpenMP flag of _AC_LANG compiler], ax_cv_[]_AC_LANG_ABBREV[]_openmp, [save[]_AC_LANG_PREFIX[]FLAGS=$[]_AC_LANG_PREFIX[]FLAGS
-ax_cv_[]_AC_LANG_ABBREV[]_openmp=unknown
-# Flags to try:  -fopenmp (gcc), -openmp (icc), -mp (SGI & PGI),
-#                -xopenmp (Sun), -omp (Tru64), -qsmp=omp (AIX), none
-ax_openmp_flags="-fopenmp -openmp -mp -xopenmp -omp -qsmp=omp none"
-if test "x$OPENMP_[]_AC_LANG_PREFIX[]FLAGS" != x; then
-  ax_openmp_flags="$OPENMP_[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flags"
-fi
-for ax_openmp_flag in $ax_openmp_flags; do
-  case $ax_openmp_flag in
-    none) []_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[] ;;
-    *) []_AC_LANG_PREFIX[]FLAGS="$save[]_AC_LANG_PREFIX[]FLAGS $ax_openmp_flag" ;;
-  esac
-  AC_TRY_LINK_FUNC(omp_set_num_threads,
-	[ax_cv_[]_AC_LANG_ABBREV[]_openmp=$ax_openmp_flag; break])
-done
-[]_AC_LANG_PREFIX[]FLAGS=$save[]_AC_LANG_PREFIX[]FLAGS
-])
-if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "xunknown"; then
-  m4_default([$2],:)
-else
-  if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
-    OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
-  fi
-  m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
-fi
-])dnl AX_OPENMP
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index 7e7a74ed4..5281e70c6 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -21,7 +21,7 @@
 # User modifiable parameters
 #----------------------------------------------------------
 # Configure flags
-CONFFLAGS="--enable-osxapp"
+CONFFLAGS="--disable-openmp --enable-osxapp"
 # Libraries prefix (Warning: NO trailing slash)
 LIBPREFIX="/opt/local"
 # User name on Modevia
@@ -252,7 +252,7 @@ then
 			make distclean
 		fi
 	fi
-	./autogen.sh
+	export NOCONFIGURE=true && ./autogen.sh
 	status=$?
 	if [[ $status -ne 0 ]]; then
 		echo -e "\nautogen failed"
diff --git a/po/LINGUAS b/po/LINGUAS
new file mode 100644
index 000000000..826cbd17e
--- /dev/null
+++ b/po/LINGUAS
@@ -0,0 +1,71 @@
+#
+# po/LINGUAS: lists available languages for Inkscape
+#
+# please keep this list sorted alphabetically
+#
+am
+ar
+az
+be
+bg
+bn
+bn_BD
+br
+ca
+ca@valencia
+cs
+da
+de
+dz
+el
+en_AU
+en_CA
+en_GB
+en_US@piglatin
+eo
+es_MX
+es
+et
+eu
+fa
+fi
+fr
+ga
+gl
+he
+hr
+hu
+hy
+id
+it
+ja
+km
+ko
+lt
+lv
+mk
+mn
+nb
+ne
+nl
+nn
+pa
+pl
+pt_BR
+pt
+ro
+ru
+rw
+sk
+sl
+sq
+sr@latin
+sr
+sv
+te_IN
+th
+tr
+uk
+vi
+zh_CN
+zh_TW
diff --git a/po/de.po b/po/de.po
index 5023aa51a..afd6b7d12 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: inkscape\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-01-15 09:14+0100\n"
-"PO-Revision-Date: 2013-01-31 06:04+0100\n"
+"POT-Creation-Date: 2013-01-30 12:08+0100\n"
+"PO-Revision-Date: 2013-03-01 10:25+0100\n"
 "Last-Translator: Uwe Schoeler <mail@uwe-schoeler.de>\n"
 "Language-Team:  <de@li.org>\n"
 "Language: de\n"
@@ -27,7 +27,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.5.4\n"
+"X-Generator: Poedit 1.5.5\n"
 "X-Poedit-Basepath: .\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
@@ -332,7 +332,7 @@ msgid "Inset"
 msgstr "Einlage"
 
 #: ../share/filters/filters.svg.h:1
-#: ../src/extension/internal/filter/shadows.h:79
+#: ../src/extension/internal/filter/shadows.h:81
 msgid "Shadows and Glows"
 msgstr "Schatten und Lichter"
 
@@ -976,32 +976,32 @@ msgstr "Schwarzes Licht"
 #: ../src/extension/internal/filter/bumps.h:101
 #: ../src/extension/internal/filter/bumps.h:324
 #: ../src/extension/internal/filter/bumps.h:331
-#: ../src/extension/internal/filter/color.h:81
-#: ../src/extension/internal/filter/color.h:163
-#: ../src/extension/internal/filter/color.h:170
-#: ../src/extension/internal/filter/color.h:261
-#: ../src/extension/internal/filter/color.h:339
-#: ../src/extension/internal/filter/color.h:346
-#: ../src/extension/internal/filter/color.h:436
-#: ../src/extension/internal/filter/color.h:531
-#: ../src/extension/internal/filter/color.h:653
-#: ../src/extension/internal/filter/color.h:750
-#: ../src/extension/internal/filter/color.h:829
-#: ../src/extension/internal/filter/color.h:920
-#: ../src/extension/internal/filter/color.h:1048
-#: ../src/extension/internal/filter/color.h:1118
-#: ../src/extension/internal/filter/color.h:1217
-#: ../src/extension/internal/filter/color.h:1231
-#: ../src/extension/internal/filter/color.h:1346
-#: ../src/extension/internal/filter/color.h:1422
-#: ../src/extension/internal/filter/color.h:1526
-#: ../src/extension/internal/filter/color.h:1533
+#: ../src/extension/internal/filter/color.h:82
+#: ../src/extension/internal/filter/color.h:164
+#: ../src/extension/internal/filter/color.h:171
+#: ../src/extension/internal/filter/color.h:262
+#: ../src/extension/internal/filter/color.h:340
+#: ../src/extension/internal/filter/color.h:347
+#: ../src/extension/internal/filter/color.h:437
+#: ../src/extension/internal/filter/color.h:532
+#: ../src/extension/internal/filter/color.h:654
+#: ../src/extension/internal/filter/color.h:751
+#: ../src/extension/internal/filter/color.h:830
+#: ../src/extension/internal/filter/color.h:921
+#: ../src/extension/internal/filter/color.h:1049
+#: ../src/extension/internal/filter/color.h:1119
+#: ../src/extension/internal/filter/color.h:1212
+#: ../src/extension/internal/filter/color.h:1324
+#: ../src/extension/internal/filter/color.h:1429
+#: ../src/extension/internal/filter/color.h:1505
+#: ../src/extension/internal/filter/color.h:1609
+#: ../src/extension/internal/filter/color.h:1616
 #: ../src/extension/internal/filter/morphology.h:194
 #: ../src/extension/internal/filter/overlays.h:73
 #: ../src/extension/internal/filter/paint.h:99
 #: ../src/extension/internal/filter/paint.h:714
 #: ../src/extension/internal/filter/paint.h:718
-#: ../src/extension/internal/filter/shadows.h:71
+#: ../src/extension/internal/filter/shadows.h:73
 #: ../src/extension/internal/filter/transparency.h:345
 #: ../src/ui/dialog/document-properties.cpp:148
 #: ../share/extensions/color_blackandwhite.inx.h:2
@@ -3264,37 +3264,37 @@ msgstr "Richtung"
 msgid "Defines the direction and magnitude of the extrusion"
 msgstr "Definiert Richtung und Ausmaß der Extrusion"
 
-#: ../src/sp-flowtext.cpp:365 ../src/sp-text.cpp:426
-#: ../src/text-context.cpp:1631
+#: ../src/sp-flowtext.cpp:339 ../src/sp-text.cpp:400
+#: ../src/text-context.cpp:1608
 msgid " [truncated]"
 msgstr "[abgestumpft}"
 
-#: ../src/sp-flowtext.cpp:368
+#: ../src/sp-flowtext.cpp:342
 #, c-format
 msgid "<b>Flowed text</b> (%d character%s)"
 msgid_plural "<b>Flowed text</b> (%d characters%s)"
 msgstr[0] "<b>Fließtext</b> (%d Zeichen %s)"
 msgstr[1] "<b>Fließtext</b> (%d Zeichen %s)"
 
-#: ../src/sp-flowtext.cpp:370
+#: ../src/sp-flowtext.cpp:344
 #, c-format
 msgid "<b>Linked flowed text</b> (%d character%s)"
 msgid_plural "<b>Linked flowed text</b> (%d characters%s)"
 msgstr[0] "<b>Verknüpfter Fließtext</b> (%d Zeichen %s)"
 msgstr[1] "<b>Verknüpfter Fließtext</b> (%d Zeichen %s)"
 
-#: ../src/arc-context.cpp:331
+#: ../src/arc-context.cpp:307
 msgid ""
 "<b>Ctrl</b>: make circle or integer-ratio ellipse, snap arc/segment angle"
 msgstr ""
 "<b>Strg</b>: Kreis oder Ellipse mit ganzzahligem Höhen-/Breitenverhältnis "
 "erzeugen, Winkel vom Bogen/Kreissegment einrasten"
 
-#: ../src/arc-context.cpp:332 ../src/rect-context.cpp:377
+#: ../src/arc-context.cpp:308 ../src/rect-context.cpp:353
 msgid "<b>Shift</b>: draw around the starting point"
 msgstr "<b>Umschalt</b>: Um Mittelpunkt zeichnen"
 
-#: ../src/arc-context.cpp:488
+#: ../src/arc-context.cpp:464
 #, c-format
 msgid ""
 "<b>Ellipse</b>: %s &#215; %s (constrained to ratio %d:%d); with <b>Shift</b> "
@@ -3303,7 +3303,7 @@ msgstr ""
 "<b>Ellipse</b>: %s &#215; %s (festes Achsenverhältnis %d:%d); <b>Umschalt</"
 "b> zeichnet um Startpunkt"
 
-#: ../src/arc-context.cpp:490
+#: ../src/arc-context.cpp:466
 #, c-format
 msgid ""
 "<b>Ellipse</b>: %s &#215; %s; with <b>Ctrl</b> to make square or integer-"
@@ -3312,65 +3312,65 @@ msgstr ""
 "<b>Ellipse</b>: %s &#215; %s; <b>Strg</b> drücken für ganzzahliges "
 "Verhältnis der Radien; <b>Umschalt</b> zeichnet um Startpunkt"
 
-#: ../src/arc-context.cpp:516
+#: ../src/arc-context.cpp:492
 msgid "Create ellipse"
 msgstr "Ellipse erzeugen"
 
-#: ../src/box3d-context.cpp:444 ../src/box3d-context.cpp:451
-#: ../src/box3d-context.cpp:458 ../src/box3d-context.cpp:465
-#: ../src/box3d-context.cpp:472 ../src/box3d-context.cpp:479
+#: ../src/box3d-context.cpp:421 ../src/box3d-context.cpp:428
+#: ../src/box3d-context.cpp:435 ../src/box3d-context.cpp:442
+#: ../src/box3d-context.cpp:449 ../src/box3d-context.cpp:456
 msgid "Change perspective (angle of PLs)"
 msgstr "Perspektive ändern (Winkel der Perspektivlinien)"
 
 #. status text
-#: ../src/box3d-context.cpp:663
+#: ../src/box3d-context.cpp:640
 msgid "<b>3D Box</b>; with <b>Shift</b> to extrude along the Z axis"
 msgstr "<b>3D Box</b>; <b>Umschalt</b> um in Z-Richtung zu vergrößern"
 
-#: ../src/box3d-context.cpp:691
+#: ../src/box3d-context.cpp:668
 msgid "Create 3D box"
 msgstr "3D-Quader erzeugen"
 
-#: ../src/box3d.cpp:321
+#: ../src/box3d.cpp:292
 msgid "<b>3D Box</b>"
 msgstr "<b>3D Box</b>"
 
-#: ../src/connector-context.cpp:610
+#: ../src/connector-context.cpp:585
 msgid "Creating new connector"
 msgstr "Einen neuen Objektverbinder erzeugen"
 
-#: ../src/connector-context.cpp:865
+#: ../src/connector-context.cpp:840
 msgid "Connector endpoint drag cancelled."
 msgstr "Ziehen von Verbinder-Endpunkten abgebrochen."
 
-#: ../src/connector-context.cpp:912
+#: ../src/connector-context.cpp:887
 msgid "Reroute connector"
 msgstr "Objektverbinder neu verlegen"
 
-#: ../src/connector-context.cpp:1077
+#: ../src/connector-context.cpp:1052
 msgid "Create connector"
 msgstr "Objektverbinder erzeugen"
 
 # !!!
-#: ../src/connector-context.cpp:1100
+#: ../src/connector-context.cpp:1075
 msgid "Finishing connector"
 msgstr "Beende Objektverbinder"
 
-#: ../src/connector-context.cpp:1336
+#: ../src/connector-context.cpp:1311
 msgid "<b>Connector endpoint</b>: drag to reroute or connect to new shapes"
 msgstr ""
 "<b>Objektverbinder-Endpunkt</b>: ziehen, um neu zu verlegen oder mit neuen "
 "Formen zu verbinden"
 
-#: ../src/connector-context.cpp:1476
+#: ../src/connector-context.cpp:1451
 msgid "Select <b>at least one non-connector object</b>."
 msgstr "<b>Mindestens ein Objekt</b> auswählen, das kein Objektverbinder ist."
 
-#: ../src/connector-context.cpp:1481 ../src/widgets/connector-toolbar.cpp:330
+#: ../src/connector-context.cpp:1456 ../src/widgets/connector-toolbar.cpp:330
 msgid "Make connectors avoid selected objects"
 msgstr "Objektverbinder weichen den ausgewählten Objekten aus"
 
-#: ../src/connector-context.cpp:1482 ../src/widgets/connector-toolbar.cpp:340
+#: ../src/connector-context.cpp:1457 ../src/widgets/connector-toolbar.cpp:340
 msgid "Make connectors ignore selected objects"
 msgstr "Objektverbinder ignorieren die ausgewählten Objekte"
 
@@ -3384,20 +3384,20 @@ msgstr ""
 msgid "<b>Current layer is locked</b>. Unlock it to be able to draw on it."
 msgstr "<b>Aktuelle Ebene ist gesperrt</b>. Entsperren, um darauf zu zeichnen."
 
-#: ../src/desktop-events.cpp:229
+#: ../src/desktop-events.cpp:228
 msgid "Create guide"
 msgstr "Führungslinie erzeugen"
 
-#: ../src/desktop-events.cpp:475
+#: ../src/desktop-events.cpp:473
 msgid "Move guide"
 msgstr "Führungslinie verschieben"
 
-#: ../src/desktop-events.cpp:482 ../src/desktop-events.cpp:541
+#: ../src/desktop-events.cpp:480 ../src/desktop-events.cpp:538
 #: ../src/ui/dialog/guides.cpp:138
 msgid "Delete guide"
 msgstr "Führungslinie löschen"
 
-#: ../src/desktop-events.cpp:521
+#: ../src/desktop-events.cpp:518
 #, c-format
 msgid "<b>Guideline</b>: %s"
 msgstr "<b>Führungslinie</b>: %s"
@@ -4431,7 +4431,7 @@ msgid "Search paths, lines, polylines"
 msgstr "Pfade, Linien oder Linienzüge suchen"
 
 #: ../src/dialogs/find.cpp:635 ../src/ui/dialog/find.cpp:98
-#: ../src/widgets/toolbox.cpp:1781
+#: ../src/widgets/toolbox.cpp:1732
 msgid "Paths"
 msgstr "Pfade"
 
@@ -4604,7 +4604,7 @@ msgstr "Vertikale Textausrichtung"
 msgid "Spacing between lines (percent of font size)"
 msgstr "Abstand zwischen Linien (Prozent der Schriftgröße)"
 
-#: ../src/ui/dialog/text-edit.cpp:561 ../src/text-context.cpp:1519
+#: ../src/ui/dialog/text-edit.cpp:561 ../src/text-context.cpp:1496
 msgid "Set text style"
 msgstr "Textstil setzen"
 
@@ -5095,51 +5095,51 @@ msgid "Unnamed document %d"
 msgstr "Unbenanntes Dokument %d"
 
 #. We hit green anchor, closing Green-Blue-Red
-#: ../src/draw-context.cpp:561
+#: ../src/draw-context.cpp:537
 msgid "Path is closed."
 msgstr "Pfad ist geschlossen."
 
 #. We hit bot start and end of single curve, closing paths
-#: ../src/draw-context.cpp:576
+#: ../src/draw-context.cpp:552
 msgid "Closing path."
 msgstr "Pfad schließen"
 
-#: ../src/draw-context.cpp:677
+#: ../src/draw-context.cpp:653
 msgid "Draw path"
 msgstr "Pfad zeichnen"
 
-#: ../src/draw-context.cpp:834
+#: ../src/draw-context.cpp:810
 msgid "Creating single dot"
 msgstr "Erzeuge einzelnen Punkt"
 
-#: ../src/draw-context.cpp:835
+#: ../src/draw-context.cpp:811
 msgid "Create single dot"
 msgstr "Einen einzelnen Punkt erzeugen"
 
 #. alpha of color under cursor, to show in the statusbar
 #. locale-sensitive printf is OK, since this goes to the UI, not into SVG
-#: ../src/dropper-context.cpp:310
+#: ../src/dropper-context.cpp:326
 #, c-format
 msgid " alpha %.3g"
 msgstr " Alpha %.3g"
 
 #. where the color is picked, to show in the statusbar
-#: ../src/dropper-context.cpp:312
+#: ../src/dropper-context.cpp:328
 #, c-format
 msgid ", averaged with radius %d"
 msgstr ", gemittelt mit Radius %d"
 
-#: ../src/dropper-context.cpp:312
+#: ../src/dropper-context.cpp:328
 #, c-format
 msgid " under cursor"
 msgstr " unter Zeiger"
 
 #. message, to show in the statusbar
-#: ../src/dropper-context.cpp:314
+#: ../src/dropper-context.cpp:330
 msgid "<b>Release mouse</b> to set color."
 msgstr "<b>Maustaste loslassen</b>, um die Farbe zu übernehmen."
 
-#: ../src/dropper-context.cpp:314 ../src/tools-switch.cpp:232
+#: ../src/dropper-context.cpp:330 ../src/tools-switch.cpp:232
 msgid ""
 "<b>Click</b> to set fill, <b>Shift+click</b> to set stroke; <b>drag</b> to "
 "average color in area; with <b>Alt</b> to pick inverse color; <b>Ctrl+C</b> "
@@ -5149,46 +5149,46 @@ msgstr ""
 "<b>Ziehen</b> - Durchschnittsfarbe im Gebiet. <b>Strg+C</b> - Farbe nach "
 "Zwischenablage"
 
-#: ../src/dropper-context.cpp:362
+#: ../src/dropper-context.cpp:378
 msgid "Set picked color"
 msgstr "Übernommene Farbe setzen"
 
-#: ../src/dyna-draw-context.cpp:617
+#: ../src/dyna-draw-context.cpp:591
 msgid ""
 "<b>Guide path selected</b>; start drawing along the guide with <b>Ctrl</b>"
 msgstr ""
 "<b>Führungspfad ausgewählt</b>; starte Zeichnen entlang der Führung mit "
 "<b>Strg</b>"
 
-#: ../src/dyna-draw-context.cpp:619
+#: ../src/dyna-draw-context.cpp:593
 msgid "<b>Select a guide path</b> to track with <b>Ctrl</b>"
 msgstr "<b>Führungspfad auswählen</b> mit <b>Ctrl</b>"
 
-#: ../src/dyna-draw-context.cpp:754
+#: ../src/dyna-draw-context.cpp:728
 msgid "Tracking: <b>connection to guide path lost!</b>"
 msgstr "Verfolgen: <b>Verbindung zum Führungspfad verloren!</b>"
 
-#: ../src/dyna-draw-context.cpp:754
+#: ../src/dyna-draw-context.cpp:728
 msgid "<b>Tracking</b> a guide path"
 msgstr "<b>Verfolge</b> einen Führungspfad"
 
-#: ../src/dyna-draw-context.cpp:757
+#: ../src/dyna-draw-context.cpp:731
 msgid "<b>Drawing</b> a calligraphic stroke"
 msgstr "<b>Zeichne</b> einen kalligrafischen Strich"
 
-#: ../src/dyna-draw-context.cpp:1046
+#: ../src/dyna-draw-context.cpp:1020
 msgid "Draw calligraphic stroke"
 msgstr "Kalligrafischen Strich zeichnen"
 
-#: ../src/eraser-context.cpp:533
+#: ../src/eraser-context.cpp:504
 msgid "<b>Drawing</b> an eraser stroke"
 msgstr "<b>Zeichne</b> Löschstrich"
 
-#: ../src/eraser-context.cpp:839
+#: ../src/eraser-context.cpp:810
 msgid "Draw eraser stroke"
 msgstr "Radierer-Pfad zeichnen"
 
-#: ../src/event-context.cpp:692
+#: ../src/event-context.cpp:671
 msgid "<b>Space+mouse move</b> to pan canvas"
 msgstr "<b>Leertaste+Mausziehen</b> um die Leinwand zu verschieben"
 
@@ -5394,7 +5394,7 @@ msgstr "Höhe:"
 
 #. Label
 #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:43
-#: ../src/extension/internal/filter/color.h:1043
+#: ../src/extension/internal/filter/color.h:1044
 #: ../src/extension/internal/filter/paint.h:357
 #: ../src/widgets/gradient-toolbar.cpp:1172
 #: ../src/widgets/gradient-vector.cpp:927
@@ -5451,9 +5451,9 @@ msgstr "Rauschen hinzufügen"
 
 #. _settings->add_checkbutton(false, SP_ATTR_STITCHTILES, _("Stitch Tiles"), "stitch", "noStitch");
 #: ../src/extension/internal/bitmap/addNoise.cpp:47
-#: ../src/extension/internal/filter/color.h:425
-#: ../src/extension/internal/filter/color.h:1414
-#: ../src/extension/internal/filter/color.h:1502
+#: ../src/extension/internal/filter/color.h:426
+#: ../src/extension/internal/filter/color.h:1497
+#: ../src/extension/internal/filter/color.h:1585
 #: ../src/extension/internal/filter/distort.h:69
 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:241
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2523
@@ -5590,7 +5590,7 @@ msgid "Apply charcoal stylization to selected bitmap(s)"
 msgstr "Kohlezeichnungseffekt auf Bitmap(s) anwenden"
 
 #: ../src/extension/internal/bitmap/colorize.cpp:50
-#: ../src/extension/internal/filter/color.h:316
+#: ../src/extension/internal/filter/color.h:317
 msgid "Colorize"
 msgstr "Einfärben"
 
@@ -5746,7 +5746,7 @@ msgid "Level (with Channel)"
 msgstr "Ebene (mit Kanal)"
 
 #: ../src/extension/internal/bitmap/levelChannel.cpp:54
-#: ../src/extension/internal/filter/color.h:635
+#: ../src/extension/internal/filter/color.h:636
 msgid "Channel:"
 msgstr "Kanal:"
 
@@ -5778,8 +5778,8 @@ msgid "Hue:"
 msgstr "Farbton"
 
 #: ../src/extension/internal/bitmap/modulate.cpp:43
-#: ../src/extension/internal/filter/color.h:155
-#: ../src/extension/internal/filter/color.h:256
+#: ../src/extension/internal/filter/color.h:156
+#: ../src/extension/internal/filter/color.h:257
 #: ../src/extension/internal/filter/paint.h:87
 msgid "Saturation:"
 msgstr "Sättigung"
@@ -5788,7 +5788,7 @@ msgstr "Sättigung"
 #: ../src/extension/internal/filter/bevels.h:136
 #: ../src/extension/internal/filter/bevels.h:220
 #: ../src/extension/internal/filter/blurs.h:187
-#: ../src/extension/internal/filter/color.h:73
+#: ../src/extension/internal/filter/color.h:74
 msgid "Brightness:"
 msgstr "Glanz:"
 
@@ -5908,8 +5908,8 @@ msgid "Sharpen selected bitmap(s)"
 msgstr "Schärft ausgewählte Bitmap(s)."
 
 #: ../src/extension/internal/bitmap/solarize.cpp:39
-#: ../src/extension/internal/filter/color.h:1411
-#: ../src/extension/internal/filter/color.h:1415
+#: ../src/extension/internal/filter/color.h:1494
+#: ../src/extension/internal/filter/color.h:1498
 msgid "Solarize"
 msgstr "Solarisieren"
 
@@ -6194,22 +6194,23 @@ msgstr "Hervorhebungsfarbe:"
 #: ../src/extension/internal/filter/blurs.h:350
 #: ../src/extension/internal/filter/bumps.h:141
 #: ../src/extension/internal/filter/bumps.h:364
-#: ../src/extension/internal/filter/color.h:80
-#: ../src/extension/internal/filter/color.h:169
-#: ../src/extension/internal/filter/color.h:260
-#: ../src/extension/internal/filter/color.h:345
-#: ../src/extension/internal/filter/color.h:435
-#: ../src/extension/internal/filter/color.h:530
-#: ../src/extension/internal/filter/color.h:652
-#: ../src/extension/internal/filter/color.h:749
-#: ../src/extension/internal/filter/color.h:828
-#: ../src/extension/internal/filter/color.h:919
-#: ../src/extension/internal/filter/color.h:1047
-#: ../src/extension/internal/filter/color.h:1117
-#: ../src/extension/internal/filter/color.h:1230
-#: ../src/extension/internal/filter/color.h:1345
-#: ../src/extension/internal/filter/color.h:1421
-#: ../src/extension/internal/filter/color.h:1532
+#: ../src/extension/internal/filter/color.h:81
+#: ../src/extension/internal/filter/color.h:170
+#: ../src/extension/internal/filter/color.h:261
+#: ../src/extension/internal/filter/color.h:346
+#: ../src/extension/internal/filter/color.h:436
+#: ../src/extension/internal/filter/color.h:531
+#: ../src/extension/internal/filter/color.h:653
+#: ../src/extension/internal/filter/color.h:750
+#: ../src/extension/internal/filter/color.h:829
+#: ../src/extension/internal/filter/color.h:920
+#: ../src/extension/internal/filter/color.h:1048
+#: ../src/extension/internal/filter/color.h:1118
+#: ../src/extension/internal/filter/color.h:1211
+#: ../src/extension/internal/filter/color.h:1323
+#: ../src/extension/internal/filter/color.h:1428
+#: ../src/extension/internal/filter/color.h:1504
+#: ../src/extension/internal/filter/color.h:1615
 #: ../src/extension/internal/filter/distort.h:95
 #: ../src/extension/internal/filter/distort.h:204
 #: ../src/extension/internal/filter/filter-file.cpp:150
@@ -6227,7 +6228,7 @@ msgstr "Hervorhebungsfarbe:"
 #: ../src/extension/internal/filter/paint.h:877
 #: ../src/extension/internal/filter/paint.h:981
 #: ../src/extension/internal/filter/protrusions.h:54
-#: ../src/extension/internal/filter/shadows.h:78
+#: ../src/extension/internal/filter/shadows.h:80
 #: ../src/extension/internal/filter/textures.h:90
 #: ../src/extension/internal/filter/transparency.h:69
 #: ../src/extension/internal/filter/transparency.h:140
@@ -6311,11 +6312,11 @@ msgstr "Mischen:"
 #: ../src/extension/internal/filter/bumps.h:131
 #: ../src/extension/internal/filter/bumps.h:340
 #: ../src/extension/internal/filter/bumps.h:347
-#: ../src/extension/internal/filter/color.h:328
-#: ../src/extension/internal/filter/color.h:335
-#: ../src/extension/internal/filter/color.h:1340
-#: ../src/extension/internal/filter/color.h:1513
-#: ../src/extension/internal/filter/color.h:1519
+#: ../src/extension/internal/filter/color.h:329
+#: ../src/extension/internal/filter/color.h:336
+#: ../src/extension/internal/filter/color.h:1423
+#: ../src/extension/internal/filter/color.h:1596
+#: ../src/extension/internal/filter/color.h:1602
 #: ../src/extension/internal/filter/paint.h:706
 #: ../src/extension/internal/filter/transparency.h:63
 #: ../src/filter-enums.cpp:54
@@ -6327,13 +6328,12 @@ msgstr "Verdunkeln"
 #: ../src/extension/internal/filter/bumps.h:132
 #: ../src/extension/internal/filter/bumps.h:338
 #: ../src/extension/internal/filter/bumps.h:345
-#: ../src/extension/internal/filter/color.h:326
-#: ../src/extension/internal/filter/color.h:331
-#: ../src/extension/internal/filter/color.h:646
-#: ../src/extension/internal/filter/color.h:1212
-#: ../src/extension/internal/filter/color.h:1332
-#: ../src/extension/internal/filter/color.h:1337
-#: ../src/extension/internal/filter/color.h:1511
+#: ../src/extension/internal/filter/color.h:327
+#: ../src/extension/internal/filter/color.h:332
+#: ../src/extension/internal/filter/color.h:647
+#: ../src/extension/internal/filter/color.h:1415
+#: ../src/extension/internal/filter/color.h:1420
+#: ../src/extension/internal/filter/color.h:1594
 #: ../src/extension/internal/filter/paint.h:704
 #: ../src/extension/internal/filter/transparency.h:62
 #: ../src/filter-enums.cpp:53 ../src/ui/dialog/input.cpp:374
@@ -6345,14 +6345,13 @@ msgstr "Screen"
 #: ../src/extension/internal/filter/bumps.h:133
 #: ../src/extension/internal/filter/bumps.h:341
 #: ../src/extension/internal/filter/bumps.h:348
-#: ../src/extension/internal/filter/color.h:324
-#: ../src/extension/internal/filter/color.h:332
-#: ../src/extension/internal/filter/color.h:644
-#: ../src/extension/internal/filter/color.h:1213
-#: ../src/extension/internal/filter/color.h:1331
-#: ../src/extension/internal/filter/color.h:1338
-#: ../src/extension/internal/filter/color.h:1512
-#: ../src/extension/internal/filter/color.h:1518
+#: ../src/extension/internal/filter/color.h:325
+#: ../src/extension/internal/filter/color.h:333
+#: ../src/extension/internal/filter/color.h:645
+#: ../src/extension/internal/filter/color.h:1414
+#: ../src/extension/internal/filter/color.h:1421
+#: ../src/extension/internal/filter/color.h:1595
+#: ../src/extension/internal/filter/color.h:1601
 #: ../src/extension/internal/filter/paint.h:702
 #: ../src/extension/internal/filter/transparency.h:60
 #: ../src/filter-enums.cpp:52
@@ -6364,10 +6363,10 @@ msgstr "Multiplizieren"
 #: ../src/extension/internal/filter/bumps.h:134
 #: ../src/extension/internal/filter/bumps.h:342
 #: ../src/extension/internal/filter/bumps.h:349
-#: ../src/extension/internal/filter/color.h:327
-#: ../src/extension/internal/filter/color.h:334
-#: ../src/extension/internal/filter/color.h:1339
-#: ../src/extension/internal/filter/color.h:1510
+#: ../src/extension/internal/filter/color.h:328
+#: ../src/extension/internal/filter/color.h:335
+#: ../src/extension/internal/filter/color.h:1422
+#: ../src/extension/internal/filter/color.h:1593
 #: ../src/extension/internal/filter/paint.h:705
 #: ../src/extension/internal/filter/transparency.h:64
 #: ../src/filter-enums.cpp:55
@@ -6414,14 +6413,14 @@ msgid "Erosion:"
 msgstr "Erosion:"
 
 #: ../src/extension/internal/filter/blurs.h:336
-#: ../src/extension/internal/filter/color.h:1210
+#: ../src/extension/internal/filter/color.h:1205
+#: ../src/extension/internal/filter/color.h:1317
 #: ../src/ui/dialog/document-properties.cpp:106
 msgid "Background color"
 msgstr "Hintergrundfarbe"
 
 #: ../src/extension/internal/filter/blurs.h:337
 #: ../src/extension/internal/filter/bumps.h:129
-#: ../src/extension/internal/filter/color.h:1211
 msgid "Blend type:"
 msgstr "Misch-Typ:"
 
@@ -6429,14 +6428,13 @@ msgstr "Misch-Typ:"
 #: ../src/extension/internal/filter/bumps.h:130
 #: ../src/extension/internal/filter/bumps.h:339
 #: ../src/extension/internal/filter/bumps.h:346
-#: ../src/extension/internal/filter/color.h:325
-#: ../src/extension/internal/filter/color.h:333
-#: ../src/extension/internal/filter/color.h:645
-#: ../src/extension/internal/filter/color.h:1214
-#: ../src/extension/internal/filter/color.h:1330
-#: ../src/extension/internal/filter/color.h:1336
-#: ../src/extension/internal/filter/color.h:1503
-#: ../src/extension/internal/filter/color.h:1517
+#: ../src/extension/internal/filter/color.h:326
+#: ../src/extension/internal/filter/color.h:334
+#: ../src/extension/internal/filter/color.h:646
+#: ../src/extension/internal/filter/color.h:1413
+#: ../src/extension/internal/filter/color.h:1419
+#: ../src/extension/internal/filter/color.h:1586
+#: ../src/extension/internal/filter/color.h:1600
 #: ../src/extension/internal/filter/distort.h:78
 #: ../src/extension/internal/filter/paint.h:703
 #: ../src/extension/internal/filter/textures.h:77
@@ -6479,24 +6477,24 @@ msgstr "Stoß-Quelle"
 
 #: ../src/extension/internal/filter/bumps.h:88
 #: ../src/extension/internal/filter/bumps.h:320
-#: ../src/extension/internal/filter/color.h:156
-#: ../src/extension/internal/filter/color.h:820
+#: ../src/extension/internal/filter/color.h:157
+#: ../src/extension/internal/filter/color.h:821
 #: ../src/extension/internal/filter/transparency.h:132
 msgid "Red:"
 msgstr "Rot:"
 
 #: ../src/extension/internal/filter/bumps.h:89
 #: ../src/extension/internal/filter/bumps.h:321
-#: ../src/extension/internal/filter/color.h:157
-#: ../src/extension/internal/filter/color.h:821
+#: ../src/extension/internal/filter/color.h:158
+#: ../src/extension/internal/filter/color.h:822
 #: ../src/extension/internal/filter/transparency.h:133
 msgid "Green:"
 msgstr "Grün:"
 
 #: ../src/extension/internal/filter/bumps.h:90
 #: ../src/extension/internal/filter/bumps.h:322
-#: ../src/extension/internal/filter/color.h:158
-#: ../src/extension/internal/filter/color.h:822
+#: ../src/extension/internal/filter/color.h:159
+#: ../src/extension/internal/filter/color.h:823
 #: ../src/extension/internal/filter/transparency.h:134
 msgid "Blue:"
 msgstr "Blau:"
@@ -6519,9 +6517,9 @@ msgstr "Diffuses Licht"
 
 #: ../src/extension/internal/filter/bumps.h:99
 #: ../src/extension/internal/filter/bumps.h:333
-#: ../src/extension/internal/filter/color.h:75
-#: ../src/extension/internal/filter/color.h:823
-#: ../src/extension/internal/filter/color.h:1112
+#: ../src/extension/internal/filter/color.h:76
+#: ../src/extension/internal/filter/color.h:824
+#: ../src/extension/internal/filter/color.h:1113
 #: ../src/extension/internal/filter/paint.h:86
 #: ../src/extension/internal/filter/paint.h:593
 #: ../src/extension/internal/filter/paint.h:708
@@ -6623,7 +6621,6 @@ msgid "Background:"
 msgstr "_Hintergrund:"
 
 #: ../src/extension/internal/filter/bumps.h:325
-#: ../src/extension/internal/filter/color.h:1218
 #: ../src/extension/internal/filter/transparency.h:57
 #: ../src/filter-enums.cpp:29 ../src/selection-describer.cpp:55
 msgid "Image"
@@ -6638,7 +6635,7 @@ msgid "Background opacity:"
 msgstr "Hintergrund-Deckkraft:"
 
 #: ../src/extension/internal/filter/bumps.h:330
-#: ../src/extension/internal/filter/color.h:1039
+#: ../src/extension/internal/filter/color.h:1040
 msgid "Lighting"
 msgstr "Blitz"
 
@@ -6669,7 +6666,6 @@ msgid "Atop"
 msgstr "Obenauf"
 
 #: ../src/extension/internal/filter/bumps.h:357
-#: ../src/extension/internal/filter/color.h:1223
 #: ../src/extension/internal/filter/distort.h:70
 #: ../src/extension/internal/filter/morphology.h:174
 #: ../src/filter-enums.cpp:72
@@ -6680,17 +6676,17 @@ msgstr "In"
 msgid "Turns an image to jelly"
 msgstr "Verändert ein Bild zu Gelee"
 
-#: ../src/extension/internal/filter/color.h:71
+#: ../src/extension/internal/filter/color.h:72
 msgid "Brilliance"
 msgstr "Brillianz"
 
-#: ../src/extension/internal/filter/color.h:74
-#: ../src/extension/internal/filter/color.h:1334
+#: ../src/extension/internal/filter/color.h:75
+#: ../src/extension/internal/filter/color.h:1417
 msgid "Over-saturation:"
 msgstr "Übersättigung"
 
-#: ../src/extension/internal/filter/color.h:76
-#: ../src/extension/internal/filter/color.h:160
+#: ../src/extension/internal/filter/color.h:77
+#: ../src/extension/internal/filter/color.h:161
 #: ../src/extension/internal/filter/overlays.h:70
 #: ../src/extension/internal/filter/paint.h:85
 #: ../src/extension/internal/filter/paint.h:503
@@ -6699,158 +6695,158 @@ msgstr "Übersättigung"
 msgid "Inverted"
 msgstr "Invertiet"
 
-#: ../src/extension/internal/filter/color.h:84
+#: ../src/extension/internal/filter/color.h:85
 msgid "Brightness filter"
 msgstr "Helligkeitsfilter"
 
-#: ../src/extension/internal/filter/color.h:151
+#: ../src/extension/internal/filter/color.h:152
 msgid "Channel Painting"
 msgstr "Kanalfarbe"
 
-#: ../src/extension/internal/filter/color.h:159
+#: ../src/extension/internal/filter/color.h:160
 #: ../src/extension/internal/filter/transparency.h:135
 msgid "Alpha:"
 msgstr "Alpha:"
 
-#: ../src/extension/internal/filter/color.h:173
+#: ../src/extension/internal/filter/color.h:174
 msgid "Replace RGB by any color"
 msgstr "RGB durch eine Farbe ersetzen"
 
-#: ../src/extension/internal/filter/color.h:253
+#: ../src/extension/internal/filter/color.h:254
 msgid "Color Shift"
 msgstr "Farbverschiebung"
 
-#: ../src/extension/internal/filter/color.h:255
+#: ../src/extension/internal/filter/color.h:256
 msgid "Shift (°):"
 msgstr "Verschiebung (°):"
 
-#: ../src/extension/internal/filter/color.h:264
+#: ../src/extension/internal/filter/color.h:265
 msgid "Rotate and desaturate hue"
 msgstr "Farbton rotieren nud entsättigen"
 
-#: ../src/extension/internal/filter/color.h:320
+#: ../src/extension/internal/filter/color.h:321
 msgid "Harsh light:"
 msgstr "Grelles Licht"
 
-#: ../src/extension/internal/filter/color.h:321
+#: ../src/extension/internal/filter/color.h:322
 msgid "Normal light:"
 msgstr "Normales Licht:"
 
-#: ../src/extension/internal/filter/color.h:322
+#: ../src/extension/internal/filter/color.h:323
 msgid "Duotone"
 msgstr "Zweifarbigkeit"
 
-#: ../src/extension/internal/filter/color.h:323
-#: ../src/extension/internal/filter/color.h:1329
+#: ../src/extension/internal/filter/color.h:324
+#: ../src/extension/internal/filter/color.h:1412
 msgid "Blend 1:"
 msgstr "Mischen 1:"
 
-#: ../src/extension/internal/filter/color.h:330
-#: ../src/extension/internal/filter/color.h:1335
+#: ../src/extension/internal/filter/color.h:331
+#: ../src/extension/internal/filter/color.h:1418
 msgid "Blend 2:"
 msgstr "Mischen 2:"
 
-#: ../src/extension/internal/filter/color.h:349
+#: ../src/extension/internal/filter/color.h:350
 msgid "Blend image or object with a flood color"
 msgstr "Mischt Bild oder Objekt mit einer fließenden Farbe"
 
-#: ../src/extension/internal/filter/color.h:423 ../src/filter-enums.cpp:22
+#: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22
 msgid "Component Transfer"
 msgstr "Komponenten-Übertragung"
 
-#: ../src/extension/internal/filter/color.h:426 ../src/filter-enums.cpp:82
+#: ../src/extension/internal/filter/color.h:427 ../src/filter-enums.cpp:82
 msgid "Identity"
 msgstr "Identität"
 
-#: ../src/extension/internal/filter/color.h:427
+#: ../src/extension/internal/filter/color.h:428
 #: ../src/extension/internal/filter/paint.h:499 ../src/filter-enums.cpp:83
 msgid "Table"
 msgstr "Tabelle"
 
-#: ../src/extension/internal/filter/color.h:428
+#: ../src/extension/internal/filter/color.h:429
 #: ../src/extension/internal/filter/paint.h:500 ../src/filter-enums.cpp:84
 msgid "Discrete"
 msgstr "Getrennt"
 
-#: ../src/extension/internal/filter/color.h:429 ../src/filter-enums.cpp:85
+#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:85
 #: ../src/live_effects/lpe-powerstroke.cpp:188
 msgid "Linear"
 msgstr "Linie"
 
-#: ../src/extension/internal/filter/color.h:430 ../src/filter-enums.cpp:86
+#: ../src/extension/internal/filter/color.h:431 ../src/filter-enums.cpp:86
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/extension/internal/filter/color.h:439
+#: ../src/extension/internal/filter/color.h:440
 msgid "Basic component transfer structure"
 msgstr "Basis-Komponente Transferstruktur"
 
-#: ../src/extension/internal/filter/color.h:508
+#: ../src/extension/internal/filter/color.h:509
 msgid "Duochrome"
 msgstr "Duochrom"
 
-#: ../src/extension/internal/filter/color.h:512
+#: ../src/extension/internal/filter/color.h:513
 msgid "Fluorescence level:"
 msgstr "Fluoreszenz-Level"
 
-#: ../src/extension/internal/filter/color.h:513
+#: ../src/extension/internal/filter/color.h:514
 msgid "Swap:"
 msgstr "Tausch:"
 
-#: ../src/extension/internal/filter/color.h:514
+#: ../src/extension/internal/filter/color.h:515
 msgid "No swap"
 msgstr "Kein Tausch"
 
-#: ../src/extension/internal/filter/color.h:515
+#: ../src/extension/internal/filter/color.h:516
 msgid "Color and alpha"
 msgstr "Farbe und Alpha"
 
-#: ../src/extension/internal/filter/color.h:516
+#: ../src/extension/internal/filter/color.h:517
 msgid "Color only"
 msgstr "nur Farbe"
 
-#: ../src/extension/internal/filter/color.h:517
+#: ../src/extension/internal/filter/color.h:518
 msgid "Alpha only"
 msgstr "nur Alpha"
 
-#: ../src/extension/internal/filter/color.h:521
+#: ../src/extension/internal/filter/color.h:522
 msgid "Color 1"
 msgstr "Farbe 1"
 
-#: ../src/extension/internal/filter/color.h:524
+#: ../src/extension/internal/filter/color.h:525
 msgid "Color 2"
 msgstr "Farbe 2"
 
-#: ../src/extension/internal/filter/color.h:534
+#: ../src/extension/internal/filter/color.h:535
 msgid "Convert luminance values to a duochrome palette"
 msgstr "Konvertiert Luminanzwerte in eine duochrome Palette"
 
-#: ../src/extension/internal/filter/color.h:633
+#: ../src/extension/internal/filter/color.h:634
 msgid "Extract Channel"
 msgstr "Kanal extrahieren"
 
-#: ../src/extension/internal/filter/color.h:636 ../src/filter-enums.cpp:100
-#: ../src/flood-context.cpp:252 ../src/widgets/sp-color-icc-selector.cpp:227
+#: ../src/extension/internal/filter/color.h:637 ../src/filter-enums.cpp:100
+#: ../src/flood-context.cpp:228 ../src/widgets/sp-color-icc-selector.cpp:227
 #: ../src/widgets/sp-color-scales.cpp:429
 #: ../src/widgets/sp-color-scales.cpp:430
 msgid "Red"
 msgstr "Rot"
 
-#: ../src/extension/internal/filter/color.h:637 ../src/filter-enums.cpp:101
-#: ../src/flood-context.cpp:253 ../src/widgets/sp-color-icc-selector.cpp:227
+#: ../src/extension/internal/filter/color.h:638 ../src/filter-enums.cpp:101
+#: ../src/flood-context.cpp:229 ../src/widgets/sp-color-icc-selector.cpp:227
 #: ../src/widgets/sp-color-scales.cpp:432
 #: ../src/widgets/sp-color-scales.cpp:433
 msgid "Green"
 msgstr "Grün"
 
-#: ../src/extension/internal/filter/color.h:638 ../src/filter-enums.cpp:102
-#: ../src/flood-context.cpp:254 ../src/widgets/sp-color-icc-selector.cpp:227
+#: ../src/extension/internal/filter/color.h:639 ../src/filter-enums.cpp:102
+#: ../src/flood-context.cpp:230 ../src/widgets/sp-color-icc-selector.cpp:227
 #: ../src/widgets/sp-color-scales.cpp:435
 #: ../src/widgets/sp-color-scales.cpp:436
 msgid "Blue"
 msgstr "Blau"
 
-#: ../src/extension/internal/filter/color.h:639
+#: ../src/extension/internal/filter/color.h:640
 #: ../src/widgets/sp-color-icc-selector.cpp:231
 #: ../src/widgets/sp-color-icc-selector.cpp:232
 #: ../src/widgets/sp-color-scales.cpp:483
@@ -6858,7 +6854,7 @@ msgstr "Blau"
 msgid "Cyan"
 msgstr "Zyan"
 
-#: ../src/extension/internal/filter/color.h:640
+#: ../src/extension/internal/filter/color.h:641
 #: ../src/widgets/sp-color-icc-selector.cpp:231
 #: ../src/widgets/sp-color-icc-selector.cpp:232
 #: ../src/widgets/sp-color-scales.cpp:486
@@ -6866,7 +6862,7 @@ msgstr "Zyan"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../src/extension/internal/filter/color.h:641
+#: ../src/extension/internal/filter/color.h:642
 #: ../src/widgets/sp-color-icc-selector.cpp:231
 #: ../src/widgets/sp-color-icc-selector.cpp:232
 #: ../src/widgets/sp-color-scales.cpp:489
@@ -6874,34 +6870,34 @@ msgstr "Magenta"
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ../src/extension/internal/filter/color.h:643
+#: ../src/extension/internal/filter/color.h:644
 msgid "Background blend mode:"
 msgstr "Hintergrund-Mischmodus:"
 
-#: ../src/extension/internal/filter/color.h:648
+#: ../src/extension/internal/filter/color.h:649
 msgid "Channel to alpha"
 msgstr "Kanal zu Alpha"
 
-#: ../src/extension/internal/filter/color.h:656
+#: ../src/extension/internal/filter/color.h:657
 msgid "Extract color channel as a transparent image"
 msgstr "Extrahiere Farbkanal als ein transparentes Bild"
 
-#: ../src/extension/internal/filter/color.h:739
+#: ../src/extension/internal/filter/color.h:740
 msgid "Fade to Black or White"
 msgstr "Zu Schwarz oder Weiß ausblenden"
 
-#: ../src/extension/internal/filter/color.h:741
+#: ../src/extension/internal/filter/color.h:742
 #: ../src/extension/internal/filter/image.h:56
 #: ../src/extension/internal/filter/morphology.h:66
 #: ../src/extension/internal/filter/paint.h:346
 msgid "Level:"
 msgstr "Ebene:"
 
-#: ../src/extension/internal/filter/color.h:742
+#: ../src/extension/internal/filter/color.h:743
 msgid "Fade to:"
 msgstr "Ausblenden zu:"
 
-#: ../src/extension/internal/filter/color.h:743
+#: ../src/extension/internal/filter/color.h:744
 #: ../src/ui/widget/selected-style.cpp:246
 #: ../src/widgets/sp-color-icc-selector.cpp:231
 #: ../src/widgets/sp-color-scales.cpp:492
@@ -6909,230 +6905,240 @@ msgstr "Ausblenden zu:"
 msgid "Black"
 msgstr "Schwarz"
 
-#: ../src/extension/internal/filter/color.h:744
+#: ../src/extension/internal/filter/color.h:745
 #: ../src/ui/widget/selected-style.cpp:242
 msgid "White"
 msgstr "Weiß"
 
-#: ../src/extension/internal/filter/color.h:753
+#: ../src/extension/internal/filter/color.h:754
 msgid "Fade to black or white"
 msgstr "Ausblenden zu Schwarz oder Weiß"
 
-#: ../src/extension/internal/filter/color.h:818
+#: ../src/extension/internal/filter/color.h:819
 msgid "Greyscale"
 msgstr "Graustufen"
 
-#: ../src/extension/internal/filter/color.h:824
+#: ../src/extension/internal/filter/color.h:825
 #: ../src/extension/internal/filter/paint.h:83
 #: ../src/extension/internal/filter/paint.h:240
 msgid "Transparent"
 msgstr "Transparent"
 
-#: ../src/extension/internal/filter/color.h:832
+#: ../src/extension/internal/filter/color.h:833
 msgid "Customize greyscale components"
 msgstr "Anpassen der Graustufen-Komponenten"
 
-#: ../src/extension/internal/filter/color.h:904
+#: ../src/extension/internal/filter/color.h:905
 #: ../src/ui/widget/selected-style.cpp:238
 msgid "Invert"
 msgstr "Invertieren"
 
-#: ../src/extension/internal/filter/color.h:906
+#: ../src/extension/internal/filter/color.h:907
 msgid "Invert channels:"
 msgstr "Kanäle invertieren:"
 
-#: ../src/extension/internal/filter/color.h:907
+#: ../src/extension/internal/filter/color.h:908
 msgid "No inversion"
 msgstr "Keine Umkehrung"
 
-#: ../src/extension/internal/filter/color.h:908
+#: ../src/extension/internal/filter/color.h:909
 msgid "Red and blue"
 msgstr "Rot und Blau"
 
-#: ../src/extension/internal/filter/color.h:909
+#: ../src/extension/internal/filter/color.h:910
 msgid "Red and green"
 msgstr "Rot und Grün"
 
-#: ../src/extension/internal/filter/color.h:910
+#: ../src/extension/internal/filter/color.h:911
 msgid "Green and blue"
 msgstr "Grün und Blau"
 
-#: ../src/extension/internal/filter/color.h:912
+#: ../src/extension/internal/filter/color.h:913
 msgid "Light transparency:"
 msgstr "Lichttransparenz:"
 
-#: ../src/extension/internal/filter/color.h:913
+#: ../src/extension/internal/filter/color.h:914
 msgid "Invert hue"
 msgstr "Farbton invertieren"
 
-#: ../src/extension/internal/filter/color.h:914
+#: ../src/extension/internal/filter/color.h:915
 msgid "Invert lightness"
 msgstr "Helligkeit invertieren"
 
-#: ../src/extension/internal/filter/color.h:915
+#: ../src/extension/internal/filter/color.h:916
 msgid "Invert transparency"
 msgstr "Transparenz invertieren"
 
-#: ../src/extension/internal/filter/color.h:923
+#: ../src/extension/internal/filter/color.h:924
 msgid "Manage hue, lightness and transparency inversions"
 msgstr "Verwalten Farbton, Helligkeit und Transparenz-Umkehrungen"
 
-#: ../src/extension/internal/filter/color.h:1041
+#: ../src/extension/internal/filter/color.h:1042
 msgid "Lights:"
 msgstr "Lichter:"
 
-#: ../src/extension/internal/filter/color.h:1042
+#: ../src/extension/internal/filter/color.h:1043
 msgid "Shadows:"
 msgstr "Schatten:"
 
-#: ../src/extension/internal/filter/color.h:1051
+#: ../src/extension/internal/filter/color.h:1052
 msgid "Modify lights and shadows separately"
 msgstr "Licht und Schatten einzeln verändern"
 
-#: ../src/extension/internal/filter/color.h:1110
+#: ../src/extension/internal/filter/color.h:1111
 msgid "Lightness-Contrast"
 msgstr "Helligkeit - Kontrast"
 
-#: ../src/extension/internal/filter/color.h:1113
+#: ../src/extension/internal/filter/color.h:1114
 msgid "Contrast:"
 msgstr "Kontrast:"
 
-#: ../src/extension/internal/filter/color.h:1121
+#: ../src/extension/internal/filter/color.h:1122
 msgid "Modify lightness and contrast separately"
 msgstr "Helligkeit und Kontrast einzeln anpassen"
 
-#: ../src/extension/internal/filter/color.h:1195
+#: ../src/extension/internal/filter/color.h:1190
 msgid "Nudge RGB"
 msgstr "Präzisionsausrichtung RGB"
 
-#: ../src/extension/internal/filter/color.h:1199
+#: ../src/extension/internal/filter/color.h:1194
 msgid "Red offset"
 msgstr "Rot-Versatz:"
 
-#: ../src/extension/internal/filter/color.h:1200
-#: ../src/extension/internal/filter/color.h:1203
-#: ../src/extension/internal/filter/color.h:1206
+#: ../src/extension/internal/filter/color.h:1195
+#: ../src/extension/internal/filter/color.h:1198
+#: ../src/extension/internal/filter/color.h:1201
+#: ../src/extension/internal/filter/color.h:1307
+#: ../src/extension/internal/filter/color.h:1310
+#: ../src/extension/internal/filter/color.h:1313
 #: ../src/ui/dialog/object-attributes.cpp:65
 #: ../src/ui/dialog/object-attributes.cpp:73 ../src/ui/dialog/tile.cpp:615
-#: ../src/widgets/desktop-widget.cpp:648 ../src/widgets/node-toolbar.cpp:591
+#: ../src/widgets/desktop-widget.cpp:667 ../src/widgets/node-toolbar.cpp:591
 msgid "X:"
 msgstr "X:"
 
-#: ../src/extension/internal/filter/color.h:1201
-#: ../src/extension/internal/filter/color.h:1204
-#: ../src/extension/internal/filter/color.h:1207
+#: ../src/extension/internal/filter/color.h:1196
+#: ../src/extension/internal/filter/color.h:1199
+#: ../src/extension/internal/filter/color.h:1202
+#: ../src/extension/internal/filter/color.h:1308
+#: ../src/extension/internal/filter/color.h:1311
+#: ../src/extension/internal/filter/color.h:1314
 #: ../src/ui/dialog/object-attributes.cpp:66
 #: ../src/ui/dialog/object-attributes.cpp:74 ../src/ui/dialog/tile.cpp:616
-#: ../src/widgets/desktop-widget.cpp:658 ../src/widgets/node-toolbar.cpp:609
+#: ../src/widgets/desktop-widget.cpp:677 ../src/widgets/node-toolbar.cpp:609
 msgid "Y:"
 msgstr "Y:"
 
-#: ../src/extension/internal/filter/color.h:1202
+#: ../src/extension/internal/filter/color.h:1197
 msgid "Green offset"
 msgstr "Grün-Versatz:"
 
-#: ../src/extension/internal/filter/color.h:1205
+#: ../src/extension/internal/filter/color.h:1200
 msgid "Blue offset"
 msgstr "Blau-Versatz:"
 
-#: ../src/extension/internal/filter/color.h:1216
-msgid "Blend source:"
-msgstr "Mischquelle:"
+#: ../src/extension/internal/filter/color.h:1215
+msgid ""
+"Nudge RGB channels separately and blend them to different types of "
+"backgrounds"
+msgstr ""
+"Präzisionsausrichtung nach RGB-Kanälen getrennt und mischt sie zu "
+"verschiedenen Typen von Hintergründen"
 
-#: ../src/extension/internal/filter/color.h:1219
-#: ../src/extension/internal/filter/transparency.h:56
-#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600
-msgid "Background"
-msgstr "Hintergrund"
+#: ../src/extension/internal/filter/color.h:1302
+msgid "Nudge CMY"
+msgstr "Präzisionsausrichtung RGB"
 
-#: ../src/extension/internal/filter/color.h:1221
-msgid "Composite:"
-msgstr "Zusammengesetzt:"
+#: ../src/extension/internal/filter/color.h:1306
+msgid "Cyan offset"
+msgstr "Blau-Versatz"
 
-#: ../src/extension/internal/filter/color.h:1222
-#: ../src/extension/internal/filter/morphology.h:173
-#: ../src/filter-enums.cpp:71
-msgid "Over"
-msgstr "Über"
+#: ../src/extension/internal/filter/color.h:1309
+msgid "Magenta offset"
+msgstr "Rot-Versatz"
 
-#: ../src/extension/internal/filter/color.h:1234
+#: ../src/extension/internal/filter/color.h:1312
+msgid "Yellow offset"
+msgstr "Gelb-Versatz"
+
+#: ../src/extension/internal/filter/color.h:1327
 msgid ""
-"Nudge RGB channels separately and blend them to different types of "
+"Nudge CMY channels separately and blend them to different types of "
 "backgrounds"
 msgstr ""
 "Präzisionsausrichtung nach RGB-Kanälen getrennt und mischt sie zu "
 "verschiedenen Typen von Hintergründen"
 
-#: ../src/extension/internal/filter/color.h:1325
+#: ../src/extension/internal/filter/color.h:1408
 msgid "Quadritone fantasy"
 msgstr "Vierfarben-Fantasie"
 
-#: ../src/extension/internal/filter/color.h:1327
-#: ../src/extension/internal/filter/color.h:1525
+#: ../src/extension/internal/filter/color.h:1410
+#: ../src/extension/internal/filter/color.h:1608
 msgid "Hue distribution (°):"
 msgstr "Farbton Verteilung (°):"
 
-#: ../src/extension/internal/filter/color.h:1328
+#: ../src/extension/internal/filter/color.h:1411
 msgid "Colors:"
 msgstr "Farben:"
 
-#: ../src/extension/internal/filter/color.h:1349
+#: ../src/extension/internal/filter/color.h:1432
 msgid "Replace hue by two colors"
 msgstr "Farbwert durch zwei Farben ersetzen"
 
-#: ../src/extension/internal/filter/color.h:1413
+#: ../src/extension/internal/filter/color.h:1496
 msgid "Hue rotation (°):"
 msgstr "Farbton Rotation (°):"
 
-#: ../src/extension/internal/filter/color.h:1416
+#: ../src/extension/internal/filter/color.h:1499
 msgid "Moonarize"
 msgstr "Lunarisieren"
 
-#: ../src/extension/internal/filter/color.h:1425
+#: ../src/extension/internal/filter/color.h:1508
 msgid "Classic photographic solarization effect"
 msgstr "Klassischer fotografischer Solarisationseffekt"
 
-#: ../src/extension/internal/filter/color.h:1498
+#: ../src/extension/internal/filter/color.h:1581
 msgid "Tritone"
 msgstr "Drei-Farben-Palette"
 
-#: ../src/extension/internal/filter/color.h:1504
+#: ../src/extension/internal/filter/color.h:1587
 msgid "Enhance hue"
 msgstr "Farbton verbessern"
 
-#: ../src/extension/internal/filter/color.h:1505
+#: ../src/extension/internal/filter/color.h:1588
 msgid "Phosphorescence"
 msgstr "Phosphorisierend"
 
-#: ../src/extension/internal/filter/color.h:1506
+#: ../src/extension/internal/filter/color.h:1589
 msgid "Colored nights"
 msgstr "Farbige Nächte"
 
-#: ../src/extension/internal/filter/color.h:1507
+#: ../src/extension/internal/filter/color.h:1590
 msgid "Hue to background"
 msgstr "Farbton zu Hintergrund"
 
-#: ../src/extension/internal/filter/color.h:1509
+#: ../src/extension/internal/filter/color.h:1592
 msgid "Global blend:"
 msgstr "Globales Mischen:"
 
-#: ../src/extension/internal/filter/color.h:1515
+#: ../src/extension/internal/filter/color.h:1598
 msgid "Glow:"
 msgstr "Glühen:"
 
-#: ../src/extension/internal/filter/color.h:1516
+#: ../src/extension/internal/filter/color.h:1599
 msgid "Glow blend:"
 msgstr "Glühend "
 
-#: ../src/extension/internal/filter/color.h:1521
+#: ../src/extension/internal/filter/color.h:1604
 msgid "Local light:"
 msgstr "Lokales Licht:"
 
-#: ../src/extension/internal/filter/color.h:1522
+#: ../src/extension/internal/filter/color.h:1605
 msgid "Global light:"
 msgstr "Globales Licht:"
 
-#: ../src/extension/internal/filter/color.h:1536
+#: ../src/extension/internal/filter/color.h:1619
 msgid ""
 "Create a custom tritone palette with additional glow, blend modes and hue "
 "moving"
@@ -7293,12 +7299,12 @@ msgid "Cross-smooth"
 msgstr "Weiche Überschneidung"
 
 #: ../src/extension/internal/filter/morphology.h:61
-#: ../src/extension/internal/filter/shadows.h:65
+#: ../src/extension/internal/filter/shadows.h:66
 msgid "Inner"
 msgstr "Innerer"
 
 #: ../src/extension/internal/filter/morphology.h:62
-#: ../src/extension/internal/filter/shadows.h:64
+#: ../src/extension/internal/filter/shadows.h:65
 msgid "Outer"
 msgstr "Äußerer"
 
@@ -7335,6 +7341,11 @@ msgstr "Bild ausblenden"
 msgid "Composite type:"
 msgstr "Gemischter Typ"
 
+#: ../src/extension/internal/filter/morphology.h:173
+#: ../src/filter-enums.cpp:71
+msgid "Over"
+msgstr "Über"
+
 #: ../src/extension/internal/filter/morphology.h:177
 #: ../src/filter-enums.cpp:75
 msgid "XOR"
@@ -7403,7 +7414,7 @@ msgstr "Rauschen"
 
 #: ../src/extension/internal/filter/overlays.h:59
 #: ../src/extension/internal/filter/paint.h:691
-#: ../src/extension/internal/filter/shadows.h:59 ../src/ui/dialog/find.cpp:83
+#: ../src/extension/internal/filter/shadows.h:60 ../src/ui/dialog/find.cpp:83
 #: ../src/ui/dialog/tracedialog.cpp:746
 #: ../share/extensions/color_custom.inx.h:2
 #: ../share/extensions/color_HSL_adjust.inx.h:2
@@ -7507,7 +7518,7 @@ msgstr "Konvertiere Bild in eine Gravur aus vertikalen und horizontalen Linien"
 # not sure here -cm-
 #: ../src/extension/internal/filter/paint.h:332
 #: ../src/ui/dialog/align-and-distribute.cpp:1048
-#: ../src/widgets/desktop-widget.cpp:1897
+#: ../src/widgets/desktop-widget.cpp:1916
 msgid "Drawing"
 msgstr "Zeichnung"
 
@@ -7697,43 +7708,47 @@ msgstr "Schneegröße"
 msgid "Snow has fallen on object"
 msgstr "Schnee liegt auf dem Objekt"
 
-#: ../src/extension/internal/filter/shadows.h:56
+#: ../src/extension/internal/filter/shadows.h:57
 msgid "Drop Shadow"
 msgstr "Abgesetzter Schatten"
 
-#: ../src/extension/internal/filter/shadows.h:60
+#: ../src/extension/internal/filter/shadows.h:61
 msgid "Blur radius (px):"
 msgstr "Unschärfen Radius"
 
-#: ../src/extension/internal/filter/shadows.h:61
+#: ../src/extension/internal/filter/shadows.h:62
 msgid "Horizontal offset (px):"
 msgstr "Horizontaler Versatz (px):"
 
-#: ../src/extension/internal/filter/shadows.h:62
+#: ../src/extension/internal/filter/shadows.h:63
 msgid "Vertical offset (px):"
 msgstr "Vertikaler Versatz (px):"
 
-#: ../src/extension/internal/filter/shadows.h:63
-msgid "Blur type:"
-msgstr "Unschärfe-Typ:"
+#: ../src/extension/internal/filter/shadows.h:64
+msgid "Shadow type:"
+msgstr "Schatten-Typ:"
 
-#: ../src/extension/internal/filter/shadows.h:66
+#: ../src/extension/internal/filter/shadows.h:67
 msgid "Outer cutout"
 msgstr "Äußerer Ausschnitt"
 
-#: ../src/extension/internal/filter/shadows.h:67
+#: ../src/extension/internal/filter/shadows.h:68
 msgid "Inner cutout"
 msgstr "Innere Außenlinie"
 
-#: ../src/extension/internal/filter/shadows.h:70
+#: ../src/extension/internal/filter/shadows.h:69
+msgid "Shadow only"
+msgstr "nur Schatten"
+
+#: ../src/extension/internal/filter/shadows.h:72
 msgid "Blur color"
 msgstr "Farbe verwischen"
 
-#: ../src/extension/internal/filter/shadows.h:72
+#: ../src/extension/internal/filter/shadows.h:74
 msgid "Use object's color"
 msgstr "Benutze Farben des Objektes"
 
-#: ../src/extension/internal/filter/shadows.h:82
+#: ../src/extension/internal/filter/shadows.h:84
 msgid "Colorizable Drop shadow"
 msgstr "Färbbarer Schlagschatten"
 
@@ -7799,11 +7814,17 @@ msgstr "Mischen"
 msgid "Source:"
 msgstr "Quelle:"
 
+#: ../src/extension/internal/filter/transparency.h:56
+#: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1600
+msgid "Background"
+msgstr "Hintergrund"
+
 #: ../src/extension/internal/filter/transparency.h:59
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2520
-#: ../src/widgets/erasor-toolbar.cpp:129 ../src/widgets/pencil-toolbar.cpp:162
-#: ../src/widgets/spray-toolbar.cpp:203 ../src/widgets/tweak-toolbar.cpp:273
-#: ../share/extensions/extrude.inx.h:2 ../share/extensions/triangle.inx.h:8
+#: ../src/ui/dialog/input.cpp:1002 ../src/widgets/erasor-toolbar.cpp:129
+#: ../src/widgets/pencil-toolbar.cpp:162 ../src/widgets/spray-toolbar.cpp:203
+#: ../src/widgets/tweak-toolbar.cpp:273 ../share/extensions/extrude.inx.h:2
+#: ../share/extensions/triangle.inx.h:8
 msgid "Mode:"
 msgstr "Modus:"
 
@@ -7949,7 +7970,7 @@ msgstr "Rendern"
 #: ../src/extension/internal/grid.cpp:212
 #: ../src/ui/dialog/document-properties.cpp:146
 #: ../src/ui/dialog/inkscape-preferences.cpp:749
-#: ../src/widgets/toolbox.cpp:1871
+#: ../src/widgets/toolbox.cpp:1822
 msgid "Grids"
 msgstr "Gitter"
 
@@ -8481,7 +8502,7 @@ msgstr "Umbrechen"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:258
+#: ../src/filter-enums.cpp:103 ../src/flood-context.cpp:234
 msgid "Alpha"
 msgstr "Alpha"
 
@@ -8509,11 +8530,11 @@ msgstr "Punktförmige Lichtquelle"
 msgid "Spot Light"
 msgstr "Spotlight"
 
-#: ../src/flood-context.cpp:251
+#: ../src/flood-context.cpp:227
 msgid "Visible Colors"
 msgstr "Sichtbare Farben"
 
-#: ../src/flood-context.cpp:255 ../src/widgets/sp-color-icc-selector.cpp:229
+#: ../src/flood-context.cpp:231 ../src/widgets/sp-color-icc-selector.cpp:229
 #: ../src/widgets/sp-color-icc-selector.cpp:230
 #: ../src/widgets/sp-color-scales.cpp:455
 #: ../src/widgets/sp-color-scales.cpp:456 ../src/widgets/tweak-toolbar.cpp:305
@@ -8521,7 +8542,7 @@ msgstr "Sichtbare Farben"
 msgid "Hue"
 msgstr "Farbton"
 
-#: ../src/flood-context.cpp:256 ../src/ui/dialog/inkscape-preferences.cpp:903
+#: ../src/flood-context.cpp:232 ../src/ui/dialog/inkscape-preferences.cpp:903
 #: ../src/widgets/sp-color-icc-selector.cpp:229
 #: ../src/widgets/sp-color-icc-selector.cpp:230
 #: ../src/widgets/sp-color-scales.cpp:458
@@ -8530,7 +8551,7 @@ msgstr "Farbton"
 msgid "Saturation"
 msgstr "Sättigung"
 
-#: ../src/flood-context.cpp:257 ../src/widgets/sp-color-icc-selector.cpp:230
+#: ../src/flood-context.cpp:233 ../src/widgets/sp-color-icc-selector.cpp:230
 #: ../src/widgets/sp-color-scales.cpp:461
 #: ../src/widgets/sp-color-scales.cpp:462 ../src/widgets/tweak-toolbar.cpp:337
 #: ../share/extensions/color_randomize.inx.h:5
@@ -8538,31 +8559,31 @@ msgid "Lightness"
 msgstr "Helligkeit"
 
 # CHECK
-#: ../src/flood-context.cpp:269
+#: ../src/flood-context.cpp:245
 msgctxt "Flood autogap"
 msgid "None"
 msgstr "Keine"
 
-#: ../src/flood-context.cpp:270
+#: ../src/flood-context.cpp:246
 msgctxt "Flood autogap"
 msgid "Small"
 msgstr "Klein"
 
-#: ../src/flood-context.cpp:271
+#: ../src/flood-context.cpp:247
 msgctxt "Flood autogap"
 msgid "Medium"
 msgstr "Mittel"
 
-#: ../src/flood-context.cpp:272
+#: ../src/flood-context.cpp:248
 msgctxt "Flood autogap"
 msgid "Large"
 msgstr "Groß"
 
-#: ../src/flood-context.cpp:494
+#: ../src/flood-context.cpp:470
 msgid "<b>Too much inset</b>, the result is empty."
 msgstr "<b>Zu viel Schrumpfung</b>, das Ergebnis ist leer."
 
-#: ../src/flood-context.cpp:535
+#: ../src/flood-context.cpp:511
 #, c-format
 msgid ""
 "Area filled, path with <b>%d</b> node created and unioned with selection."
@@ -8575,18 +8596,18 @@ msgstr[1] ""
 "Gebiet gefüllt, Pfad mit <b>%d</b> Knoten erzeugt und mit der Auswahl "
 "vereinigt."
 
-#: ../src/flood-context.cpp:541
+#: ../src/flood-context.cpp:517
 #, c-format
 msgid "Area filled, path with <b>%d</b> node created."
 msgid_plural "Area filled, path with <b>%d</b> nodes created."
 msgstr[0] "Gebiet gefüllt, Pfad mit <b>%d</b> Knoten erzeugt."
 msgstr[1] "Gebiet gefüllt, Pfad mit <b>%d</b> Knoten erzeugt."
 
-#: ../src/flood-context.cpp:809 ../src/flood-context.cpp:1119
+#: ../src/flood-context.cpp:785 ../src/flood-context.cpp:1095
 msgid "<b>Area is not bounded</b>, cannot fill."
 msgstr "<b>Gebiet ist nicht abgegrenzt</b>, kann nicht füllen."
 
-#: ../src/flood-context.cpp:1124
+#: ../src/flood-context.cpp:1100
 msgid ""
 "<b>Only the visible part of the bounded area was filled.</b> If you want to "
 "fill all of the area, undo, zoom out, and fill again."
@@ -8595,60 +8616,60 @@ msgstr ""
 "Sie das gesamte Gebiet füllen wollen, dann machen Sie rückgängig, zoomen "
 "heraus, und füllen Sie noch einmal."
 
-#: ../src/flood-context.cpp:1142 ../src/flood-context.cpp:1301
+#: ../src/flood-context.cpp:1118 ../src/flood-context.cpp:1277
 msgid "Fill bounded area"
 msgstr "Fülle abgegrenztes Gebiet"
 
-#: ../src/flood-context.cpp:1161
+#: ../src/flood-context.cpp:1137
 msgid "Set style on object"
 msgstr "Stil auf Objekte anwenden"
 
-#: ../src/flood-context.cpp:1220
+#: ../src/flood-context.cpp:1196
 msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill"
 msgstr ""
 "<b>Zeichne über</b> Flächen um zur Füllung hinzuzufügen, <b>Alt</b> für "
 "Füllen durch Berührung"
 
-#: ../src/gradient-context.cpp:134 ../src/gradient-drag.cpp:95
+#: ../src/gradient-context.cpp:110 ../src/gradient-drag.cpp:95
 msgid "Linear gradient <b>start</b>"
 msgstr "<b>Anfang</b> des linearen Farbverlaufs"
 
 #. POINT_LG_BEGIN
-#: ../src/gradient-context.cpp:135 ../src/gradient-drag.cpp:96
+#: ../src/gradient-context.cpp:111 ../src/gradient-drag.cpp:96
 msgid "Linear gradient <b>end</b>"
 msgstr "<b>Ende</b> des linearen Farbverlaufs"
 
-#: ../src/gradient-context.cpp:136 ../src/gradient-drag.cpp:97
+#: ../src/gradient-context.cpp:112 ../src/gradient-drag.cpp:97
 msgid "Linear gradient <b>mid stop</b>"
 msgstr "<b>Zwischenfarbe</b> des linearen Farbverlaufs"
 
-#: ../src/gradient-context.cpp:137 ../src/gradient-drag.cpp:98
+#: ../src/gradient-context.cpp:113 ../src/gradient-drag.cpp:98
 msgid "Radial gradient <b>center</b>"
 msgstr "<b>Zentrum</b> des radialen Farbverlaufs"
 
-#: ../src/gradient-context.cpp:138 ../src/gradient-context.cpp:139
+#: ../src/gradient-context.cpp:114 ../src/gradient-context.cpp:115
 #: ../src/gradient-drag.cpp:99 ../src/gradient-drag.cpp:100
 msgid "Radial gradient <b>radius</b>"
 msgstr "<b>Radius</b> des radialen Farbverlaufs"
 
-#: ../src/gradient-context.cpp:140 ../src/gradient-drag.cpp:101
+#: ../src/gradient-context.cpp:116 ../src/gradient-drag.cpp:101
 msgid "Radial gradient <b>focus</b>"
 msgstr "<b>Fokus</b> des radialen Farbverlaufs"
 
 #. POINT_RG_FOCUS
-#: ../src/gradient-context.cpp:141 ../src/gradient-context.cpp:142
+#: ../src/gradient-context.cpp:117 ../src/gradient-context.cpp:118
 #: ../src/gradient-drag.cpp:102 ../src/gradient-drag.cpp:103
 msgid "Radial gradient <b>mid stop</b>"
 msgstr "<b>Zwischenfarbe</b> des radialen Farbverlaufs"
 
 #. TRANSLATORS: %s will be substituted with the point name (see previous messages); This is part of a compound message
-#: ../src/gradient-context.cpp:167
+#: ../src/gradient-context.cpp:143
 #, c-format
 msgid "%s selected"
 msgstr "%s ausgewählt"
 
 #. TRANSLATORS: Mind the space in front. This is part of a compound message
-#: ../src/gradient-context.cpp:169 ../src/gradient-context.cpp:178
+#: ../src/gradient-context.cpp:145 ../src/gradient-context.cpp:154
 #, c-format
 msgid " out of %d gradient handle"
 msgid_plural " out of %d gradient handles"
@@ -8656,8 +8677,8 @@ msgstr[0] " von %d Farbverlaufs-Anfasser gewählt"
 msgstr[1] " von %d Farbverlaufs-Anfassern gewählt"
 
 #. TRANSLATORS: Mind the space in front. (Refers to gradient handles selected). This is part of a compound message
-#: ../src/gradient-context.cpp:170 ../src/gradient-context.cpp:179
-#: ../src/gradient-context.cpp:186
+#: ../src/gradient-context.cpp:146 ../src/gradient-context.cpp:155
+#: ../src/gradient-context.cpp:162
 #, c-format
 msgid " on %d selected object"
 msgid_plural " on %d selected objects"
@@ -8665,7 +8686,7 @@ msgstr[0] "auf %d gewähltes Objekt"
 msgstr[1] "auf %d gewählte Objekte"
 
 #. TRANSLATORS: This is a part of a compound message (out of two more indicating: grandint handle count & object count)
-#: ../src/gradient-context.cpp:176
+#: ../src/gradient-context.cpp:152
 #, c-format
 msgid ""
 "One handle merging %d stop (drag with <b>Shift</b> to separate) selected"
@@ -8677,7 +8698,7 @@ msgstr[1] ""
 "trennt)"
 
 #. TRANSLATORS: The plural refers to number of selected gradient handles. This is part of a compound message (part two indicates selected object count)
-#: ../src/gradient-context.cpp:184
+#: ../src/gradient-context.cpp:160
 #, c-format
 msgid "<b>%d</b> gradient handle selected out of %d"
 msgid_plural "<b>%d</b> gradient handles selected out of %d"
@@ -8685,7 +8706,7 @@ msgstr[0] "<b>%d</b> Verlaufs-Handle von %d ausgewählt"
 msgstr[1] "<b>%d</b> Verlaufs-Handles von %d ausgewählt"
 
 #. TRANSLATORS: The plural refers to number of selected objects
-#: ../src/gradient-context.cpp:191
+#: ../src/gradient-context.cpp:167
 #, c-format
 msgid "<b>No</b> gradient handles selected out of %d on %d selected object"
 msgid_plural ""
@@ -8695,39 +8716,39 @@ msgstr[0] ""
 msgstr[1] ""
 "<b>Keine</b> Verlaufs-Handles von %d ausgewählt bei %d markierten Objekten"
 
-#: ../src/gradient-context.cpp:405 ../src/gradient-context.cpp:503
+#: ../src/gradient-context.cpp:381 ../src/gradient-context.cpp:479
 #: ../src/ui/dialog/swatches.cpp:202 ../src/widgets/gradient-vector.cpp:815
 msgid "Add gradient stop"
 msgstr "Zwischenfarbe zum Farbverlauf hinzufügen"
 
-#: ../src/gradient-context.cpp:478
+#: ../src/gradient-context.cpp:454
 msgid "Simplify gradient"
 msgstr "Farbverlauf vereinfachen"
 
-#: ../src/gradient-context.cpp:557
+#: ../src/gradient-context.cpp:533
 msgid "Create default gradient"
 msgstr "Standard-Farbverlauf erzeugen"
 
-#: ../src/gradient-context.cpp:614
+#: ../src/gradient-context.cpp:590
 msgid "<b>Draw around</b> handles to select them"
 msgstr "<b>Zeichne um</b> Anfasser um diese auszuwählen"
 
-#: ../src/gradient-context.cpp:730
+#: ../src/gradient-context.cpp:706
 msgid "<b>Ctrl</b>: snap gradient angle"
 msgstr "<b>Strg</b>: Winkel des Farbverlaufs einrasten"
 
-#: ../src/gradient-context.cpp:731
+#: ../src/gradient-context.cpp:707
 msgid "<b>Shift</b>: draw gradient around the starting point"
 msgstr "<b>Umschalt</b>: Farbverlauf ausgehend vom Mittelpunkt zeichnen"
 
-#: ../src/gradient-context.cpp:954
+#: ../src/gradient-context.cpp:930
 #, c-format
 msgid "<b>Gradient</b> for %d object; with <b>Ctrl</b> to snap angle"
 msgid_plural "<b>Gradient</b> for %d objects; with <b>Ctrl</b> to snap angle"
 msgstr[0] "<b>Farbverlauf</b> für %d Objekte; mit <b>Strg</b> Winkel einrasten"
 msgstr[1] "<b>Farbverlauf</b> für %d Objekte; mit <b>Strg</b> Winkel einrasten"
 
-#: ../src/gradient-context.cpp:958
+#: ../src/gradient-context.cpp:934
 msgid "Select <b>objects</b> on which to create gradient."
 msgstr "<b>Objekte</b> auswählen, für die ein Farbverlauf erzeugt werden soll."
 
@@ -9490,7 +9511,7 @@ msgstr ""
 #: ../src/ui/dialog/align-and-distribute.cpp:1047
 #: ../src/ui/dialog/document-properties.cpp:144
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1546
-#: ../src/widgets/desktop-widget.cpp:1893
+#: ../src/widgets/desktop-widget.cpp:1912
 #: ../share/extensions/voronoi2svg.inx.h:9
 msgid "Page"
 msgstr "Seite"
@@ -11524,35 +11545,35 @@ msgstr "Pfadrichtung umkehren"
 msgid "<b>No paths</b> to reverse in the selection."
 msgstr "Die Auswahl enthält <b>keine Pfade</b> zum Umkehren."
 
-#: ../src/pen-context.cpp:250 ../src/pencil-context.cpp:561
+#: ../src/pen-context.cpp:222 ../src/pencil-context.cpp:534
 msgid "Drawing cancelled"
 msgstr "Zeichnen abgebrochen"
 
 # !!! make singular and plural forms
-#: ../src/pen-context.cpp:488 ../src/pencil-context.cpp:286
+#: ../src/pen-context.cpp:460 ../src/pencil-context.cpp:259
 msgid "Continuing selected path"
 msgstr "Gewählten Pfad verlängern"
 
-#: ../src/pen-context.cpp:498 ../src/pencil-context.cpp:294
+#: ../src/pen-context.cpp:470 ../src/pencil-context.cpp:267
 msgid "Creating new path"
 msgstr "Erzeuge neuen Pfad"
 
-#: ../src/pen-context.cpp:500 ../src/pencil-context.cpp:297
+#: ../src/pen-context.cpp:472 ../src/pencil-context.cpp:270
 msgid "Appending to selected path"
 msgstr "Zu ausgewähltem Pfad hinzufügen"
 
-#: ../src/pen-context.cpp:660
+#: ../src/pen-context.cpp:632
 msgid "<b>Click</b> or <b>click and drag</b> to close and finish the path."
 msgstr "<b>Klick</b> oder <b>Klick und Ziehen</b>, um den Pfad abzuschließen."
 
-#: ../src/pen-context.cpp:670
+#: ../src/pen-context.cpp:642
 msgid ""
 "<b>Click</b> or <b>click and drag</b> to continue the path from this point."
 msgstr ""
 "<b>Klick</b> oder <b>Klick und Ziehen</b>, um den Pfad von diesem Punkt aus "
 "fortzusetzen."
 
-#: ../src/pen-context.cpp:1265
+#: ../src/pen-context.cpp:1237
 #, c-format
 msgid ""
 "<b>Curve segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to "
@@ -11561,7 +11582,7 @@ msgstr ""
 "<b>Kurvensegment</b>: Winkel %3.2f&#176;, Abstand %s; <b>Strg</b> rastet den "
 "Winkel ein; <b>Eingabe</b> schließt den Pfad ab"
 
-#: ../src/pen-context.cpp:1266
+#: ../src/pen-context.cpp:1238
 #, c-format
 msgid ""
 "<b>Line segment</b>: angle %3.2f&#176;, distance %s; with <b>Ctrl</b> to "
@@ -11570,7 +11591,7 @@ msgstr ""
 "<b>Liniensegment</b>: Winkel %3.2f&#176;, Abstand %s; <b>Strg</b> rastet den "
 "Winkel ein; <b>Eingabe</b> schließt den Pfad ab"
 
-#: ../src/pen-context.cpp:1283
+#: ../src/pen-context.cpp:1255
 #, c-format
 msgid ""
 "<b>Curve handle</b>: angle %3.2f&#176;, length %s; with <b>Ctrl</b> to snap "
@@ -11579,7 +11600,7 @@ msgstr ""
 "<b>Kurvenanfasser</b>: Winkel %3.2f°; Länge %s; Winkel mit <b>Strg</b> "
 "einrasten"
 
-#: ../src/pen-context.cpp:1305
+#: ../src/pen-context.cpp:1277
 #, c-format
 msgid ""
 "<b>Curve handle, symmetric</b>: angle %3.2f&#176;, length %s; with <b>Ctrl</"
@@ -11588,7 +11609,7 @@ msgstr ""
 "<b>Symmetrischer Kurvenanfasser</b>: Winkel %3.2f&#176;, Länge %s; <b>Strg</"
 "b> rastet den Winkel ein; <b>Umschalt</b> bewegt nur diesen Anfasser"
 
-#: ../src/pen-context.cpp:1306
+#: ../src/pen-context.cpp:1278
 #, c-format
 msgid ""
 "<b>Curve handle</b>: angle %3.2f&#176;, length %s; with <b>Ctrl</b> to snap "
@@ -11598,29 +11619,29 @@ msgstr ""
 "Winkel ein; <b>Umschalt</b> bewegt nur diesen Anfasser"
 
 # not sure here -cm-
-#: ../src/pen-context.cpp:1352
+#: ../src/pen-context.cpp:1324
 msgid "Drawing finished"
 msgstr "Zeichnen beendet"
 
-#: ../src/pencil-context.cpp:402
+#: ../src/pencil-context.cpp:375
 msgid "<b>Release</b> here to close and finish the path."
 msgstr "Hier <b>loslassen</b>, um den Pfad zu schließen und beenden."
 
-#: ../src/pencil-context.cpp:408
+#: ../src/pencil-context.cpp:381
 msgid "Drawing a freehand path"
 msgstr "Freihandlinien zeichnen"
 
-#: ../src/pencil-context.cpp:413
+#: ../src/pencil-context.cpp:386
 msgid "<b>Drag</b> to continue the path from this point."
 msgstr "<b>Ziehen</b>, um den Pfad von diesem Punkt aus fortzusetzen."
 
 # !!!
 #. Write curves to object
-#: ../src/pencil-context.cpp:505
+#: ../src/pencil-context.cpp:478
 msgid "Finishing freehand"
 msgstr "Fertig mit Freihandlinien"
 
-#: ../src/pencil-context.cpp:611
+#: ../src/pencil-context.cpp:584
 msgid ""
 "<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. "
 "Release <b>Alt</b> to finalize."
@@ -11629,15 +11650,15 @@ msgstr ""
 "Pfaden. Zum Beenden <b>Alt</b> loslassen."
 
 # !!!
-#: ../src/pencil-context.cpp:639
+#: ../src/pencil-context.cpp:612
 msgid "Finishing freehand sketch"
 msgstr "Fertig mit Freihandlinien"
 
-#: ../src/persp3d.cpp:346
+#: ../src/persp3d.cpp:318
 msgid "Toggle vanishing point"
 msgstr "Fluchtpunkt umschalten"
 
-#: ../src/persp3d.cpp:357
+#: ../src/persp3d.cpp:329
 msgid "Toggle multiple vanishing points"
 msgstr "Multiple Fluchtpunkte umschalten"
 
@@ -11915,7 +11936,7 @@ msgstr "Fragment:"
 msgid "XML fragment for the RDF 'License' section"
 msgstr "XML-Fragment für den RDF-Abschnitt »Lizenz«."
 
-#: ../src/rect-context.cpp:376
+#: ../src/rect-context.cpp:352
 msgid ""
 "<b>Ctrl</b>: make square or integer-ratio rect, lock a rounded corner "
 "circular"
@@ -11923,7 +11944,7 @@ msgstr ""
 "<b>Strg</b>: Quadrat oder Rechteck mit ganzzahligem Kanten-Längenverhältnis, "
 "abgerundete Kanten mit einheitlichen Radien"
 
-#: ../src/rect-context.cpp:529
+#: ../src/rect-context.cpp:505
 #, c-format
 msgid ""
 "<b>Rectangle</b>: %s &#215; %s (constrained to ratio %d:%d); with <b>Shift</"
@@ -11932,7 +11953,7 @@ msgstr ""
 "<b>Rechteck</b>: %s × %s (beschränkt auf Seitenverhältnis %d:%d); "
 "<b>Umschalt</b> - Rechteck vom Zentrum aus zeichnen"
 
-#: ../src/rect-context.cpp:532
+#: ../src/rect-context.cpp:508
 #, c-format
 msgid ""
 "<b>Rectangle</b>: %s &#215; %s (constrained to golden ratio 1.618 : 1); with "
@@ -11941,7 +11962,7 @@ msgstr ""
 "<b>Rechteck</b>: %s × %s (beschränkt auf Goldenen Schnitt 1,618 : 1); "
 "<b>Umschalt</b> - Rechteck vom Zentrum aus zeichnen"
 
-#: ../src/rect-context.cpp:534
+#: ../src/rect-context.cpp:510
 #, c-format
 msgid ""
 "<b>Rectangle</b>: %s &#215; %s (constrained to golden ratio 1 : 1.618); with "
@@ -11950,7 +11971,7 @@ msgstr ""
 "<b>Rechteck</b>: %s × %s (beschränkt auf Goldenen Schnitt 1 : 1,618); "
 "<b>Umschalt</b> - Rechteck vom Zentrum aus zeichnen"
 
-#: ../src/rect-context.cpp:538
+#: ../src/rect-context.cpp:514
 #, c-format
 msgid ""
 "<b>Rectangle</b>: %s &#215; %s; with <b>Ctrl</b> to make square or integer-"
@@ -11959,16 +11980,16 @@ msgstr ""
 "<b>Rechteck</b>: %s × %s; <b>Strg</b> erzeugt Quadrat oder ganzzahliges "
 "Höhen/Breitenverhältnis; <b>Umschalt</b> - Rechteck vom Zentrum aus zeichnen"
 
-#: ../src/rect-context.cpp:563
+#: ../src/rect-context.cpp:539
 msgid "Create rectangle"
 msgstr "Rechteck erzeugen"
 
-#: ../src/select-context.cpp:200
+#: ../src/select-context.cpp:175
 msgid "Click selection to toggle scale/rotation handles"
 msgstr ""
 "Klicken Sie auf die Auswahl, um zwischen Skalieren und Rotieren umzuschalten"
 
-#: ../src/select-context.cpp:201
+#: ../src/select-context.cpp:176
 msgid ""
 "No objects selected. Click, Shift+click, Alt+scroll mouse on top of objects, "
 "or drag around objects to select."
@@ -11977,16 +11998,16 @@ msgstr ""
 "auszuwählen."
 
 # !!!
-#: ../src/select-context.cpp:260
+#: ../src/select-context.cpp:235
 msgid "Move canceled."
 msgstr "Verschieben abgebrochen."
 
 # !!!
-#: ../src/select-context.cpp:268
+#: ../src/select-context.cpp:243
 msgid "Selection canceled."
 msgstr "Auswahl abgebrochen."
 
-#: ../src/select-context.cpp:640
+#: ../src/select-context.cpp:615
 msgid ""
 "<b>Draw over</b> objects to select them; release <b>Alt</b> to switch to "
 "rubberband selection"
@@ -11994,7 +12015,7 @@ msgstr ""
 "<b>Zeichnen über</b> Objekten wählt sie aus; <b>Alt</b> loslassen, um mit "
 "Gummiband auszuwählen"
 
-#: ../src/select-context.cpp:642
+#: ../src/select-context.cpp:617
 msgid ""
 "<b>Drag around</b> objects to select them; press <b>Alt</b> to switch to "
 "touch selection"
@@ -12002,19 +12023,19 @@ msgstr ""
 "<b>Ziehen um</b> Objekte wählt sie aus; <b>Alt</b> drücken, um durch "
 "Berührung auszuwählen"
 
-#: ../src/select-context.cpp:898
+#: ../src/select-context.cpp:873
 msgid "<b>Ctrl</b>: click to select in groups; drag to move hor/vert"
 msgstr ""
 "<b>Strg</b>: Klick um in Gruppierung auszuwählen; Ziehen um horizontal/"
 "vertikal bewegen"
 
-#: ../src/select-context.cpp:899
+#: ../src/select-context.cpp:874
 msgid "<b>Shift</b>: click to toggle select; drag for rubberband selection"
 msgstr ""
 "<b>Umschalt</b>: Klick um Auswahl aktivieren/deaktivieren, Ziehen für "
 "Gummiband-Auswahl"
 
-#: ../src/select-context.cpp:900
+#: ../src/select-context.cpp:875
 msgid ""
 "<b>Alt</b>: click to select under; scroll mouse-wheel to cycle-select; drag "
 "to move selected or select by touch"
@@ -12022,7 +12043,7 @@ msgstr ""
 "<b>Alt</b>: Klick um verdeckte Objekte auswählen; Ziehen um gewähltes Objekt "
 "zu verschieben oder durch Berühren auszuwählen"
 
-#: ../src/select-context.cpp:1071
+#: ../src/select-context.cpp:1046
 msgid "Selected object is not a group. Cannot enter."
 msgstr "Ausgewähltes Objekt ist keine Gruppe - kann diese nicht betreten."
 
@@ -12034,7 +12055,7 @@ msgstr "Text löschen"
 msgid "<b>Nothing</b> was deleted."
 msgstr "Es wurde <b>nichts</b> gelöscht."
 
-#: ../src/selection-chemistry.cpp:374 ../src/text-context.cpp:1031
+#: ../src/selection-chemistry.cpp:374 ../src/text-context.cpp:1008
 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:55
 #: ../src/ui/dialog/swatches.cpp:277 ../src/widgets/erasor-toolbar.cpp:116
 #: ../src/widgets/gradient-toolbar.cpp:1193
@@ -12069,7 +12090,7 @@ msgstr ""
 msgid "<b>No groups</b> to ungroup in the selection."
 msgstr "<b>Keine Gruppe</b> zum Aufheben in dieser Auswahl."
 
-#: ../src/selection-chemistry.cpp:783 ../src/sp-item-group.cpp:501
+#: ../src/selection-chemistry.cpp:783 ../src/sp-item-group.cpp:475
 msgid "Ungroup"
 msgstr "Gruppierung aufheben"
 
@@ -12605,8 +12626,8 @@ msgid "Use <b>Shift+D</b> to look up frame"
 msgstr "<b>Umschalt+D</b> zum Finden des Rahmens verwenden"
 
 #. this is only used with 2 or more objects
-#: ../src/selection-describer.cpp:226 ../src/spray-context.cpp:227
-#: ../src/tweak-context.cpp:204
+#: ../src/selection-describer.cpp:226 ../src/spray-context.cpp:203
+#: ../src/tweak-context.cpp:180
 #, c-format
 msgid "<b>%i</b> object selected"
 msgid_plural "<b>%i</b> objects selected"
@@ -12708,7 +12729,7 @@ msgstr ""
 msgid "Reset center"
 msgstr "Mittelpunkt zurücksetzen"
 
-#: ../src/seltrans.cpp:996 ../src/seltrans.cpp:1093
+#: ../src/seltrans.cpp:994 ../src/seltrans.cpp:1091
 #, c-format
 msgid "<b>Scale</b>: %0.2f%% x %0.2f%%; with <b>Ctrl</b> to lock ratio"
 msgstr ""
@@ -12717,24 +12738,24 @@ msgstr ""
 
 #. TRANSLATORS: don't modify the first ";"
 #. (it will NOT be displayed as ";" - only the second one will be)
-#: ../src/seltrans.cpp:1207
+#: ../src/seltrans.cpp:1205
 #, c-format
 msgid "<b>Skew</b>: %0.2f&#176;; with <b>Ctrl</b> to snap angle"
 msgstr "<b>Scheren</b>: %0.2f &#176;; Winkel mit <b>Strg</b> einrasten"
 
 #. TRANSLATORS: don't modify the first ";"
 #. (it will NOT be displayed as ";" - only the second one will be)
-#: ../src/seltrans.cpp:1282
+#: ../src/seltrans.cpp:1280
 #, c-format
 msgid "<b>Rotate</b>: %0.2f&#176;; with <b>Ctrl</b> to snap angle"
 msgstr "<b>Drehen</b>: %0.2f&#176;; Winkel mit <b>Strg</b> einrasten"
 
-#: ../src/seltrans.cpp:1317
+#: ../src/seltrans.cpp:1315
 #, c-format
 msgid "Move <b>center</b> to %s, %s"
 msgstr "<b>Mittelpunkt</b> verschieben nach %s, %s"
 
-#: ../src/seltrans.cpp:1493
+#: ../src/seltrans.cpp:1491
 #, c-format
 msgid ""
 "<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; "
@@ -12743,37 +12764,37 @@ msgstr ""
 "<b>Verschieben</b> um %s, %s; mit <b>Strg</b> nur horizontale/vertikale "
 "Verschiebung; <b>Umschalt</b> deaktiviert Einrasten."
 
-#: ../src/sp-anchor.cpp:179
+#: ../src/sp-anchor.cpp:151
 #, c-format
 msgid "<b>Link</b> to %s"
 msgstr "Mit %s <b>verknüpfen</b>"
 
-#: ../src/sp-anchor.cpp:183
+#: ../src/sp-anchor.cpp:155
 msgid "<b>Link</b> without URI"
 msgstr "<b>Verknüpfung</b> ohne URI"
 
 # !!!
-#: ../src/sp-ellipse.cpp:506 ../src/sp-ellipse.cpp:883
+#: ../src/sp-ellipse.cpp:452 ../src/sp-ellipse.cpp:775
 msgid "<b>Ellipse</b>"
 msgstr "<b>Ellipse</b>"
 
 # !!!
-#: ../src/sp-ellipse.cpp:647
+#: ../src/sp-ellipse.cpp:566
 msgid "<b>Circle</b>"
 msgstr "<b>Kreis</b>"
 
 # !!!
-#: ../src/sp-ellipse.cpp:878
+#: ../src/sp-ellipse.cpp:770
 msgid "<b>Segment</b>"
 msgstr "<b>Segment</b>"
 
 # !!!
-#: ../src/sp-ellipse.cpp:880
+#: ../src/sp-ellipse.cpp:772
 msgid "<b>Arc</b>"
 msgstr "<b>Kreisbogen</b>"
 
 #. TRANSLATORS: "Flow region" is an area where text is allowed to flow
-#: ../src/sp-flowregion.cpp:264
+#: ../src/sp-flowregion.cpp:234
 #, c-format
 msgid "Flow region"
 msgstr "Fließtext-Bereich"
@@ -12782,26 +12803,26 @@ msgstr "Fließtext-Bereich"
 #. * flow excluded region.  flowRegionExclude in SVG 1.2: see
 #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegion-elem and
 #. * http://www.w3.org/TR/2004/WD-SVG12-20041027/flow.html#flowRegionExclude-elem.
-#: ../src/sp-flowregion.cpp:475
+#: ../src/sp-flowregion.cpp:423
 #, c-format
 msgid "Flow excluded region"
 msgstr "Ausgeschlossenen Bereich umfließen"
 
-#: ../src/sp-guide.cpp:315
+#: ../src/sp-guide.cpp:290
 msgid "Create Guides Around the Page"
 msgstr "Führungslinien an Seitenrändern erstellen"
 
-#: ../src/sp-guide.cpp:327 ../src/verbs.cpp:2422
+#: ../src/sp-guide.cpp:302 ../src/verbs.cpp:2422
 msgid "Delete All Guides"
 msgstr "Führungslinien löschen"
 
 #. Guide has probably been deleted and no longer has an attached namedview.
-#: ../src/sp-guide.cpp:487
+#: ../src/sp-guide.cpp:462
 #, c-format
 msgid "Deleted"
 msgstr "Gelöscht"
 
-#: ../src/sp-guide.cpp:496
+#: ../src/sp-guide.cpp:471
 msgid ""
 "<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to "
 "delete"
@@ -12809,103 +12830,103 @@ msgstr ""
 "<b>Umschalt+Ziehen</b> rotiert, <b>Strg+Ziehen</b> bewegt Ursprung, <b>Entf</"
 "b> löscht."
 
-#: ../src/sp-guide.cpp:500
+#: ../src/sp-guide.cpp:475
 #, c-format
 msgid "vertical, at %s"
 msgstr "Vertikale Führungslinie bei %s"
 
-#: ../src/sp-guide.cpp:503
+#: ../src/sp-guide.cpp:478
 #, c-format
 msgid "horizontal, at %s"
 msgstr "Horizontale Führungslinie bei %s"
 
-#: ../src/sp-guide.cpp:508
+#: ../src/sp-guide.cpp:483
 #, c-format
 msgid "at %d degrees, through (%s,%s)"
 msgstr "bei %d Grad, durch (%s, %s)"
 
-#: ../src/sp-image.cpp:1091
+#: ../src/sp-image.cpp:1063
 msgid "embedded"
 msgstr "eingebettet"
 
-#: ../src/sp-image.cpp:1099
+#: ../src/sp-image.cpp:1071
 #, c-format
 msgid "<b>Image with bad reference</b>: %s"
 msgstr "<b>Bild-Objekt mit fehlerhaftem Bezug</b>: %s"
 
-#: ../src/sp-image.cpp:1100
+#: ../src/sp-image.cpp:1072
 #, c-format
 msgid "<b>Image</b> %d &#215; %d: %s"
 msgstr "<b>Farbbild</b> %d &#215; %d: %s"
 
-#: ../src/sp-item-group.cpp:743
+#: ../src/sp-item-group.cpp:717
 #, c-format
 msgid "<b>Group</b> of <b>%d</b> object"
 msgid_plural "<b>Group</b> of <b>%d</b> objects"
 msgstr[0] "<b>Gruppe</b> von <b>%d</b> Objekt"
 msgstr[1] "<b>Gruppe</b> von <b>%d</b> Objekten"
 
-#: ../src/sp-item.cpp:971 ../src/verbs.cpp:212
+#: ../src/sp-item.cpp:977 ../src/verbs.cpp:212
 msgid "Object"
 msgstr "Objekt"
 
-#: ../src/sp-item.cpp:984
+#: ../src/sp-item.cpp:990
 #, c-format
 msgid "%s; <i>clipped</i>"
 msgstr "%s; <i>ausgeschnitten</i>"
 
-#: ../src/sp-item.cpp:989
+#: ../src/sp-item.cpp:995
 #, c-format
 msgid "%s; <i>masked</i>"
 msgstr "%s, <i>maskiert</i>"
 
-#: ../src/sp-item.cpp:997
+#: ../src/sp-item.cpp:1003
 #, c-format
 msgid "%s; <i>filtered (%s)</i>"
 msgstr "%s; <i>gefiltert (%s)</i>"
 
-#: ../src/sp-item.cpp:999
+#: ../src/sp-item.cpp:1005
 #, c-format
 msgid "%s; <i>filtered</i>"
 msgstr "%s; <i>gefiltert</i>"
 
 # !!!
-#: ../src/sp-line.cpp:174
+#: ../src/sp-line.cpp:166
 msgid "<b>Line</b>"
 msgstr "<b>Linie</b>"
 
-#: ../src/sp-lpe-item.cpp:341
+#: ../src/sp-lpe-item.cpp:316
 msgid "An exception occurred during execution of the Path Effect."
 msgstr "Beim ausführen des Pfad-Effektes ist ein Fehler aufgetreten."
 
 #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign
-#: ../src/sp-offset.cpp:428
+#: ../src/sp-offset.cpp:393
 #, c-format
 msgid "<b>Linked offset</b>, %s by %f pt"
 msgstr "<b>Verknüpfter Versatz</b>, %s um %f pt"
 
-#: ../src/sp-offset.cpp:429 ../src/sp-offset.cpp:433
+#: ../src/sp-offset.cpp:394 ../src/sp-offset.cpp:398
 msgid "outset"
 msgstr "erweitert"
 
-#: ../src/sp-offset.cpp:429 ../src/sp-offset.cpp:433
+#: ../src/sp-offset.cpp:394 ../src/sp-offset.cpp:398
 msgid "inset"
 msgstr "geschrumpft"
 
 #. TRANSLATORS COMMENT: %s is either "outset" or "inset" depending on sign
-#: ../src/sp-offset.cpp:432
+#: ../src/sp-offset.cpp:397
 #, c-format
 msgid "<b>Dynamic offset</b>, %s by %f pt"
 msgstr "<b>Dynamischer Versatz</b>, %s um %f pt"
 
-#: ../src/sp-path.cpp:152
+#: ../src/sp-path.cpp:124
 #, c-format
 msgid "<b>Path</b> (%i node, path effect: %s)"
 msgid_plural "<b>Path</b> (%i nodes, path effect: %s)"
 msgstr[0] "<b>Pfad</b> (%i Knoten, Pfadeffekt: %s)"
 msgstr[1] "<b>Pfad</b> (%i Knoten, Pfadeffekt: %s)"
 
-#: ../src/sp-path.cpp:155
+#: ../src/sp-path.cpp:127
 #, c-format
 msgid "<b>Path</b> (%i node)"
 msgid_plural "<b>Path</b> (%i nodes)"
@@ -12913,35 +12934,35 @@ msgstr[0] "<b>Pfad</b> (%i Knoten)"
 msgstr[1] "<b>Pfad</b> (%i Knoten)"
 
 # !!!
-#: ../src/sp-polygon.cpp:225
+#: ../src/sp-polygon.cpp:197
 msgid "<b>Polygon</b>"
 msgstr "<b>Polygon</b>"
 
 # !!!
-#: ../src/sp-polyline.cpp:156
+#: ../src/sp-polyline.cpp:141
 msgid "<b>Polyline</b>"
 msgstr "<b>Linienzug</b>"
 
 # !!!
-#: ../src/sp-rect.cpp:223
+#: ../src/sp-rect.cpp:195
 msgid "<b>Rectangle</b>"
 msgstr "<b>Rechteck</b>"
 
 #. TRANSLATORS: since turn count isn't an integer, please adjust the
 #. string as needed to deal with an localized plural forms.
-#: ../src/sp-spiral.cpp:310
+#: ../src/sp-spiral.cpp:279
 #, c-format
 msgid "<b>Spiral</b> with %3f turns"
 msgstr "<b>Spirale</b> mit %3f Windungen"
 
-#: ../src/sp-star.cpp:301
+#: ../src/sp-star.cpp:275
 #, c-format
 msgid "<b>Star</b> with %d vertex"
 msgid_plural "<b>Star</b> with %d vertices"
 msgstr[0] "<b>Stern</b> mit %d Eckpunkt"
 msgstr[1] "<b>Stern</b> mit %d Eckpunkten"
 
-#: ../src/sp-star.cpp:305
+#: ../src/sp-star.cpp:279
 #, c-format
 msgid "<b>Polygon</b> with %d vertex"
 msgid_plural "<b>Polygon</b> with %d vertices"
@@ -12949,77 +12970,77 @@ msgstr[0] "<b>Polygon</b> mit %d Eckpunkt"
 msgstr[1] "<b>Polygon</b> mit %d Eckpunkten"
 
 #. TRANSLATORS: For description of font with no name.
-#: ../src/sp-text.cpp:418
+#: ../src/sp-text.cpp:392
 msgid "&lt;no name found&gt;"
 msgstr "&lt;kein Name gefunden&gt;"
 
-#: ../src/sp-text.cpp:430
+#: ../src/sp-text.cpp:404
 #, c-format
 msgid "<b>Text on path</b>%s (%s, %s)"
 msgstr "<b>Text an Pfad</b>%s (%s, %s)"
 
-#: ../src/sp-text.cpp:431
+#: ../src/sp-text.cpp:405
 #, c-format
 msgid "<b>Text</b>%s (%s, %s)"
 msgstr "<b>Text</b>%s (%s, %s)"
 
-#: ../src/sp-tref.cpp:366
+#: ../src/sp-tref.cpp:341
 #, c-format
 msgid "<b>Cloned character data</b>%s%s"
 msgstr "<b>Geklonte Zeichendaten</b>%s%s"
 
-#: ../src/sp-tref.cpp:367
+#: ../src/sp-tref.cpp:342
 msgid " from "
 msgstr " von "
 
 # !!!
-#: ../src/sp-tref.cpp:373
+#: ../src/sp-tref.cpp:348
 msgid "<b>Orphaned cloned character data</b>"
 msgstr "<b>Verwaister Zeichen-Klon</b>"
 
 # !!!
-#: ../src/sp-tspan.cpp:287
+#: ../src/sp-tspan.cpp:252
 msgid "<b>Text span</b>"
 msgstr "<b>Textweite</b>"
 
 #. char *symbol_desc = SP_ITEM(use->child)->description();
 #. g_free(symbol_desc);
-#: ../src/sp-use.cpp:328
+#: ../src/sp-use.cpp:302
 msgid "<b>Clone of Symbol</b>"
 msgstr "<b>Klonen des Symbols</b>"
 
 #. TRANSLATORS: Used for statusbar description for long <use> chains:
 #. * "Clone of: Clone of: ... in Layer 1".
-#: ../src/sp-use.cpp:336
+#: ../src/sp-use.cpp:310
 msgid "..."
 msgstr "…"
 
-#: ../src/sp-use.cpp:344
+#: ../src/sp-use.cpp:318
 #, c-format
 msgid "<b>Clone</b> of: %s"
 msgstr "<b>Klon</b> von: %s"
 
 # !!!
-#: ../src/sp-use.cpp:348
+#: ../src/sp-use.cpp:322
 msgid "<b>Orphaned clone</b>"
 msgstr "<b>Verwaister Klon</b>"
 
-#: ../src/spiral-context.cpp:328
+#: ../src/spiral-context.cpp:304
 msgid "<b>Ctrl</b>: snap angle"
 msgstr "<b>Strg</b>: Winkel einrasten"
 
-#: ../src/spiral-context.cpp:330
+#: ../src/spiral-context.cpp:306
 msgid "<b>Alt</b>: lock spiral radius"
 msgstr "<b>Alt</b>: Radius der Spirale einrasten"
 
-#: ../src/spiral-context.cpp:466
+#: ../src/spiral-context.cpp:442
 #, c-format
 msgid ""
 "<b>Spiral</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle"
 msgstr ""
 "<b>Spirale</b>: Radius %s, Winkel %5g&#176;; Winkel mit <b>Strg</b> einrasten"
 
-#: ../src/spiral-context.cpp:492
+#: ../src/spiral-context.cpp:468
 msgid "Create spiral"
 msgstr "Spirale erstellen"
 
@@ -13152,12 +13173,12 @@ msgstr "<b>Pfad</b> zum Vereinfachen auswählen."
 msgid "<b>No paths</b> to simplify in the selection."
 msgstr "Die Auswahl enthält <b>keine Pfade</b> zum Vereinfachen."
 
-#: ../src/spray-context.cpp:229 ../src/tweak-context.cpp:206
+#: ../src/spray-context.cpp:205 ../src/tweak-context.cpp:182
 #, c-format
 msgid "<b>Nothing</b> selected"
 msgstr "Es wurde <b>nichts</b> gewählt"
 
-#: ../src/spray-context.cpp:235
+#: ../src/spray-context.cpp:211
 #, c-format
 msgid ""
 "%s. Drag, click or click and scroll to spray <b>copies</b> of the initial "
@@ -13166,7 +13187,7 @@ msgstr ""
 "%s. Ziehen, Klicken oder Klicken und Scrollen zum Sprühen von <b>Kopien</b> "
 "der ersten Auswahl."
 
-#: ../src/spray-context.cpp:238
+#: ../src/spray-context.cpp:214
 #, c-format
 msgid ""
 "%s. Drag, click or click and scroll to spray <b>clones</b> of the initial "
@@ -13175,7 +13196,7 @@ msgstr ""
 "%s. Ziehen, Klicken oder Klicken und Scrollen zum Sprühen von <b>Klonen</b> "
 "der ersten Auswahl."
 
-#: ../src/spray-context.cpp:241
+#: ../src/spray-context.cpp:217
 #, c-format
 msgid ""
 "%s. Drag, click or click and scroll to spray in a <b>single path</b> of the "
@@ -13184,40 +13205,40 @@ msgstr ""
 "%s. Ziehen, Klicken oder Klicken und Scrollen zum Sprühen in einen "
 "<b>Einzelpfad</b> der ersten Auswahl."
 
-#: ../src/spray-context.cpp:707
+#: ../src/spray-context.cpp:683
 msgid "<b>Nothing selected!</b> Select objects to spray."
 msgstr "<b>Nichts ausgewählt!</b> Wähle Objekte zum Sprühen aus."
 
-#: ../src/spray-context.cpp:782 ../src/widgets/spray-toolbar.cpp:183
+#: ../src/spray-context.cpp:758 ../src/widgets/spray-toolbar.cpp:183
 msgid "Spray with copies"
 msgstr "Sprühen mit Kopien"
 
-#: ../src/spray-context.cpp:786 ../src/widgets/spray-toolbar.cpp:190
+#: ../src/spray-context.cpp:762 ../src/widgets/spray-toolbar.cpp:190
 msgid "Spray with clones"
 msgstr "Sprühen mit Klonen"
 
-#: ../src/spray-context.cpp:790
+#: ../src/spray-context.cpp:766
 msgid "Spray in single path"
 msgstr "Sprühen in einen einzelnen Pfad"
 
-#: ../src/star-context.cpp:344
+#: ../src/star-context.cpp:320
 msgid "<b>Ctrl</b>: snap angle; keep rays radial"
 msgstr "<b>Strg</b>: Winkel einrasten; Strahlen bleiben radial ausgerichtet"
 
-#: ../src/star-context.cpp:480
+#: ../src/star-context.cpp:456
 #, c-format
 msgid ""
 "<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle"
 msgstr ""
 "<b>Polygon</b>: Radius %s, Winkel %5g°; Winkel mit <b>Strg</b> einrasten"
 
-#: ../src/star-context.cpp:481
+#: ../src/star-context.cpp:457
 #, c-format
 msgid "<b>Star</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle"
 msgstr ""
 "<b>Stern</b>: Radius %s, Winkel %5g&#176;; Winkel mit <b>Strg</b> einrasten"
 
-#: ../src/star-context.cpp:514
+#: ../src/star-context.cpp:490
 msgid "Create star"
 msgstr "Stern erstellen"
 
@@ -13308,58 +13329,58 @@ msgstr "Fließtext in Text umwandeln"
 msgid "<b>No flowed text(s)</b> to convert in the selection."
 msgstr "<b>Kein Fließtext</b> zum Umwandeln in der Auswahl."
 
-#: ../src/text-context.cpp:443
+#: ../src/text-context.cpp:420
 msgid "<b>Click</b> to edit the text, <b>drag</b> to select part of the text."
 msgstr ""
 "<b>Klick</b> zum Ändern des Textes, <b>Ziehen</b>, um einen Teil des Textes "
 "zu ändern."
 
-#: ../src/text-context.cpp:445
+#: ../src/text-context.cpp:422
 msgid ""
 "<b>Click</b> to edit the flowed text, <b>drag</b> to select part of the text."
 msgstr ""
 "<b>Klick</b> zum Ändern des Fließtextes, <b>Ziehen</b>, um einen Teil des "
 "Textes zu ändern."
 
-#: ../src/text-context.cpp:499
+#: ../src/text-context.cpp:476
 msgid "Create text"
 msgstr "Text erstellen"
 
-#: ../src/text-context.cpp:524
+#: ../src/text-context.cpp:501
 msgid "Non-printable character"
 msgstr "Nicht druckbares Zeichen"
 
-#: ../src/text-context.cpp:539
+#: ../src/text-context.cpp:516
 msgid "Insert Unicode character"
 msgstr "Unicode-Zeichen einfügen"
 
-#: ../src/text-context.cpp:574
+#: ../src/text-context.cpp:551
 #, c-format
 msgid "Unicode (<b>Enter</b> to finish): %s: %s"
 msgstr "Unicode (<b>Eingabe</b> zum Abschliessen): %s: %s"
 
-#: ../src/text-context.cpp:576 ../src/text-context.cpp:885
+#: ../src/text-context.cpp:553 ../src/text-context.cpp:862
 msgid "Unicode (<b>Enter</b> to finish): "
 msgstr "Unicode (<b>Eingabe</b> zum Abschliessen): "
 
-#: ../src/text-context.cpp:662
+#: ../src/text-context.cpp:639
 #, c-format
 msgid "<b>Flowed text frame</b>: %s &#215; %s"
 msgstr "<b>Fließtext-Rahmen</b>: %s × %s"
 
-#: ../src/text-context.cpp:719
+#: ../src/text-context.cpp:696
 msgid "Type text; <b>Enter</b> to start new line."
 msgstr "Text schreiben; <b>Eingabe</b>, um eine neue Zeile zu beginnen."
 
-#: ../src/text-context.cpp:730
+#: ../src/text-context.cpp:707
 msgid "Flowed text is created."
 msgstr "Fließtext wird erzeugt."
 
-#: ../src/text-context.cpp:732
+#: ../src/text-context.cpp:709
 msgid "Create flowed text"
 msgstr "Fließtext erstellen"
 
-#: ../src/text-context.cpp:734
+#: ../src/text-context.cpp:711
 msgid ""
 "The frame is <b>too small</b> for the current font size. Flowed text not "
 "created."
@@ -13367,75 +13388,75 @@ msgstr ""
 "Der Rahmen ist <b>zu klein</b> für die aktuelle Schriftgröße. Der Fließtext "
 "wurde nicht erzeugt."
 
-#: ../src/text-context.cpp:870
+#: ../src/text-context.cpp:847
 msgid "No-break space"
 msgstr "Untrennbares Leerzeichen"
 
-#: ../src/text-context.cpp:872
+#: ../src/text-context.cpp:849
 msgid "Insert no-break space"
 msgstr "Untrennbares Leerzeichen einfügen"
 
-#: ../src/text-context.cpp:909
+#: ../src/text-context.cpp:886
 msgid "Make bold"
 msgstr "Fett"
 
-#: ../src/text-context.cpp:927
+#: ../src/text-context.cpp:904
 msgid "Make italic"
 msgstr "Kursiv"
 
-#: ../src/text-context.cpp:966
+#: ../src/text-context.cpp:943
 msgid "New line"
 msgstr "Neue Zeile"
 
-#: ../src/text-context.cpp:1000
+#: ../src/text-context.cpp:977
 msgid "Backspace"
 msgstr "Rückschritt"
 
-#: ../src/text-context.cpp:1048
+#: ../src/text-context.cpp:1025
 msgid "Kern to the left"
 msgstr "Unterschneidung nach links"
 
-#: ../src/text-context.cpp:1073
+#: ../src/text-context.cpp:1050
 msgid "Kern to the right"
 msgstr "Unterschneidung nach rechts"
 
-#: ../src/text-context.cpp:1098
+#: ../src/text-context.cpp:1075
 msgid "Kern up"
 msgstr "Unterschneidung nach oben"
 
-#: ../src/text-context.cpp:1123
+#: ../src/text-context.cpp:1100
 msgid "Kern down"
 msgstr "Unterschneidung nach unten"
 
-#: ../src/text-context.cpp:1199
+#: ../src/text-context.cpp:1176
 msgid "Rotate counterclockwise"
 msgstr "Entgegen Uhrzeigersinn drehen"
 
-#: ../src/text-context.cpp:1220
+#: ../src/text-context.cpp:1197
 msgid "Rotate clockwise"
 msgstr "Im Uhrzeigersinn drehen"
 
-#: ../src/text-context.cpp:1237
+#: ../src/text-context.cpp:1214
 msgid "Contract line spacing"
 msgstr "Zeilenabstand vermindern"
 
-#: ../src/text-context.cpp:1244
+#: ../src/text-context.cpp:1221
 msgid "Contract letter spacing"
 msgstr "Zeichenabstand vermindern"
 
-#: ../src/text-context.cpp:1262
+#: ../src/text-context.cpp:1239
 msgid "Expand line spacing"
 msgstr "Zeilenabstand vergrößern"
 
-#: ../src/text-context.cpp:1269
+#: ../src/text-context.cpp:1246
 msgid "Expand letter spacing"
 msgstr "Zeichenabstand vergrößern"
 
-#: ../src/text-context.cpp:1397
+#: ../src/text-context.cpp:1374
 msgid "Paste text"
 msgstr "Text einfügen"
 
-#: ../src/text-context.cpp:1648
+#: ../src/text-context.cpp:1625
 #, c-format
 msgid ""
 "Type or edit flowed text (%d characters%s); <b>Enter</b> to start new "
@@ -13444,14 +13465,14 @@ msgstr ""
 "Fließtext schreiben (%d Zeichen%s); <b>Eingabe</b>, um einen neuen Absatz zu "
 "beginnen."
 
-#: ../src/text-context.cpp:1650
+#: ../src/text-context.cpp:1627
 #, c-format
 msgid "Type or edit text (%d characters%s); <b>Enter</b> to start new line."
 msgstr ""
 "Text schreiben (%d Zeichen%s); <b>Eingabe</b>, um eine neue Zeile zu "
 "beginnen."
 
-#: ../src/text-context.cpp:1658 ../src/tools-switch.cpp:201
+#: ../src/text-context.cpp:1635 ../src/tools-switch.cpp:201
 msgid ""
 "<b>Click</b> to select or create text, <b>drag</b> to create flowed text; "
 "then type."
@@ -13459,7 +13480,7 @@ msgstr ""
 "Zum Auswählen oder Erstellen eines Textobjekts <b>klicken</b>, <b>Ziehen</b> "
 "um Fließtext zu erstellen; anschließend schreiben."
 
-#: ../src/text-context.cpp:1760
+#: ../src/text-context.cpp:1737
 msgid "Type text"
 msgstr "Text eingeben"
 
@@ -13646,31 +13667,31 @@ msgstr "Bitmap vektorisieren"
 msgid "Trace: Done. %ld nodes created"
 msgstr "Vektorisieren abgeschlossen: %ld Knoten erzeugt"
 
-#: ../src/tweak-context.cpp:211
+#: ../src/tweak-context.cpp:187
 #, c-format
 msgid "%s. Drag to <b>move</b>."
 msgstr "%s. Ziehen zum <b>verschieben</b>."
 
-#: ../src/tweak-context.cpp:215
+#: ../src/tweak-context.cpp:191
 #, c-format
 msgid "%s. Drag or click to <b>move in</b>; with Shift to <b>move out</b>."
 msgstr ""
 "%s. Ziehen oder Klicken zum <b>verschieben hinein </b>; mit Umschalttaste "
 "zum <b>verschieben hinaus</b>."
 
-#: ../src/tweak-context.cpp:219
+#: ../src/tweak-context.cpp:195
 #, c-format
 msgid "%s. Drag or click to <b>move randomly</b>."
 msgstr "%s. Ziehen oder Klicken zum <b>zufälligen verschieben</b>."
 
-#: ../src/tweak-context.cpp:223
+#: ../src/tweak-context.cpp:199
 #, c-format
 msgid "%s. Drag or click to <b>scale down</b>; with Shift to <b>scale up</b>."
 msgstr ""
 "%s. Ziehen oder Klicken zum <b>kleiner skalieren</b>; mit Umschalttaste zum "
 "<b>größer skalieren</b>."
 
-#: ../src/tweak-context.cpp:227
+#: ../src/tweak-context.cpp:203
 #, c-format
 msgid ""
 "%s. Drag or click to <b>rotate clockwise</b>; with Shift, "
@@ -13679,48 +13700,48 @@ msgstr ""
 "%s. Ziehen oder Klicken zum <b>Drehen im Uhrzeigersinn</b>; mit "
 "Umschalttaste zum <b>gegen den Uhrzeigersinn</b>."
 
-#: ../src/tweak-context.cpp:231
+#: ../src/tweak-context.cpp:207
 #, c-format
 msgid "%s. Drag or click to <b>duplicate</b>; with Shift, <b>delete</b>."
 msgstr ""
 "%s. Ziehen oder Klicken zum <b>Duplizieren</b>; mit Umschalttaste zum "
 "<b>Löschen</b>."
 
-#: ../src/tweak-context.cpp:235
+#: ../src/tweak-context.cpp:211
 #, c-format
 msgid "%s. Drag to <b>push paths</b>."
 msgstr "%s. Ziehen zum <b> Schieben der Pfade</b>."
 
-#: ../src/tweak-context.cpp:239
+#: ../src/tweak-context.cpp:215
 #, c-format
 msgid "%s. Drag or click to <b>inset paths</b>; with Shift to <b>outset</b>."
 msgstr ""
 "%s. Ziehen oder Klicken <b>zieht</b> Pfade <b>zusammen</b>; mit Umschalt "
 "<b>schiebt sie auseinander</b>."
 
-#: ../src/tweak-context.cpp:247
+#: ../src/tweak-context.cpp:223
 #, c-format
 msgid "%s. Drag or click to <b>attract paths</b>; with Shift to <b>repel</b>."
 msgstr ""
 "%s. Ziehen oder Klicken <b>zieht Pfade an</b>; mit Umschalt <b>stößt es sie "
 "ab</b>."
 
-#: ../src/tweak-context.cpp:255
+#: ../src/tweak-context.cpp:231
 #, c-format
 msgid "%s. Drag or click to <b>roughen paths</b>."
 msgstr "%s. Ziehen oder Klicken um <b>Pfad aufzurauen</b>."
 
-#: ../src/tweak-context.cpp:259
+#: ../src/tweak-context.cpp:235
 #, c-format
 msgid "%s. Drag or click to <b>paint objects</b> with color."
 msgstr "%s. Ziehen oder Klicken um <b>Objekte zu bemalen</b> mit Farbe."
 
-#: ../src/tweak-context.cpp:263
+#: ../src/tweak-context.cpp:239
 #, c-format
 msgid "%s. Drag or click to <b>randomize colors</b>."
 msgstr "%s. Ziehen oder Klicken um <b>Farben zufällig zu setzen</b>."
 
-#: ../src/tweak-context.cpp:267
+#: ../src/tweak-context.cpp:243
 #, c-format
 msgid ""
 "%s. Drag or click to <b>increase blur</b>; with Shift to <b>decrease</b>."
@@ -13728,60 +13749,60 @@ msgstr ""
 "%s. Ziehen oder Klicken um <b>Weichheit zu erhöhen</b>; mit Shift "
 "<b>verringern</b>."
 
-#: ../src/tweak-context.cpp:1233
+#: ../src/tweak-context.cpp:1209
 msgid "<b>Nothing selected!</b> Select objects to tweak."
 msgstr "<b>Nichts ausgewählt!</b> Wähle Objekte zum Justieren aus."
 
-#: ../src/tweak-context.cpp:1267
+#: ../src/tweak-context.cpp:1243
 msgid "Move tweak"
 msgstr "Verschieben-Justage"
 
 # Was bewegt sich?
-#: ../src/tweak-context.cpp:1271
+#: ../src/tweak-context.cpp:1247
 msgid "Move in/out tweak"
 msgstr "Optimieren durch Zusammen-/Auseinanderbewegen"
 
-#: ../src/tweak-context.cpp:1275
+#: ../src/tweak-context.cpp:1251
 msgid "Move jitter tweak"
 msgstr "Bewegungsversatz-Justage"
 
-#: ../src/tweak-context.cpp:1279
+#: ../src/tweak-context.cpp:1255
 msgid "Scale tweak"
 msgstr "Skalieren-Justage"
 
-#: ../src/tweak-context.cpp:1283
+#: ../src/tweak-context.cpp:1259
 msgid "Rotate tweak"
 msgstr "Rotieren-Justage"
 
-#: ../src/tweak-context.cpp:1287
+#: ../src/tweak-context.cpp:1263
 msgid "Duplicate/delete tweak"
 msgstr "Dulizieren-/Löschen-Justage"
 
-#: ../src/tweak-context.cpp:1291
+#: ../src/tweak-context.cpp:1267
 msgid "Push path tweak"
 msgstr "Pfad-Verschieben-Justage"
 
-#: ../src/tweak-context.cpp:1295
+#: ../src/tweak-context.cpp:1271
 msgid "Shrink/grow path tweak"
 msgstr "Schrumpfen-/Weiten-Justage"
 
-#: ../src/tweak-context.cpp:1299
+#: ../src/tweak-context.cpp:1275
 msgid "Attract/repel path tweak"
 msgstr "Pfad-Anziehen-/-Abstoßen-Justage"
 
-#: ../src/tweak-context.cpp:1303
+#: ../src/tweak-context.cpp:1279
 msgid "Roughen path tweak"
 msgstr "Pfadrauheit-Justage"
 
-#: ../src/tweak-context.cpp:1307
+#: ../src/tweak-context.cpp:1283
 msgid "Color paint tweak"
 msgstr "Farb-Justage"
 
-#: ../src/tweak-context.cpp:1311
+#: ../src/tweak-context.cpp:1287
 msgid "Color jitter tweak"
 msgstr "Farbrauschen-Justage"
 
-#: ../src/tweak-context.cpp:1315
+#: ../src/tweak-context.cpp:1291
 msgid "Blur tweak"
 msgstr "Unschärfe-Justage"
 
@@ -13950,7 +13971,7 @@ msgid "Rearrange"
 msgstr "Anordnen"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:900
-#: ../src/widgets/toolbox.cpp:1773
+#: ../src/widgets/toolbox.cpp:1724
 msgid "Nodes"
 msgstr "Knoten"
 
@@ -14130,7 +14151,7 @@ msgstr "Kleinstes Objekt"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:1049
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1550 ../src/verbs.cpp:174
-#: ../src/widgets/desktop-widget.cpp:1901
+#: ../src/widgets/desktop-widget.cpp:1920
 #: ../share/extensions/printing_marks.inx.h:18
 msgid "Selection"
 msgstr "Auswahl"
@@ -14164,27 +14185,27 @@ msgstr ""
 msgid "Change color definition"
 msgstr "Farbdefinition ändern"
 
-#: ../src/ui/dialog/color-item.cpp:723
+#: ../src/ui/dialog/color-item.cpp:678
 msgid "Remove stroke color"
 msgstr "Konturfarbe entfernen"
 
-#: ../src/ui/dialog/color-item.cpp:723
+#: ../src/ui/dialog/color-item.cpp:678
 msgid "Remove fill color"
 msgstr "Füllfarbe entfernen"
 
-#: ../src/ui/dialog/color-item.cpp:728
+#: ../src/ui/dialog/color-item.cpp:683
 msgid "Set stroke color to none"
 msgstr "Farbe der Kontur auf nichts setzen"
 
-#: ../src/ui/dialog/color-item.cpp:728
+#: ../src/ui/dialog/color-item.cpp:683
 msgid "Set fill color to none"
 msgstr "Füllungsfarbe auf nichts setzen"
 
-#: ../src/ui/dialog/color-item.cpp:744
+#: ../src/ui/dialog/color-item.cpp:699
 msgid "Set stroke color from swatch"
 msgstr "Konturfarbe aus der Farbfelder-Palette auswählen"
 
-#: ../src/ui/dialog/color-item.cpp:744
+#: ../src/ui/dialog/color-item.cpp:699
 msgid "Set fill color from swatch"
 msgstr "Füllfarbe aus der Farbfelder-Palette auswählen"
 
@@ -14464,7 +14485,7 @@ msgid "Remove selected grid."
 msgstr "Ausgewähltes Gitter entfernen."
 
 #: ../src/ui/dialog/document-properties.cpp:145
-#: ../src/widgets/toolbox.cpp:1880
+#: ../src/widgets/toolbox.cpp:1831
 msgid "Guides"
 msgstr "Führungslinien"
 
@@ -16897,7 +16918,7 @@ msgstr "Objekt-Farbstil"
 
 #. Zoom
 #: ../src/ui/dialog/inkscape-preferences.cpp:376
-#: ../src/widgets/desktop-widget.cpp:613
+#: ../src/widgets/desktop-widget.cpp:632
 msgid "Zoom"
 msgstr "Zoomfaktor"
 
@@ -19146,6 +19167,11 @@ msgstr "Benutzerdefinierte Tastaturkürzel in eine Datei exportieren"
 msgid "Keyboard Shortcuts"
 msgstr "Tastaturkürzel"
 
+#. Find this group in the tree
+#: ../src/ui/dialog/inkscape-preferences.cpp:1654
+msgid "Misc"
+msgstr "Sonstiges"
+
 #: ../src/ui/dialog/inkscape-preferences.cpp:1773
 msgid "Set the main spell check language"
 msgstr "Setzen der Hauptsprache der Rechtschreibprüfung"
@@ -19368,11 +19394,6 @@ msgstr "Achsen"
 msgid "Keys"
 msgstr "Schlüssel"
 
-#: ../src/ui/dialog/input.cpp:1002 ../src/widgets/spray-toolbar.cpp:202
-#: ../src/widgets/tweak-toolbar.cpp:272
-msgid "Mode"
-msgstr "Modus"
-
 #: ../src/ui/dialog/input.cpp:1084
 msgid ""
 "A device can be 'Disabled', its co-ordinates mapped to the whole 'Screen', "
@@ -19678,9 +19699,9 @@ msgid "URL:"
 msgstr "URL:"
 
 #: ../src/ui/dialog/object-properties.cpp:54
-#: ../src/ui/dialog/object-properties.cpp:265
-#: ../src/ui/dialog/object-properties.cpp:322
-#: ../src/ui/dialog/object-properties.cpp:329
+#: ../src/ui/dialog/object-properties.cpp:275
+#: ../src/ui/dialog/object-properties.cpp:332
+#: ../src/ui/dialog/object-properties.cpp:339
 msgid "_ID:"
 msgstr "_ID: "
 
@@ -19710,7 +19731,7 @@ msgid "_Interactivity"
 msgstr "_Interaktivität"
 
 #. Create the entry box for the object id
-#: ../src/ui/dialog/object-properties.cpp:114
+#: ../src/ui/dialog/object-properties.cpp:124
 msgid ""
 "The id= attribute (only letters, digits, and the characters .-_: allowed)"
 msgstr ""
@@ -19718,63 +19739,63 @@ msgstr ""
 "\" zulässig)"
 
 #. Create the entry box for the object label
-#: ../src/ui/dialog/object-properties.cpp:134
+#: ../src/ui/dialog/object-properties.cpp:144
 msgid "A freeform label for the object"
 msgstr "Freiform-Bezeichner des Objektes"
 
 #. Hide
-#: ../src/ui/dialog/object-properties.cpp:183
+#: ../src/ui/dialog/object-properties.cpp:193
 msgid "Check to make the object invisible"
 msgstr "Aktivieren macht das Objekt unsichtbar"
 
 #. Lock
 #. TRANSLATORS: "Lock" is a verb here
-#: ../src/ui/dialog/object-properties.cpp:191
+#: ../src/ui/dialog/object-properties.cpp:201
 msgid "Check to make the object insensitive (not selectable by mouse)"
 msgstr "Aktivieren macht das Objekt unempfindlich (nicht durch Maus anwählbar)"
 
-#: ../src/ui/dialog/object-properties.cpp:252
-#: ../src/ui/dialog/object-properties.cpp:257
+#: ../src/ui/dialog/object-properties.cpp:262
+#: ../src/ui/dialog/object-properties.cpp:267
 msgid "Ref"
 msgstr "Ref"
 
-#: ../src/ui/dialog/object-properties.cpp:324
+#: ../src/ui/dialog/object-properties.cpp:334
 msgid "Id invalid! "
 msgstr "ID-Kennung ungültig!"
 
-#: ../src/ui/dialog/object-properties.cpp:326
+#: ../src/ui/dialog/object-properties.cpp:336
 msgid "Id exists! "
 msgstr "ID-Kennung existiert!"
 
-#: ../src/ui/dialog/object-properties.cpp:332
+#: ../src/ui/dialog/object-properties.cpp:342
 msgid "Set object ID"
 msgstr "Objektkennung setzen"
 
-#: ../src/ui/dialog/object-properties.cpp:346
+#: ../src/ui/dialog/object-properties.cpp:356
 msgid "Set object label"
 msgstr "Objektbezeichner setzen"
 
-#: ../src/ui/dialog/object-properties.cpp:352
+#: ../src/ui/dialog/object-properties.cpp:362
 msgid "Set object title"
 msgstr "Objekttitel setzen"
 
-#: ../src/ui/dialog/object-properties.cpp:360
+#: ../src/ui/dialog/object-properties.cpp:370
 msgid "Set object description"
 msgstr "Objektbeschreibung setzen"
 
-#: ../src/ui/dialog/object-properties.cpp:378
+#: ../src/ui/dialog/object-properties.cpp:388
 msgid "Lock object"
 msgstr "Objekt sperren"
 
-#: ../src/ui/dialog/object-properties.cpp:378
+#: ../src/ui/dialog/object-properties.cpp:388
 msgid "Unlock object"
 msgstr "Objektsperrung aufheben"
 
-#: ../src/ui/dialog/object-properties.cpp:395
+#: ../src/ui/dialog/object-properties.cpp:405
 msgid "Hide object"
 msgstr "Objekte ausblenden"
 
-#: ../src/ui/dialog/object-properties.cpp:395
+#: ../src/ui/dialog/object-properties.cpp:405
 msgid "Unhide object"
 msgstr "Ausgeblendete Objekte anzeigen"
 
@@ -20728,7 +20749,7 @@ msgstr "Knoten Horizontal umkehren"
 msgid "Flip nodes vertically"
 msgstr "Knoten Vertikal umkehren"
 
-#: ../src/ui/tool/node-tool.cpp:574
+#: ../src/ui/tool/node-tool.cpp:555
 msgctxt "Node tool tip"
 msgid ""
 "<b>Shift</b>: drag to add nodes to the selection, click to toggle object "
@@ -20737,19 +20758,19 @@ msgstr ""
 "<b>Shift</b>: Ziehen, um Knoten zur Auswahl hinzuzufügen. Klicken, um die "
 "Auswahl umzuschalten."
 
-#: ../src/ui/tool/node-tool.cpp:578
+#: ../src/ui/tool/node-tool.cpp:559
 msgctxt "Node tool tip"
 msgid "<b>Shift</b>: drag to add nodes to the selection"
 msgstr "<b>Umschalt</b>: Ziehen, um Knoten zur Auswahl hinzuzufügen"
 
-#: ../src/ui/tool/node-tool.cpp:587
+#: ../src/ui/tool/node-tool.cpp:568
 #, c-format
 msgid "<b>%u of %u</b> node selected."
 msgid_plural "<b>%u of %u</b> nodes selected."
 msgstr[0] "<b>%u von %u</b> Knoten ausgewählt."
 msgstr[1] "<b>%u von %u</b> Knoten ausgewählt."
 
-#: ../src/ui/tool/node-tool.cpp:592
+#: ../src/ui/tool/node-tool.cpp:573
 #, c-format
 msgctxt "Node tool tip"
 msgid "%s Drag to select nodes, click to edit only this object (more: Shift)"
@@ -20757,31 +20778,31 @@ msgstr ""
 "%s Ziehen, um Knoten auszuwählen. Klicken, um nur dieses Objekt zu "
 "bearbeiten (mehr: Umschalt)"
 
-#: ../src/ui/tool/node-tool.cpp:598
+#: ../src/ui/tool/node-tool.cpp:579
 #, c-format
 msgctxt "Node tool tip"
 msgid "%s Drag to select nodes, click clear the selection"
 msgstr "%s Ziehen, um Knoten auszuwählen. Klicken, um Auswahl zu löschen"
 
-#: ../src/ui/tool/node-tool.cpp:607
+#: ../src/ui/tool/node-tool.cpp:588
 msgctxt "Node tool tip"
 msgid "Drag to select nodes, click to edit only this object"
 msgstr ""
 "Ziehen, um Knoten auszuwählen. Klicken, um nur dieses Objekt zu bearbeiten."
 
-#: ../src/ui/tool/node-tool.cpp:610
+#: ../src/ui/tool/node-tool.cpp:591
 msgctxt "Node tool tip"
 msgid "Drag to select nodes, click to clear the selection"
 msgstr "Ziehen, um Knoten auszuwählen. Klicken, um Auswahl zu löschen"
 
-#: ../src/ui/tool/node-tool.cpp:615
+#: ../src/ui/tool/node-tool.cpp:596
 msgctxt "Node tool tip"
 msgid "Drag to select objects to edit, click to edit this object (more: Shift)"
 msgstr ""
 "Ziehen um Objekte zum Bearbeiten auszuwählen und Klicken, um das Objekt zu "
 "bearbeiten (mehr: Shift)"
 
-#: ../src/ui/tool/node-tool.cpp:618
+#: ../src/ui/tool/node-tool.cpp:599
 msgctxt "Node tool tip"
 msgid "Drag to select objects to edit"
 msgstr "Ziehen, um Objekte zum bearbeiten auszuwählen"
@@ -24615,20 +24636,20 @@ msgstr "Muster der Strichlinien"
 msgid "Pattern offset"
 msgstr "Versatz des Musters"
 
-#: ../src/widgets/desktop-widget.cpp:446
+#: ../src/widgets/desktop-widget.cpp:462
 msgid "Zoom drawing if window size changes"
 msgstr "Zeichnungsgröße mit Fenstergröße verändern"
 
-#: ../src/widgets/desktop-widget.cpp:647
+#: ../src/widgets/desktop-widget.cpp:666
 msgid "Cursor coordinates"
 msgstr "Zeigerkoordinaten"
 
-#: ../src/widgets/desktop-widget.cpp:673
+#: ../src/widgets/desktop-widget.cpp:692
 msgid "Z:"
 msgstr "Z:"
 
 #. display the initial welcome message in the statusbar
-#: ../src/widgets/desktop-widget.cpp:716
+#: ../src/widgets/desktop-widget.cpp:735
 msgid ""
 "<b>Welcome to Inkscape!</b> Use shape or freehand tools to create objects; "
 "use selector (arrow) to move or transform them."
@@ -24636,71 +24657,71 @@ msgstr ""
 "<b>Willkommen zu Inkscape!</b> Formen- und Freihandwerkzeuge erstellen "
 "Objekte; das Auswahlwerkzeug (Pfeil) verschiebt und bearbeitet."
 
-#: ../src/widgets/desktop-widget.cpp:797
+#: ../src/widgets/desktop-widget.cpp:823
 msgid "grayscale"
 msgstr "Graustufen"
 
-#: ../src/widgets/desktop-widget.cpp:798
+#: ../src/widgets/desktop-widget.cpp:824
 msgid ", grayscale"
 msgstr ", Graustufen"
 
-#: ../src/widgets/desktop-widget.cpp:799
+#: ../src/widgets/desktop-widget.cpp:825
 msgid "print colors preview"
 msgstr "_Druckfarben-Vorschau"
 
-#: ../src/widgets/desktop-widget.cpp:800
+#: ../src/widgets/desktop-widget.cpp:826
 msgid ", print colors preview"
 msgstr ", Druckfarben-Vorschau"
 
-#: ../src/widgets/desktop-widget.cpp:801
+#: ../src/widgets/desktop-widget.cpp:827
 msgid "outline"
 msgstr "Umriss"
 
-#: ../src/widgets/desktop-widget.cpp:802
+#: ../src/widgets/desktop-widget.cpp:828
 msgid "no filters"
 msgstr "Keine _Filter"
 
-#: ../src/widgets/desktop-widget.cpp:829
+#: ../src/widgets/desktop-widget.cpp:855
 #, c-format
 msgid "%s%s: %d (%s%s) - Inkscape"
 msgstr "%s%s: %d (%s%s) - Inkscape"
 
-#: ../src/widgets/desktop-widget.cpp:831 ../src/widgets/desktop-widget.cpp:835
+#: ../src/widgets/desktop-widget.cpp:857 ../src/widgets/desktop-widget.cpp:861
 #, c-format
 msgid "%s%s: %d (%s) - Inkscape"
 msgstr "%s%s: %d (%s) - Inkscape"
 
-#: ../src/widgets/desktop-widget.cpp:837
+#: ../src/widgets/desktop-widget.cpp:863
 #, c-format
 msgid "%s%s: %d - Inkscape"
 msgstr "%s%s: %d - Inkscape"
 
-#: ../src/widgets/desktop-widget.cpp:843
+#: ../src/widgets/desktop-widget.cpp:869
 #, c-format
 msgid "%s%s (%s%s) - Inkscape"
 msgstr "%s%s (%s%s) - Inkscape"
 
-#: ../src/widgets/desktop-widget.cpp:845 ../src/widgets/desktop-widget.cpp:849
+#: ../src/widgets/desktop-widget.cpp:871 ../src/widgets/desktop-widget.cpp:875
 #, c-format
 msgid "%s%s (%s) - Inkscape"
 msgstr "%s%s (%s) - Inkscape"
 
-#: ../src/widgets/desktop-widget.cpp:851
+#: ../src/widgets/desktop-widget.cpp:877
 #, c-format
 msgid "%s%s - Inkscape"
 msgstr "%s%s - Inkscape"
 
 # ???
-#: ../src/widgets/desktop-widget.cpp:1019
+#: ../src/widgets/desktop-widget.cpp:1045
 msgid "Color-managed display is <b>enabled</b> in this window"
 msgstr "Farbverwaltungsansicht ist in diesem Fenster <b>eingeschaltet</b>"
 
 # ???
-#: ../src/widgets/desktop-widget.cpp:1021
+#: ../src/widgets/desktop-widget.cpp:1047
 msgid "Color-managed display is <b>disabled</b> in this window"
 msgstr "Farbverwaltungsansicht ist in diesem Fenster <b>ausgeschaltet</b>"
 
-#: ../src/widgets/desktop-widget.cpp:1076
+#: ../src/widgets/desktop-widget.cpp:1102
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before "
@@ -24713,12 +24734,12 @@ msgstr ""
 "\n"
 "Wenn Sie schließen, ohne zu speichern, dann gehen Ihre Änderungen verloren."
 
-#: ../src/widgets/desktop-widget.cpp:1086
-#: ../src/widgets/desktop-widget.cpp:1145
+#: ../src/widgets/desktop-widget.cpp:1112
+#: ../src/widgets/desktop-widget.cpp:1171
 msgid "Close _without saving"
 msgstr "Schließen, _ohne zu speichern"
 
-#: ../src/widgets/desktop-widget.cpp:1135
+#: ../src/widgets/desktop-widget.cpp:1161
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a "
@@ -24731,12 +24752,12 @@ msgstr ""
 "\n"
 "Möchten Sie das Dokument als ein Inkscape SVG speichern?"
 
-#: ../src/widgets/desktop-widget.cpp:1147
+#: ../src/widgets/desktop-widget.cpp:1173
 msgid "_Save as Inkscape SVG"
 msgstr "Als Inkscape-_SVG speichern"
 
 # CHECK
-#: ../src/widgets/desktop-widget.cpp:1357
+#: ../src/widgets/desktop-widget.cpp:1383
 msgid "Note:"
 msgstr "Hinweis:"
 
@@ -25919,6 +25940,10 @@ msgstr "Sprühe einzelnen Pfad"
 msgid "Spray objects in a single path"
 msgstr "Sprüht Objekte in einen einzelnen Pfad"
 
+#: ../src/widgets/spray-toolbar.cpp:202 ../src/widgets/tweak-toolbar.cpp:272
+msgid "Mode"
+msgstr "Modus"
+
 #. Population
 #: ../src/widgets/spray-toolbar.cpp:222
 msgid "(low population)"
@@ -26402,11 +26427,11 @@ msgstr ""
 msgid "Set markers"
 msgstr "Markierungen setzen"
 
-#: ../src/widgets/stroke-style.cpp:1067 ../src/widgets/stroke-style.cpp:1160
+#: ../src/widgets/stroke-style.cpp:1068 ../src/widgets/stroke-style.cpp:1161
 msgid "Set stroke style"
 msgstr "Stil der Kontur setzen"
 
-#: ../src/widgets/stroke-style.cpp:1248
+#: ../src/widgets/stroke-style.cpp:1249
 msgid "Set marker color"
 msgstr "Farbe der Markierung setzen"
 
@@ -26698,133 +26723,133 @@ msgstr "\"Beschreibung fehlt noch!\""
 msgid "Style of Paint Bucket fill objects"
 msgstr "Stil von neuen Farbeimer-Objekten"
 
-#: ../src/widgets/toolbox.cpp:1727
+#: ../src/widgets/toolbox.cpp:1678
 msgid "Bounding box"
 msgstr "Umrandungsbox"
 
-#: ../src/widgets/toolbox.cpp:1727
+#: ../src/widgets/toolbox.cpp:1678
 msgid "Snap bounding boxes"
 msgstr "An der Umrandung einrasten"
 
-#: ../src/widgets/toolbox.cpp:1736
+#: ../src/widgets/toolbox.cpp:1687
 msgid "Bounding box edges"
 msgstr "Kanten der Umrandung"
 
-#: ../src/widgets/toolbox.cpp:1736
+#: ../src/widgets/toolbox.cpp:1687
 msgid "Snap to edges of a bounding box"
 msgstr "An Kanten einer Umrandung einrasten"
 
-#: ../src/widgets/toolbox.cpp:1745
+#: ../src/widgets/toolbox.cpp:1696
 msgid "Bounding box corners"
 msgstr "Ecken der Umrandung"
 
-#: ../src/widgets/toolbox.cpp:1745
+#: ../src/widgets/toolbox.cpp:1696
 msgid "Snap bounding box corners"
 msgstr "An Ecken der Umrandung einrasten"
 
-#: ../src/widgets/toolbox.cpp:1754
+#: ../src/widgets/toolbox.cpp:1705
 msgid "BBox Edge Midpoints"
 msgstr "Mittenpunkte der Umrandungskanten"
 
-#: ../src/widgets/toolbox.cpp:1754
+#: ../src/widgets/toolbox.cpp:1705
 msgid "Snap midpoints of bounding box edges"
 msgstr "An Mittelpunkten von Umrandungslinien ein-/ausrasten"
 
-#: ../src/widgets/toolbox.cpp:1764
+#: ../src/widgets/toolbox.cpp:1715
 msgid "BBox Centers"
 msgstr "Mittelpunkt Umrandung"
 
-#: ../src/widgets/toolbox.cpp:1764
+#: ../src/widgets/toolbox.cpp:1715
 msgid "Snapping centers of bounding boxes"
 msgstr "An Mittelpunkten von Umrandungen ein-/ausrasten"
 
-#: ../src/widgets/toolbox.cpp:1773
+#: ../src/widgets/toolbox.cpp:1724
 msgid "Snap nodes, paths, and handles"
 msgstr "Knoten, Pfade und Anfasser einrasten"
 
-#: ../src/widgets/toolbox.cpp:1781
+#: ../src/widgets/toolbox.cpp:1732
 msgid "Snap to paths"
 msgstr "An Objektpfaden einrasten"
 
-#: ../src/widgets/toolbox.cpp:1790
+#: ../src/widgets/toolbox.cpp:1741
 msgid "Path intersections"
 msgstr "Pfadüberschneidung"
 
-#: ../src/widgets/toolbox.cpp:1790
+#: ../src/widgets/toolbox.cpp:1741
 msgid "Snap to path intersections"
 msgstr "An Pfadüberschneidungen einrasten"
 
-#: ../src/widgets/toolbox.cpp:1799
+#: ../src/widgets/toolbox.cpp:1750
 msgid "To nodes"
 msgstr "An Knoten"
 
-#: ../src/widgets/toolbox.cpp:1799
+#: ../src/widgets/toolbox.cpp:1750
 msgid "Snap cusp nodes, incl. rectangle corners"
 msgstr "An spitzen Knoten einrasten (inkl. Ecken von Rechtecken)"
 
-#: ../src/widgets/toolbox.cpp:1808
+#: ../src/widgets/toolbox.cpp:1759
 msgid "Smooth nodes"
 msgstr "Glatte Knotten"
 
-#: ../src/widgets/toolbox.cpp:1808
+#: ../src/widgets/toolbox.cpp:1759
 msgid "Snap smooth nodes, incl. quadrant points of ellipses"
 msgstr "Einrasten an glatten Knoten, inkl. Quadrant-Punkten von Ellipsen"
 
-#: ../src/widgets/toolbox.cpp:1817
+#: ../src/widgets/toolbox.cpp:1768
 msgid "Line Midpoints"
 msgstr "Linien-Mittelpunkte"
 
-#: ../src/widgets/toolbox.cpp:1817
+#: ../src/widgets/toolbox.cpp:1768
 msgid "Snap midpoints of line segments"
 msgstr "Einrasten an Mittelpunkten von Liniensegmenten"
 
-#: ../src/widgets/toolbox.cpp:1826
+#: ../src/widgets/toolbox.cpp:1777
 msgid "Others"
 msgstr "Andere"
 
-#: ../src/widgets/toolbox.cpp:1826
+#: ../src/widgets/toolbox.cpp:1777
 msgid "Snap other points (centers, guide origins, gradient handles, etc.)"
 msgstr ""
 "Einrasten an anderen Punkten (Zentren, Führungslinien-Ursprung, "
 "Verlaufsanfasser, etc.)"
 
-#: ../src/widgets/toolbox.cpp:1834
+#: ../src/widgets/toolbox.cpp:1785
 msgid "Object Centers"
 msgstr "Objektzentrum"
 
-#: ../src/widgets/toolbox.cpp:1834
+#: ../src/widgets/toolbox.cpp:1785
 msgid "Snap centers of objects"
 msgstr "An Objektmittelpunkten einrasten"
 
-#: ../src/widgets/toolbox.cpp:1843
+#: ../src/widgets/toolbox.cpp:1794
 msgid "Rotation Centers"
 msgstr "Rotationszentren"
 
-#: ../src/widgets/toolbox.cpp:1843
+#: ../src/widgets/toolbox.cpp:1794
 msgid "Snap an item's rotation center"
 msgstr "An Rotationszentren von Objekten einrasten"
 
-#: ../src/widgets/toolbox.cpp:1852
+#: ../src/widgets/toolbox.cpp:1803
 msgid "Text baseline"
 msgstr "Text-Grundlinie"
 
-#: ../src/widgets/toolbox.cpp:1852
+#: ../src/widgets/toolbox.cpp:1803
 msgid "Snap text anchors and baselines"
 msgstr "An TExtankern und Grundlinien einrasten"
 
-#: ../src/widgets/toolbox.cpp:1862
+#: ../src/widgets/toolbox.cpp:1813
 msgid "Page border"
 msgstr "Seitenrand"
 
-#: ../src/widgets/toolbox.cpp:1862
+#: ../src/widgets/toolbox.cpp:1813
 msgid "Snap to the page border"
 msgstr "Am Seitenrand einrasten"
 
-#: ../src/widgets/toolbox.cpp:1871
+#: ../src/widgets/toolbox.cpp:1822
 msgid "Snap to grids"
 msgstr "Am Gitter einrasten"
 
-#: ../src/widgets/toolbox.cpp:1880
+#: ../src/widgets/toolbox.cpp:1831
 msgid "Snap guides"
 msgstr "An Führungslinien einrasten"
 
@@ -27861,7 +27886,7 @@ msgstr ""
 msgid "Could not locate file: %s"
 msgstr "Konnte Datei nicht finden: %s"
 
-#: ../share/extensions/uniconv-ext.py:55
+#: ../share/extensions/uniconv-ext.py:56
 #: ../share/extensions/uniconv_output.py:122
 msgid "You need to install the UniConvertor software.\n"
 msgstr "Sie müssen die Software \"UniConvertor\" installieren!\n"
@@ -33173,33 +33198,252 @@ msgstr "Ein beliebtes Dateiformat für Clipart"
 msgid "XAML Input"
 msgstr "XAML einlesen"
 
-#~ msgid "Nudge CMY"
-#~ msgstr "Präzisionsausrichtung RGB"
+#~ msgid ""
+#~ "The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter "
+#~ "primitives create \"embossed\" shadings.  The input's alpha channel is "
+#~ "used to provide depth information: higher opacity areas are raised toward "
+#~ "the viewer and lower opacity areas recede away from the viewer."
+#~ msgstr ""
+#~ "Die Filterbausteine <b>DiffuseBeleuchtung</b> und "
+#~ "<b>Punktlichtbeleuchtung</b> erzeugen \"Relief\"-Schattierungen. Der "
+#~ "Alphakanal des Eingangs wird verwendet, um Tiefeninformationen zu "
+#~ "erhalten: opakere Gebiete werden angehoben, weniger opake abgesenkt."
 
-#~ msgid "Cyan offset"
-#~ msgstr "Blau-Versatz"
+#~ msgid "Icons only"
+#~ msgstr "nur Symbole"
+
+#~ msgid "Text only"
+#~ msgstr "nur Text"
+
+#~ msgid "Icons and text"
+#~ msgstr "Symbole und Text"
+
+#~ msgid "Dockbar style (requires restart):"
+#~ msgstr "Dockleistenstil (erfordert Neustart)"
+
+#~ msgid ""
+#~ "Selects whether the vertical bars on the dockbar will show text labels, "
+#~ "icons, or both"
+#~ msgstr ""
+#~ "Wählt, ob vertikale Leisten auf der Dockleiste Beschriftungen, Symbole "
+#~ "oder beides angezeigen"
+
+#~ msgid "Switcher style (requires restart):"
+#~ msgstr "Stil des Umschalters (erfordert Neustart):"
+
+#~ msgid ""
+#~ "Selects whether the dockbar switcher will show text labels, icons, or both"
+#~ msgstr ""
+#~ "Wählt aus, ob der Dockleisten-Umschalter Beschriftungen, Symbole oder "
+#~ "beides zeigt"
+
+#~ msgid "Put every clipped/masked object in its own group"
+#~ msgstr ""
+#~ "Jedes ausgeschnittene/maskierte Objekt in seiner eigenen Gruppe anlegen"
+
+#~ msgid "Select all text with this font-family"
+#~ msgstr "Wähle allen Text mit dieser Schriftart-Familie aus"
+
+#~ msgid "Corel DRAW Compressed Exchange files input (UC)"
+#~ msgstr "Corel DRAW Compressed Exchange Datei einlesen (UC)"
+
+#~ msgid "Corel DRAW Compressed Exchange files (UC) (.ccx)"
+#~ msgstr "Corel DRAW Komprimierte Exchange Datei (UC) (.ccx)"
+
+#~ msgid "Open compressed exchange files saved in Corel DRAW (UC)"
+#~ msgstr ""
+#~ "Öffnen einer komprimierten Exchange Datei, die in Corel DRAW gespeichert "
+#~ "wurde (UC)"
+
+#~ msgid "Corel DRAW Input (UC)"
+#~ msgstr "Corel DRAW (UC) einlesen"
+
+#~ msgid "Corel DRAW 7-X4 files (UC) (*.cdr)"
+#~ msgstr "Corel DRAW 7-X4 (UC) Dateien (*.cdr)"
+
+#~ msgid "Open files saved in Corel DRAW 7-X4 (UC)"
+#~ msgstr "In Corel DRAW 7-X4 (UC) gespeicherte Dateien öffnen"
+
+#~ msgid "Corel DRAW templates input (UC)"
+#~ msgstr "Corel DRAW Vorlagen einlesen (UC)"
+
+#~ msgid "Corel DRAW 7-13 template files (UC) (.cdt)"
+#~ msgstr "Corel DRAW 7-13 Vorlagendateien (UC) (.cdt)"
+
+#~ msgid "Open files saved in Corel DRAW 7-13 (UC)"
+#~ msgstr "In Corel DRAW 7-13 gespeicherte Dateien öffnen (UC)"
+
+#~ msgid "Corel DRAW Presentation Exchange files input (UC)"
+#~ msgstr "Corel DRAW Presentations Exchange Datei einlesen (UC)"
+
+#~ msgid "Corel DRAW Presentation Exchange files (UC) (.cmx)"
+#~ msgstr "Corel DRAW Presentations Exchange Datei (UC) (.cmx)"
+
+#~ msgid "Open presentation exchange files saved in Corel DRAW (UC)"
+#~ msgstr ""
+#~ "Öffnen einer Presentation Exchange Datei, die in Corel DRAW gespeichert "
+#~ "wurde (UC)"
+
+#~ msgid ""
+#~ "Please make sure that all objects you want to plot are converted to "
+#~ "paths. The plot will automatically be aligned to the zero point."
+#~ msgstr ""
+#~ "Bitte achten Sie darauf, dass alle Objekte, die Sie plotten möchten in "
+#~ "Pfade konvertiert wurden. Der Plot wird automatisch auf den Nullpunkt "
+#~ "ausgerichtet."
+
+#~ msgid ""
+#~ "The amount of steps the cutter moves if it moves for 1 inch, either get "
+#~ "this value from your plotter manual or learn it by trial and error "
+#~ "(Standard: '1016')"
+#~ msgstr ""
+#~ "Die Anzahl der Schritte, die sich der Schneider bewegt, wenn er sich, um "
+#~ "1 Zoll bewegt, erhält diesen Wert aus Ihrem Plotter manuell oder lernt es "
+#~ "durch Versuch und Fehler (Standard: '1016')"
+
+#~ msgid ""
+#~ "The number of the pen (tool) to use, on most plotters 1 (Standard: '1')"
+#~ msgstr ""
+#~ "Die Nummer des Stiftes (Werkzeug) zum Verwenden, ist auf den meisten "
+#~ "Plottern 1 (Standard: '1')"
+
+#~ msgid ""
+#~ "Orientation of the plot, change this if your plotter is plotting "
+#~ "horizontal instead of vertical (Standard: '-90°')"
+#~ msgstr ""
+#~ "Ausrichtung des Plots, ändern Sie dies wenn Ihr Plotter horizontal statt "
+#~ "vertikal plottet (Standard: '-90 °')"
+
+#~ msgid ""
+#~ "Whether to mirror the Y axis. Some plotters need this, some not. Look in "
+#~ "your plotter manual or learn it by trial and error (Standard: 'False')"
+#~ msgstr ""
+#~ "Prüfen, die Y-Achse zu spiegeln. Einige Plotter brauchen dies, andere "
+#~ "nicht. Sehen Sie im Handbuch zu Ihrem Plotter nach oder es lernen durch "
+#~ "Versuch und Fehler (Standard: 'Aus')"
+
+#~ msgid "Curve flatness (mm)"
+#~ msgstr "Kurven-Ebenheit (mm)"
+
+#~ msgid ""
+#~ "Curves get divided into lines, this is the approximate length of one line "
+#~ "in mm (Standard: '0.50')"
+#~ msgstr ""
+#~ "Kurven werden in Zeilen aufgeteilt, dies ist die ungefähre Länge einer "
+#~ "einzelnen Zeile in mm (Standard: '0.50')"
+
+#~ msgid "Use Overcut"
+#~ msgstr "Überschnitt nutzen"
+
+#~ msgid ""
+#~ "Whether the overcut will be used, if not the 'Overcut' parameter is "
+#~ "unused (Standard: 'True')"
+#~ msgstr ""
+#~ "Prüfen, ob der Überschnitt verwendet werden soll, wenn nicht, wird der "
+#~ "'Überschnitt'-Parameter nicht verwendet (Standard: 'Ein')"
+
+#~ msgid "Overcut (mm)"
+#~ msgstr "Überschnitt (mm)"
+
+#~ msgid ""
+#~ "The distance in mm that will be cut over the starting point of the path "
+#~ "to prevent open paths (Standard: '1.00')"
+#~ msgstr ""
+#~ "Der Abstand in mm, mit dem über den Ausgangspunkt des Pfades geschnitten "
+#~ "wird, um offene Pfade zu schützen (Standard: '1.00')"
+
+#~ msgid "Correct tool offset"
+#~ msgstr "Werkzeugversatz korrigieren"
+
+#~ msgid ""
+#~ "Whether the tool offset should be corrected, if not the 'Tool offset' and "
+#~ "'Return Factor' parameters are unused (Standard: 'True')"
+#~ msgstr ""
+#~ "Prüfen, ob der Werkzeugversatz behoben werden sollte. Wenn nicht, sind "
+#~ "'Werkzeugversatz' und 'Return-Faktor' -Parameter unbenutzt (Standard: "
+#~ "'Ein')"
+
+#~ msgid "Tool offset (mm)"
+#~ msgstr "Werkzeugversatz (mm)"
+
+#~ msgid ""
+#~ "The offset from the tool tip to the tool axis in mm (Standard: '0.25')"
+#~ msgstr ""
+#~ "Der Versatz zwischen Werkzeugspitze und -achse in mm (Standard: '0.25')"
+
+#~ msgid "Return Factor"
+#~ msgstr "Return-Faktor"
+
+#~ msgid ""
+#~ "The return factor multiplied by the tool offset is the length that is "
+#~ "used to guide the tool back to the original path after an overcut is "
+#~ "performed, you can only determine this value by experimentation "
+#~ "(Standard: '2.50')"
+#~ msgstr ""
+#~ "Der Return-Faktor multipliziert mit dem Werkzeugversatz ist die Länge, "
+#~ "die verwendet wird, um das Werkzeug wieder auf den ursprünglichen Pfad zu "
+#~ "führen, nachdem ein Überschnitt durchgeführt wird. Sie können diesen Wert "
+#~ "nur durch Experimentieren bestimmen (Standard: '2,50')"
+
+#~ msgid "X offset (mm)"
+#~ msgstr "X Versatz (mm)"
+
+#~ msgid ""
+#~ "The offset to move your plot away from the zero point in mm (Standard: "
+#~ "'0.00')"
+#~ msgstr ""
+#~ "Der Versatz, um Ihren Plot vom Null-Punkt weg zu verschieben in mm "
+#~ "(Standard: '0.00')"
+
+#~ msgid "Y offset (mm)"
+#~ msgstr "Y Versatz (mm)"
+
+#~ msgid "Plot invisible layers (Standard: 'False')"
+#~ msgstr "Plotte unsichtbare Ebenen (Standard: \"Aus')"
+
+#~ msgid "Send to Plotter also"
+#~ msgstr "Auch zum Plotter schicken"
+
+#~ msgid ""
+#~ "Sends the generated HPGL data also via serial connection to your plotter "
+#~ "(Standard: 'False')"
+#~ msgstr ""
+#~ "Sendet die erzeugten HPGL-Daten auch über eine serielle Verbindung auf "
+#~ "Ihren Plotter (Standard: 'Aus')"
+
+#~ msgid "Serial Port"
+#~ msgstr "Serieller Port"
+
+#~ msgid ""
+#~ "The port of your serial connection, on Windows something like 'COM1', on "
+#~ "Linux something like: '/dev/ttyUSB0' (Standard: 'COM1')"
+#~ msgstr ""
+#~ "Der Anschluss Ihrer seriellen Verbindung ist unter Windows so etwas wie "
+#~ "'COM1', unter Linux  so etwas wie: '/dev/ttyUSB0' (Standard: 'COM1')"
 
-#~ msgid "Magenta offset"
-#~ msgstr "Rot-Versatz"
+#~ msgid "Baud Rate"
+#~ msgstr "Baudrate"
 
-#~ msgid "Yellow offset"
-#~ msgstr "Gelb-Versatz"
+#~ msgid "The Baud rate of your serial connection (Standard: '9600')"
+#~ msgstr "Die Baudrate ihrer Serial-Verbindung (Standard '9600')"
 
 #~ msgid ""
-#~ "Nudge CMY channels separately and blend them to different types of "
-#~ "backgrounds"
+#~ "This effect scatters or bends a pattern along arbitrary \"skeleton\" "
+#~ "paths. The pattern is the topmost object in the selection. Groups of "
+#~ "paths, shapes or clones are allowed."
 #~ msgstr ""
-#~ "Präzisionsausrichtung nach RGB-Kanälen getrennt und mischt sie zu "
-#~ "verschiedenen Typen von Hintergründen"
+#~ "Dieser Effekt verstreut oder verbiegt ein Muster entlang eines beliebigen "
+#~ "\"Gerüst-\"Pfades. Das Muster ist das oberste Objekt in der Auswahl. "
+#~ "Gruppierungen von Pfaden, Formen oder Klonen sind erlaubt."
 
-#~ msgid "Shadow type:"
-#~ msgstr "Schatten-Typ:"
+#~ msgid "Blur type:"
+#~ msgstr "Unschärfe-Typ:"
 
-#~ msgid "Shadow only"
-#~ msgstr "nur Schatten"
+#~ msgid "Blend source:"
+#~ msgstr "Mischquelle:"
 
-#~ msgid "Misc"
-#~ msgstr "Sonstiges"
+#~ msgid "Composite:"
+#~ msgstr "Zusammengesetzt:"
 
 #~ msgid "Add a new connection point"
 #~ msgstr "Neuer Verbindungspunkt"
diff --git a/po/inkscape.pot b/po/inkscape.pot
index 62ebea657..4328ca75d 100644
--- a/po/inkscape.pot
+++ b/po/inkscape.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2013-01-30 12:08+0100\n"
+"POT-Creation-Date: 2013-02-25 22:03+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -246,7 +246,7 @@ msgstr ""
 
 #. Pencil
 #: ../share/filters/filters.svg.h:1
-#: ../src/ui/dialog/inkscape-preferences.cpp:415
+#: ../src/ui/dialog/inkscape-preferences.cpp:416
 msgid "Pencil"
 msgstr ""
 
@@ -365,7 +365,7 @@ msgstr ""
 
 #: ../share/filters/filters.svg.h:1
 #: ../src/extension/internal/filter/bumps.h:142
-#: ../src/extension/internal/filter/bumps.h:365
+#: ../src/extension/internal/filter/bumps.h:362
 msgid "Bumps"
 msgstr ""
 
@@ -949,8 +949,8 @@ msgstr ""
 #: ../src/ui/dialog/clonetiler.cpp:983
 #: ../src/extension/internal/bitmap/colorize.cpp:52
 #: ../src/extension/internal/filter/bumps.h:101
-#: ../src/extension/internal/filter/bumps.h:324
-#: ../src/extension/internal/filter/bumps.h:331
+#: ../src/extension/internal/filter/bumps.h:321
+#: ../src/extension/internal/filter/bumps.h:328
 #: ../src/extension/internal/filter/color.h:82
 #: ../src/extension/internal/filter/color.h:164
 #: ../src/extension/internal/filter/color.h:171
@@ -4057,186 +4057,186 @@ msgstr ""
 msgid "<small>Randomize:</small>"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:138 ../src/widgets/measure-toolbar.cpp:116
+#: ../src/ui/dialog/export.cpp:143 ../src/widgets/measure-toolbar.cpp:116
 #: ../src/widgets/measure-toolbar.cpp:124 ../share/extensions/gears.inx.h:6
 msgid "Units:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:140
+#: ../src/ui/dialog/export.cpp:145
 msgid "_Export As..."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:143
+#: ../src/ui/dialog/export.cpp:148
 msgid "B_atch export all selected objects"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:143
+#: ../src/ui/dialog/export.cpp:148
 msgid ""
 "Export each selected object into its own PNG file, using export hints if any "
 "(caution, overwrites without asking!)"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:145
+#: ../src/ui/dialog/export.cpp:150
 msgid "Hide a_ll except selected"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:145
+#: ../src/ui/dialog/export.cpp:150
 msgid "In the exported image, hide all objects except those that are selected"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:146
+#: ../src/ui/dialog/export.cpp:151
 msgid "Close when complete"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:146
+#: ../src/ui/dialog/export.cpp:151
 msgid "Once the export completes, close this dialog"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:148
+#: ../src/ui/dialog/export.cpp:153
 msgid "_Export"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:166
+#: ../src/ui/dialog/export.cpp:171
 msgid "<b>Export area</b>"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:196
+#: ../src/ui/dialog/export.cpp:201
 msgid "_x0:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:200
+#: ../src/ui/dialog/export.cpp:205
 msgid "x_1:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:204
+#: ../src/ui/dialog/export.cpp:209
 msgid "Wid_th:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:208
+#: ../src/ui/dialog/export.cpp:213
 msgid "_y0:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:212
+#: ../src/ui/dialog/export.cpp:217
 msgid "y_1:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:216
+#: ../src/ui/dialog/export.cpp:221
 msgid "Hei_ght:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:231
+#: ../src/ui/dialog/export.cpp:236
 msgid "<b>Image size</b>"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:241 ../src/live_effects/lpe-bendpath.cpp:54
+#: ../src/ui/dialog/export.cpp:246 ../src/live_effects/lpe-bendpath.cpp:54
 #: ../src/live_effects/lpe-patternalongpath.cpp:62
 #: ../src/ui/dialog/transformation.cpp:75 ../src/ui/widget/page-sizer.cpp:238
 msgid "_Width:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:241 ../src/ui/dialog/export.cpp:252
+#: ../src/ui/dialog/export.cpp:246 ../src/ui/dialog/export.cpp:257
 msgid "pixels at"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:247
+#: ../src/ui/dialog/export.cpp:252
 msgid "dp_i"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:252 ../src/ui/dialog/transformation.cpp:77
+#: ../src/ui/dialog/export.cpp:257 ../src/ui/dialog/transformation.cpp:77
 #: ../src/ui/widget/page-sizer.cpp:239
 msgid "_Height:"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:260
-#: ../src/ui/dialog/inkscape-preferences.cpp:1384
-#: ../src/ui/dialog/inkscape-preferences.cpp:1387
-#: ../src/ui/dialog/inkscape-preferences.cpp:1396
+#: ../src/ui/dialog/export.cpp:265
+#: ../src/ui/dialog/inkscape-preferences.cpp:1403
+#: ../src/ui/dialog/inkscape-preferences.cpp:1406
+#: ../src/ui/dialog/inkscape-preferences.cpp:1415
 msgid "dpi"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:268
+#: ../src/ui/dialog/export.cpp:273
 msgid "<b>_Filename</b>"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:310
+#: ../src/ui/dialog/export.cpp:315
 msgid "Export the bitmap file with these settings"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:545
+#: ../src/ui/dialog/export.cpp:550
 #, c-format
 msgid "B_atch export %d selected object"
 msgid_plural "B_atch export %d selected objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/ui/dialog/export.cpp:861
+#: ../src/ui/dialog/export.cpp:866
 msgid "Export in progress"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:945
+#: ../src/ui/dialog/export.cpp:950
 msgid "No items selected."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:949 ../src/ui/dialog/export.cpp:951
+#: ../src/ui/dialog/export.cpp:954 ../src/ui/dialog/export.cpp:956
 msgid "Exporting %1 files"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:991 ../src/ui/dialog/export.cpp:993
+#: ../src/ui/dialog/export.cpp:996 ../src/ui/dialog/export.cpp:998
 #, c-format
 msgid "Exporting file <b>%s</b>..."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1002 ../src/ui/dialog/export.cpp:1093
+#: ../src/ui/dialog/export.cpp:1007 ../src/ui/dialog/export.cpp:1098
 #, c-format
 msgid "Could not export to filename %s.\n"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1005
+#: ../src/ui/dialog/export.cpp:1010
 #, c-format
 msgid "Could not export to filename <b>%s</b>."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1020
+#: ../src/ui/dialog/export.cpp:1025
 #, c-format
 msgid "Successfully exported <b>%d</b> files from <b>%d</b> selected items."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1031
+#: ../src/ui/dialog/export.cpp:1036
 msgid "You have to enter a filename."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1032
+#: ../src/ui/dialog/export.cpp:1037
 msgid "You have to enter a filename"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1046
+#: ../src/ui/dialog/export.cpp:1051
 msgid "The chosen area to be exported is invalid."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1047
+#: ../src/ui/dialog/export.cpp:1052
 msgid "The chosen area to be exported is invalid"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1062
+#: ../src/ui/dialog/export.cpp:1067
 #, c-format
 msgid "Directory %s does not exist or is not a directory.\n"
 msgstr ""
 
 #. TRANSLATORS: %1 will be the filename, %2 the width, and %3 the height of the image
-#: ../src/ui/dialog/export.cpp:1076 ../src/ui/dialog/export.cpp:1078
+#: ../src/ui/dialog/export.cpp:1081 ../src/ui/dialog/export.cpp:1083
 msgid "Exporting %1 (%2 x %3)"
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1104
+#: ../src/ui/dialog/export.cpp:1109
 #, c-format
 msgid "Drawing exported to <b>%s</b>."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1108
+#: ../src/ui/dialog/export.cpp:1113
 msgid "Export aborted."
 msgstr ""
 
-#: ../src/ui/dialog/export.cpp:1226 ../src/ui/dialog/export.cpp:1260
+#: ../src/ui/dialog/export.cpp:1231 ../src/ui/dialog/export.cpp:1265
 msgid "Select a filename for exporting"
 msgstr ""
 
@@ -4476,31 +4476,31 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()"
 msgstr ""
 
 #. Align buttons
-#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1568
-#: ../src/widgets/text-toolbar.cpp:1569
+#: ../src/ui/dialog/text-edit.cpp:94 ../src/widgets/text-toolbar.cpp:1360
+#: ../src/widgets/text-toolbar.cpp:1361
 msgid "Align left"
 msgstr ""
 
-#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1576
-#: ../src/widgets/text-toolbar.cpp:1577
+#: ../src/ui/dialog/text-edit.cpp:95 ../src/widgets/text-toolbar.cpp:1368
+#: ../src/widgets/text-toolbar.cpp:1369
 msgid "Align center"
 msgstr ""
 
-#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1584
-#: ../src/widgets/text-toolbar.cpp:1585
+#: ../src/ui/dialog/text-edit.cpp:96 ../src/widgets/text-toolbar.cpp:1376
+#: ../src/widgets/text-toolbar.cpp:1377
 msgid "Align right"
 msgstr ""
 
-#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1593
+#: ../src/ui/dialog/text-edit.cpp:97 ../src/widgets/text-toolbar.cpp:1385
 msgid "Justify (only flowed text)"
 msgstr ""
 
 #. Direction buttons
-#: ../src/ui/dialog/text-edit.cpp:106 ../src/widgets/text-toolbar.cpp:1628
+#: ../src/ui/dialog/text-edit.cpp:106 ../src/widgets/text-toolbar.cpp:1420
 msgid "Horizontal text"
 msgstr ""
 
-#: ../src/ui/dialog/text-edit.cpp:107 ../src/widgets/text-toolbar.cpp:1635
+#: ../src/ui/dialog/text-edit.cpp:107 ../src/widgets/text-toolbar.cpp:1427
 msgid "Vertical text"
 msgstr ""
 
@@ -4626,8 +4626,8 @@ msgid "_Origin X:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:323 ../src/display/canvas-grid.cpp:696
-#: ../src/ui/dialog/inkscape-preferences.cpp:708
-#: ../src/ui/dialog/inkscape-preferences.cpp:733
+#: ../src/ui/dialog/inkscape-preferences.cpp:727
+#: ../src/ui/dialog/inkscape-preferences.cpp:752
 msgid "X coordinate of grid origin"
 msgstr ""
 
@@ -4636,8 +4636,8 @@ msgid "O_rigin Y:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:325 ../src/display/canvas-grid.cpp:698
-#: ../src/ui/dialog/inkscape-preferences.cpp:709
-#: ../src/ui/dialog/inkscape-preferences.cpp:734
+#: ../src/ui/dialog/inkscape-preferences.cpp:728
+#: ../src/ui/dialog/inkscape-preferences.cpp:753
 msgid "Y coordinate of grid origin"
 msgstr ""
 
@@ -4646,29 +4646,29 @@ msgid "Spacing _Y:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:327
-#: ../src/ui/dialog/inkscape-preferences.cpp:737
+#: ../src/ui/dialog/inkscape-preferences.cpp:756
 msgid "Base length of z-axis"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:329
-#: ../src/ui/dialog/inkscape-preferences.cpp:740
+#: ../src/ui/dialog/inkscape-preferences.cpp:759
 #: ../src/widgets/box3d-toolbar.cpp:320
 msgid "Angle X:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:329
-#: ../src/ui/dialog/inkscape-preferences.cpp:740
+#: ../src/ui/dialog/inkscape-preferences.cpp:759
 msgid "Angle of x-axis"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:331
-#: ../src/ui/dialog/inkscape-preferences.cpp:741
+#: ../src/ui/dialog/inkscape-preferences.cpp:760
 #: ../src/widgets/box3d-toolbar.cpp:399
 msgid "Angle Z:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:331
-#: ../src/ui/dialog/inkscape-preferences.cpp:741
+#: ../src/ui/dialog/inkscape-preferences.cpp:760
 msgid "Angle of z-axis"
 msgstr ""
 
@@ -4677,7 +4677,7 @@ msgid "Minor grid line _color:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:335 ../src/display/canvas-grid.cpp:706
-#: ../src/ui/dialog/inkscape-preferences.cpp:692
+#: ../src/ui/dialog/inkscape-preferences.cpp:711
 msgid "Minor grid line color"
 msgstr ""
 
@@ -4690,7 +4690,7 @@ msgid "Ma_jor grid line color:"
 msgstr ""
 
 #: ../src/display/canvas-axonomgrid.cpp:340 ../src/display/canvas-grid.cpp:711
-#: ../src/ui/dialog/inkscape-preferences.cpp:694
+#: ../src/ui/dialog/inkscape-preferences.cpp:713
 msgid "Major grid line color"
 msgstr ""
 
@@ -4753,12 +4753,12 @@ msgid "Spacing _X:"
 msgstr ""
 
 #: ../src/display/canvas-grid.cpp:700
-#: ../src/ui/dialog/inkscape-preferences.cpp:714
+#: ../src/ui/dialog/inkscape-preferences.cpp:733
 msgid "Distance between vertical grid lines"
 msgstr ""
 
 #: ../src/display/canvas-grid.cpp:702
-#: ../src/ui/dialog/inkscape-preferences.cpp:715
+#: ../src/ui/dialog/inkscape-preferences.cpp:734
 msgid "Distance between horizontal grid lines"
 msgstr ""
 
@@ -5096,23 +5096,23 @@ msgstr ""
 msgid "_Redo"
 msgstr ""
 
-#: ../src/extension/dependency.cpp:235
+#: ../src/extension/dependency.cpp:237
 msgid "Dependency:"
 msgstr ""
 
-#: ../src/extension/dependency.cpp:236
+#: ../src/extension/dependency.cpp:238
 msgid "  type: "
 msgstr ""
 
-#: ../src/extension/dependency.cpp:237
+#: ../src/extension/dependency.cpp:239
 msgid "  location: "
 msgstr ""
 
-#: ../src/extension/dependency.cpp:238
+#: ../src/extension/dependency.cpp:240
 msgid "  string: "
 msgstr ""
 
-#: ../src/extension/dependency.cpp:241
+#: ../src/extension/dependency.cpp:243
 msgid "  description: "
 msgstr ""
 
@@ -5218,19 +5218,19 @@ msgid ""
 "this extension."
 msgstr ""
 
-#: ../src/extension/implementation/script.cpp:1005
+#: ../src/extension/implementation/script.cpp:1014
 msgid ""
 "Inkscape has received additional data from the script executed.  The script "
 "did not return an error, but this may indicate the results will not be as "
 "expected."
 msgstr ""
 
-#: ../src/extension/init.cpp:290
+#: ../src/extension/init.cpp:296
 msgid "Null external module directory name.  Modules will not be loaded."
 msgstr ""
 
-#: ../src/extension/init.cpp:304
-#: ../src/extension/internal/filter/filter-file.cpp:58
+#: ../src/extension/init.cpp:310
+#: ../src/extension/internal/filter/filter-file.cpp:59
 #, c-format
 msgid ""
 "Modules directory (%s) is unavailable.  External modules in that directory "
@@ -5259,7 +5259,7 @@ msgstr ""
 #: ../src/extension/internal/bitmap/raise.cpp:43
 #: ../src/extension/internal/bitmap/sample.cpp:42
 #: ../src/extension/internal/filter/bumps.h:98
-#: ../src/extension/internal/filter/bumps.h:332
+#: ../src/extension/internal/filter/bumps.h:329
 #: ../src/ui/dialog/object-attributes.cpp:68
 #: ../src/ui/dialog/object-attributes.cpp:76
 #: ../share/extensions/foldablebox.inx.h:3
@@ -5329,8 +5329,8 @@ msgstr ""
 #: ../src/extension/internal/filter/color.h:1585
 #: ../src/extension/internal/filter/distort.h:69
 #: ../src/extension/internal/filter/morphology.h:60 ../src/rdf.cpp:241
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2523
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2602
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2507
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2586
 #: ../src/ui/dialog/object-attributes.cpp:48
 #: ../share/extensions/jessyInk_effects.inx.h:5
 #: ../share/extensions/jessyInk_export.inx.h:3
@@ -5380,7 +5380,7 @@ msgstr ""
 #: ../src/extension/internal/bitmap/oilPaint.cpp:39
 #: ../src/extension/internal/bitmap/sharpen.cpp:40
 #: ../src/extension/internal/bitmap/unsharpmask.cpp:43
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2580
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2564
 msgid "Radius:"
 msgstr ""
 
@@ -5690,7 +5690,7 @@ msgstr ""
 
 #: ../src/extension/internal/bitmap/opacity.cpp:40
 #: ../src/extension/internal/filter/blurs.h:333
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2570
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2554
 #: ../src/widgets/dropper-toolbar.cpp:112
 msgid "Opacity:"
 msgstr ""
@@ -5743,13 +5743,13 @@ msgstr ""
 
 #: ../src/extension/internal/bitmap/shade.cpp:42
 #: ../src/extension/internal/filter/bumps.h:110
-#: ../src/extension/internal/filter/bumps.h:335
+#: ../src/extension/internal/filter/bumps.h:332
 msgid "Azimuth:"
 msgstr ""
 
 #: ../src/extension/internal/bitmap/shade.cpp:43
 #: ../src/extension/internal/filter/bumps.h:111
-#: ../src/extension/internal/filter/bumps.h:336
+#: ../src/extension/internal/filter/bumps.h:333
 msgid "Elevation:"
 msgstr ""
 
@@ -6048,7 +6048,7 @@ msgstr ""
 #: ../src/extension/internal/filter/blurs.h:266
 #: ../src/extension/internal/filter/blurs.h:350
 #: ../src/extension/internal/filter/bumps.h:141
-#: ../src/extension/internal/filter/bumps.h:364
+#: ../src/extension/internal/filter/bumps.h:361
 #: ../src/extension/internal/filter/color.h:81
 #: ../src/extension/internal/filter/color.h:170
 #: ../src/extension/internal/filter/color.h:261
@@ -6068,7 +6068,7 @@ msgstr ""
 #: ../src/extension/internal/filter/color.h:1615
 #: ../src/extension/internal/filter/distort.h:95
 #: ../src/extension/internal/filter/distort.h:204
-#: ../src/extension/internal/filter/filter-file.cpp:150
+#: ../src/extension/internal/filter/filter-file.cpp:151
 #: ../src/extension/internal/filter/filter.cpp:214
 #: ../src/extension/internal/filter/image.h:61
 #: ../src/extension/internal/filter/morphology.h:75
@@ -6165,8 +6165,8 @@ msgstr ""
 #: ../src/extension/internal/filter/blurs.h:192
 #: ../src/extension/internal/filter/blurs.h:339
 #: ../src/extension/internal/filter/bumps.h:131
-#: ../src/extension/internal/filter/bumps.h:340
-#: ../src/extension/internal/filter/bumps.h:347
+#: ../src/extension/internal/filter/bumps.h:337
+#: ../src/extension/internal/filter/bumps.h:344
 #: ../src/extension/internal/filter/color.h:329
 #: ../src/extension/internal/filter/color.h:336
 #: ../src/extension/internal/filter/color.h:1423
@@ -6181,8 +6181,8 @@ msgstr ""
 #: ../src/extension/internal/filter/blurs.h:193
 #: ../src/extension/internal/filter/blurs.h:340
 #: ../src/extension/internal/filter/bumps.h:132
-#: ../src/extension/internal/filter/bumps.h:338
-#: ../src/extension/internal/filter/bumps.h:345
+#: ../src/extension/internal/filter/bumps.h:335
+#: ../src/extension/internal/filter/bumps.h:342
 #: ../src/extension/internal/filter/color.h:327
 #: ../src/extension/internal/filter/color.h:332
 #: ../src/extension/internal/filter/color.h:647
@@ -6198,8 +6198,8 @@ msgstr ""
 #: ../src/extension/internal/filter/blurs.h:194
 #: ../src/extension/internal/filter/blurs.h:341
 #: ../src/extension/internal/filter/bumps.h:133
-#: ../src/extension/internal/filter/bumps.h:341
-#: ../src/extension/internal/filter/bumps.h:348
+#: ../src/extension/internal/filter/bumps.h:338
+#: ../src/extension/internal/filter/bumps.h:345
 #: ../src/extension/internal/filter/color.h:325
 #: ../src/extension/internal/filter/color.h:333
 #: ../src/extension/internal/filter/color.h:645
@@ -6216,8 +6216,8 @@ msgstr ""
 #: ../src/extension/internal/filter/blurs.h:195
 #: ../src/extension/internal/filter/blurs.h:342
 #: ../src/extension/internal/filter/bumps.h:134
-#: ../src/extension/internal/filter/bumps.h:342
-#: ../src/extension/internal/filter/bumps.h:349
+#: ../src/extension/internal/filter/bumps.h:339
+#: ../src/extension/internal/filter/bumps.h:346
 #: ../src/extension/internal/filter/color.h:328
 #: ../src/extension/internal/filter/color.h:335
 #: ../src/extension/internal/filter/color.h:1422
@@ -6281,8 +6281,8 @@ msgstr ""
 
 #: ../src/extension/internal/filter/blurs.h:338
 #: ../src/extension/internal/filter/bumps.h:130
-#: ../src/extension/internal/filter/bumps.h:339
-#: ../src/extension/internal/filter/bumps.h:346
+#: ../src/extension/internal/filter/bumps.h:336
+#: ../src/extension/internal/filter/bumps.h:343
 #: ../src/extension/internal/filter/color.h:326
 #: ../src/extension/internal/filter/color.h:334
 #: ../src/extension/internal/filter/color.h:646
@@ -6294,7 +6294,7 @@ msgstr ""
 #: ../src/extension/internal/filter/paint.h:703
 #: ../src/extension/internal/filter/textures.h:77
 #: ../src/extension/internal/filter/transparency.h:61
-#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:624
+#: ../src/filter-enums.cpp:51 ../src/ui/dialog/inkscape-preferences.cpp:643
 msgid "Normal"
 msgstr ""
 
@@ -6311,27 +6311,27 @@ msgid "Bump"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:84
-#: ../src/extension/internal/filter/bumps.h:316
+#: ../src/extension/internal/filter/bumps.h:313
 msgid "Image simplification:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:85
-#: ../src/extension/internal/filter/bumps.h:317
+#: ../src/extension/internal/filter/bumps.h:314
 msgid "Bump simplification:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:86
-#: ../src/extension/internal/filter/bumps.h:318
+#: ../src/extension/internal/filter/bumps.h:315
 msgid "Crop:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:87
-#: ../src/extension/internal/filter/bumps.h:319
+#: ../src/extension/internal/filter/bumps.h:316
 msgid "Bump source"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:88
-#: ../src/extension/internal/filter/bumps.h:320
+#: ../src/extension/internal/filter/bumps.h:317
 #: ../src/extension/internal/filter/color.h:157
 #: ../src/extension/internal/filter/color.h:821
 #: ../src/extension/internal/filter/transparency.h:132
@@ -6339,7 +6339,7 @@ msgid "Red:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:89
-#: ../src/extension/internal/filter/bumps.h:321
+#: ../src/extension/internal/filter/bumps.h:318
 #: ../src/extension/internal/filter/color.h:158
 #: ../src/extension/internal/filter/color.h:822
 #: ../src/extension/internal/filter/transparency.h:133
@@ -6347,7 +6347,7 @@ msgid "Green:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:90
-#: ../src/extension/internal/filter/bumps.h:322
+#: ../src/extension/internal/filter/bumps.h:319
 #: ../src/extension/internal/filter/color.h:159
 #: ../src/extension/internal/filter/color.h:823
 #: ../src/extension/internal/filter/transparency.h:134
@@ -6371,7 +6371,7 @@ msgid "Diffuse"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:99
-#: ../src/extension/internal/filter/bumps.h:333
+#: ../src/extension/internal/filter/bumps.h:330
 #: ../src/extension/internal/filter/color.h:76
 #: ../src/extension/internal/filter/color.h:824
 #: ../src/extension/internal/filter/color.h:1113
@@ -6382,7 +6382,7 @@ msgid "Lightness:"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:100
-#: ../src/extension/internal/filter/bumps.h:334
+#: ../src/extension/internal/filter/bumps.h:331
 #: ../share/extensions/measure.inx.h:8
 msgid "Precision:"
 msgstr ""
@@ -6400,7 +6400,7 @@ msgid "Distant"
 msgstr ""
 
 #: ../src/extension/internal/filter/bumps.h:106 ../src/helper/units.cpp:38
-#: ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Point"
 msgstr ""
 
@@ -6467,67 +6467,67 @@ msgstr ""
 msgid "All purposes bump filter"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:312
+#: ../src/extension/internal/filter/bumps.h:309
 msgid "Wax Bump"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:323
+#: ../src/extension/internal/filter/bumps.h:320
 msgid "Background:"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:325
+#: ../src/extension/internal/filter/bumps.h:322
 #: ../src/extension/internal/filter/transparency.h:57
 #: ../src/filter-enums.cpp:29 ../src/selection-describer.cpp:55
 msgid "Image"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:326
+#: ../src/extension/internal/filter/bumps.h:323
 msgid "Blurred image"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:328
+#: ../src/extension/internal/filter/bumps.h:325
 msgid "Background opacity:"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:330
+#: ../src/extension/internal/filter/bumps.h:327
 #: ../src/extension/internal/filter/color.h:1040
 msgid "Lighting"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:337
+#: ../src/extension/internal/filter/bumps.h:334
 msgid "Lighting blend:"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:344
+#: ../src/extension/internal/filter/bumps.h:341
 msgid "Highlight blend:"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:353
+#: ../src/extension/internal/filter/bumps.h:350
 msgid "Bump color"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:354
+#: ../src/extension/internal/filter/bumps.h:351
 msgid "Revert bump"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:355
+#: ../src/extension/internal/filter/bumps.h:352
 msgid "Transparency type:"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:356
+#: ../src/extension/internal/filter/bumps.h:353
 #: ../src/extension/internal/filter/morphology.h:176
 #: ../src/filter-enums.cpp:74
 msgid "Atop"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:357
+#: ../src/extension/internal/filter/bumps.h:354
 #: ../src/extension/internal/filter/distort.h:70
 #: ../src/extension/internal/filter/morphology.h:174
 #: ../src/filter-enums.cpp:72
 msgid "In"
 msgstr ""
 
-#: ../src/extension/internal/filter/bumps.h:368
+#: ../src/extension/internal/filter/bumps.h:365
 msgid "Turns an image to jelly"
 msgstr ""
 
@@ -7008,7 +7008,7 @@ msgstr ""
 #: ../src/extension/internal/filter/distort.h:77
 #: ../src/extension/internal/filter/textures.h:75
 #: ../src/ui/widget/selected-style.cpp:125
-#: ../src/ui/widget/style-swatch.cpp:120
+#: ../src/ui/widget/style-swatch.cpp:121
 msgid "Stroke:"
 msgstr ""
 
@@ -7103,15 +7103,15 @@ msgstr ""
 msgid "Small-scale roughening to edges and content"
 msgstr ""
 
-#: ../src/extension/internal/filter/filter-file.cpp:33
+#: ../src/extension/internal/filter/filter-file.cpp:34
 msgid "Bundled"
 msgstr ""
 
-#: ../src/extension/internal/filter/filter-file.cpp:34
+#: ../src/extension/internal/filter/filter-file.cpp:35
 msgid "Personal"
 msgstr ""
 
-#: ../src/extension/internal/filter/filter-file.cpp:46
+#: ../src/extension/internal/filter/filter-file.cpp:47
 msgid "Null external module directory name.  Filters will not be loaded."
 msgstr ""
 
@@ -7363,11 +7363,11 @@ msgstr ""
 
 #: ../src/extension/internal/filter/paint.h:332
 #: ../src/ui/dialog/align-and-distribute.cpp:1048
-#: ../src/widgets/desktop-widget.cpp:1916
+#: ../src/widgets/desktop-widget.cpp:1923
 msgid "Drawing"
 msgstr ""
 
-#: ../src/extension/internal/filter/paint.h:336 ../src/splivarot.cpp:2007
+#: ../src/extension/internal/filter/paint.h:336 ../src/splivarot.cpp:2010
 msgid "Simplify"
 msgstr ""
 
@@ -7662,7 +7662,7 @@ msgid "Background"
 msgstr ""
 
 #: ../src/extension/internal/filter/transparency.h:59
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2520
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2504
 #: ../src/ui/dialog/input.cpp:1002 ../src/widgets/erasor-toolbar.cpp:129
 #: ../src/widgets/pencil-toolbar.cpp:162 ../src/widgets/spray-toolbar.cpp:203
 #: ../src/widgets/tweak-toolbar.cpp:273 ../share/extensions/extrude.inx.h:2
@@ -7806,7 +7806,7 @@ msgstr ""
 
 #: ../src/extension/internal/grid.cpp:212
 #: ../src/ui/dialog/document-properties.cpp:146
-#: ../src/ui/dialog/inkscape-preferences.cpp:749
+#: ../src/ui/dialog/inkscape-preferences.cpp:768
 #: ../src/widgets/toolbox.cpp:1822
 msgid "Grids"
 msgstr ""
@@ -7815,15 +7815,15 @@ msgstr ""
 msgid "Draw a path which is a grid"
 msgstr ""
 
-#: ../src/extension/internal/javafx-out.cpp:964
+#: ../src/extension/internal/javafx-out.cpp:966
 msgid "JavaFX Output"
 msgstr ""
 
-#: ../src/extension/internal/javafx-out.cpp:969
+#: ../src/extension/internal/javafx-out.cpp:971
 msgid "JavaFX (*.fx)"
 msgstr ""
 
-#: ../src/extension/internal/javafx-out.cpp:970
+#: ../src/extension/internal/javafx-out.cpp:972
 msgid "JavaFX Raytracer File"
 msgstr ""
 
@@ -8076,131 +8076,131 @@ msgstr ""
 msgid "Is the effect previewed live on canvas?"
 msgstr ""
 
-#: ../src/extension/system.cpp:154 ../src/extension/system.cpp:156
+#: ../src/extension/system.cpp:125 ../src/extension/system.cpp:127
 msgid "Format autodetect failed. The file is being opened as SVG."
 msgstr ""
 
-#: ../src/file.cpp:154
+#: ../src/file.cpp:155
 msgid "default.svg"
 msgstr ""
 
-#: ../src/file.cpp:285
+#: ../src/file.cpp:286
 msgid "Broken links have been changed to point to existing files."
 msgstr ""
 
-#: ../src/file.cpp:296 ../src/file.cpp:1222
+#: ../src/file.cpp:297 ../src/file.cpp:1223
 #, c-format
 msgid "Failed to load the requested file %s"
 msgstr ""
 
-#: ../src/file.cpp:322
+#: ../src/file.cpp:323
 msgid "Document not saved yet.  Cannot revert."
 msgstr ""
 
-#: ../src/file.cpp:328
+#: ../src/file.cpp:329
 #, c-format
 msgid "Changes will be lost!  Are you sure you want to reload document %s?"
 msgstr ""
 
-#: ../src/file.cpp:357
+#: ../src/file.cpp:358
 msgid "Document reverted."
 msgstr ""
 
-#: ../src/file.cpp:359
+#: ../src/file.cpp:360
 msgid "Document not reverted."
 msgstr ""
 
-#: ../src/file.cpp:509
+#: ../src/file.cpp:510
 msgid "Select file to open"
 msgstr ""
 
-#: ../src/file.cpp:593
+#: ../src/file.cpp:594
 msgid "Clean up document"
 msgstr ""
 
-#: ../src/file.cpp:598
+#: ../src/file.cpp:599
 #, c-format
 msgid "Removed <b>%i</b> unused definition in &lt;defs&gt;."
 msgid_plural "Removed <b>%i</b> unused definitions in &lt;defs&gt;."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/file.cpp:603
+#: ../src/file.cpp:604
 msgid "No unused definitions in &lt;defs&gt;."
 msgstr ""
 
-#: ../src/file.cpp:634
+#: ../src/file.cpp:635
 #, c-format
 msgid ""
 "No Inkscape extension found to save document (%s).  This may have been "
 "caused by an unknown filename extension."
 msgstr ""
 
-#: ../src/file.cpp:635 ../src/file.cpp:643 ../src/file.cpp:651
-#: ../src/file.cpp:657 ../src/file.cpp:662
+#: ../src/file.cpp:636 ../src/file.cpp:644 ../src/file.cpp:652
+#: ../src/file.cpp:658 ../src/file.cpp:663
 msgid "Document not saved."
 msgstr ""
 
-#: ../src/file.cpp:642
+#: ../src/file.cpp:643
 #, c-format
 msgid ""
 "File %s is write protected. Please remove write protection and try again."
 msgstr ""
 
-#: ../src/file.cpp:650
+#: ../src/file.cpp:651
 #, c-format
 msgid "File %s could not be saved."
 msgstr ""
 
-#: ../src/file.cpp:680 ../src/file.cpp:682
+#: ../src/file.cpp:681 ../src/file.cpp:683
 msgid "Document saved."
 msgstr ""
 
 #. We are saving for the first time; create a unique default filename
-#: ../src/file.cpp:830 ../src/file.cpp:1385
+#: ../src/file.cpp:831 ../src/file.cpp:1386
 #, c-format
 msgid "drawing%s"
 msgstr ""
 
-#: ../src/file.cpp:836
+#: ../src/file.cpp:837
 #, c-format
 msgid "drawing-%d%s"
 msgstr ""
 
-#: ../src/file.cpp:840
+#: ../src/file.cpp:841
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: ../src/file.cpp:855
+#: ../src/file.cpp:856
 msgid "Select file to save a copy to"
 msgstr ""
 
-#: ../src/file.cpp:857
+#: ../src/file.cpp:858
 msgid "Select file to save to"
 msgstr ""
 
-#: ../src/file.cpp:963 ../src/file.cpp:965
+#: ../src/file.cpp:964 ../src/file.cpp:966
 msgid "No changes need to be saved."
 msgstr ""
 
-#: ../src/file.cpp:984
+#: ../src/file.cpp:985
 msgid "Saving document..."
 msgstr ""
 
-#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1238
+#: ../src/file.cpp:1220 ../src/ui/dialog/ocaldialogs.cpp:1238
 msgid "Import"
 msgstr ""
 
-#: ../src/file.cpp:1269
+#: ../src/file.cpp:1270
 msgid "Select file to import"
 msgstr ""
 
-#: ../src/file.cpp:1407
+#: ../src/file.cpp:1408
 msgid "Select file to export to"
 msgstr ""
 
-#: ../src/file.cpp:1660
+#: ../src/file.cpp:1661
 msgid "Import Clip Art"
 msgstr ""
 
@@ -8306,11 +8306,11 @@ msgstr ""
 
 #: ../src/filter-enums.cpp:94 ../src/live_effects/lpe-ruler.cpp:32
 #: ../src/ui/dialog/filter-effects-dialog.cpp:490
-#: ../src/ui/dialog/inkscape-preferences.cpp:332
-#: ../src/ui/dialog/inkscape-preferences.cpp:623
-#: ../src/ui/dialog/inkscape-preferences.cpp:1214
-#: ../src/ui/dialog/inkscape-preferences.cpp:1371
-#: ../src/ui/dialog/inkscape-preferences.cpp:1752
+#: ../src/ui/dialog/inkscape-preferences.cpp:333
+#: ../src/ui/dialog/inkscape-preferences.cpp:642
+#: ../src/ui/dialog/inkscape-preferences.cpp:1233
+#: ../src/ui/dialog/inkscape-preferences.cpp:1390
+#: ../src/ui/dialog/inkscape-preferences.cpp:1771
 #: ../src/ui/dialog/input.cpp:693 ../src/ui/dialog/input.cpp:694
 #: ../src/ui/dialog/input.cpp:1485 ../src/ui/dialog/input.cpp:1539
 #: ../src/verbs.cpp:2300 ../src/widgets/gradient-toolbar.cpp:1128
@@ -8367,7 +8367,7 @@ msgstr ""
 msgid "Hue"
 msgstr ""
 
-#: ../src/flood-context.cpp:232 ../src/ui/dialog/inkscape-preferences.cpp:903
+#: ../src/flood-context.cpp:232 ../src/ui/dialog/inkscape-preferences.cpp:922
 #: ../src/widgets/sp-color-icc-selector.cpp:229
 #: ../src/widgets/sp-color-icc-selector.cpp:230
 #: ../src/widgets/sp-color-scales.cpp:458
@@ -8445,35 +8445,35 @@ msgstr ""
 msgid "<b>Draw over</b> areas to add to fill, hold <b>Alt</b> for touch fill"
 msgstr ""
 
-#: ../src/gradient-context.cpp:110 ../src/gradient-drag.cpp:95
+#: ../src/gradient-context.cpp:110 ../src/gradient-drag.cpp:96
 msgid "Linear gradient <b>start</b>"
 msgstr ""
 
 #. POINT_LG_BEGIN
-#: ../src/gradient-context.cpp:111 ../src/gradient-drag.cpp:96
+#: ../src/gradient-context.cpp:111 ../src/gradient-drag.cpp:97
 msgid "Linear gradient <b>end</b>"
 msgstr ""
 
-#: ../src/gradient-context.cpp:112 ../src/gradient-drag.cpp:97
+#: ../src/gradient-context.cpp:112 ../src/gradient-drag.cpp:98
 msgid "Linear gradient <b>mid stop</b>"
 msgstr ""
 
-#: ../src/gradient-context.cpp:113 ../src/gradient-drag.cpp:98
+#: ../src/gradient-context.cpp:113 ../src/gradient-drag.cpp:99
 msgid "Radial gradient <b>center</b>"
 msgstr ""
 
 #: ../src/gradient-context.cpp:114 ../src/gradient-context.cpp:115
-#: ../src/gradient-drag.cpp:99 ../src/gradient-drag.cpp:100
+#: ../src/gradient-drag.cpp:100 ../src/gradient-drag.cpp:101
 msgid "Radial gradient <b>radius</b>"
 msgstr ""
 
-#: ../src/gradient-context.cpp:116 ../src/gradient-drag.cpp:101
+#: ../src/gradient-context.cpp:116 ../src/gradient-drag.cpp:102
 msgid "Radial gradient <b>focus</b>"
 msgstr ""
 
 #. POINT_RG_FOCUS
 #: ../src/gradient-context.cpp:117 ../src/gradient-context.cpp:118
-#: ../src/gradient-drag.cpp:102 ../src/gradient-drag.cpp:103
+#: ../src/gradient-drag.cpp:103 ../src/gradient-drag.cpp:104
 msgid "Radial gradient <b>mid stop</b>"
 msgstr ""
 
@@ -8528,7 +8528,7 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: ../src/gradient-context.cpp:381 ../src/gradient-context.cpp:479
-#: ../src/ui/dialog/swatches.cpp:202 ../src/widgets/gradient-vector.cpp:815
+#: ../src/ui/dialog/swatches.cpp:203 ../src/widgets/gradient-vector.cpp:815
 msgid "Add gradient stop"
 msgstr ""
 
@@ -8563,60 +8563,60 @@ msgstr[1] ""
 msgid "Select <b>objects</b> on which to create gradient."
 msgstr ""
 
-#: ../src/gradient-drag.cpp:104
+#: ../src/gradient-drag.cpp:105
 msgid "Mesh gradient <b>corner</b>"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:105
+#: ../src/gradient-drag.cpp:106
 msgid "Mesh gradient <b>handle</b>"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:106
+#: ../src/gradient-drag.cpp:107
 msgid "Mesh gradient <b>tensor</b>"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:565
+#: ../src/gradient-drag.cpp:566
 msgid "Added patch row or column"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:791
+#: ../src/gradient-drag.cpp:792
 msgid "Merge gradient handles"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1100
+#: ../src/gradient-drag.cpp:1101
 msgid "Move gradient handle"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1159 ../src/widgets/gradient-vector.cpp:848
+#: ../src/gradient-drag.cpp:1160 ../src/widgets/gradient-vector.cpp:848
 msgid "Delete gradient stop"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1422
+#: ../src/gradient-drag.cpp:1423
 #, c-format
 msgid ""
 "%s %d for: %s%s; drag with <b>Ctrl</b> to snap offset; click with <b>Ctrl"
 "+Alt</b> to delete stop"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1426 ../src/gradient-drag.cpp:1433
+#: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434
 msgid " (stroke)"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1430
+#: ../src/gradient-drag.cpp:1431
 #, c-format
 msgid ""
 "%s for: %s%s; drag with <b>Ctrl</b> to snap angle, with <b>Ctrl+Alt</b> to "
 "preserve angle, with <b>Ctrl+Shift</b> to scale around center"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1438
+#: ../src/gradient-drag.cpp:1439
 #, c-format
 msgid ""
 "Radial gradient <b>center</b> and <b>focus</b>; drag with <b>Shift</b> to "
 "separate focus"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:1441
+#: ../src/gradient-drag.cpp:1442
 #, c-format
 msgid ""
 "Gradient point shared by <b>%d</b> gradient; drag with <b>Shift</b> to "
@@ -8627,15 +8627,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/gradient-drag.cpp:2369
+#: ../src/gradient-drag.cpp:2370
 msgid "Move gradient handle(s)"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:2405
+#: ../src/gradient-drag.cpp:2406
 msgid "Move gradient mid stop(s)"
 msgstr ""
 
-#: ../src/gradient-drag.cpp:2694
+#: ../src/gradient-drag.cpp:2695
 msgid "Delete gradient stop(s)"
 msgstr ""
 
@@ -8663,7 +8663,7 @@ msgstr ""
 msgid "Pt"
 msgstr ""
 
-#: ../src/helper/units.cpp:39 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:39 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Pica"
 msgstr ""
 
@@ -8679,7 +8679,7 @@ msgstr ""
 msgid "Pc"
 msgstr ""
 
-#: ../src/helper/units.cpp:40 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:40 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Pixel"
 msgstr ""
 
@@ -8701,7 +8701,7 @@ msgstr ""
 msgid "Percent"
 msgstr ""
 
-#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1224
+#: ../src/helper/units.cpp:42 ../src/ui/dialog/inkscape-preferences.cpp:1243
 msgid "%"
 msgstr ""
 
@@ -8709,7 +8709,7 @@ msgstr ""
 msgid "Percents"
 msgstr ""
 
-#: ../src/helper/units.cpp:43 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:43 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Millimeter"
 msgstr ""
 
@@ -8729,7 +8729,7 @@ msgstr ""
 msgid "Millimeters"
 msgstr ""
 
-#: ../src/helper/units.cpp:44 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:44 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Centimeter"
 msgstr ""
 
@@ -8754,7 +8754,7 @@ msgid "Meters"
 msgstr ""
 
 #. no svg_unit
-#: ../src/helper/units.cpp:46 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:46 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Inch"
 msgstr ""
 
@@ -8788,7 +8788,7 @@ msgstr ""
 
 #. Volatiles do not have default, so there are none here
 #. TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units
-#: ../src/helper/units.cpp:50 ../src/ui/dialog/inkscape-preferences.cpp:451
+#: ../src/helper/units.cpp:50 ../src/ui/dialog/inkscape-preferences.cpp:452
 msgid "Em square"
 msgstr ""
 
@@ -8813,112 +8813,112 @@ msgstr ""
 msgid "Ex squares"
 msgstr ""
 
-#: ../src/inkscape.cpp:316
+#: ../src/inkscape.cpp:318
 msgid "Autosave failed! Cannot create directory %1."
 msgstr ""
 
-#: ../src/inkscape.cpp:325
+#: ../src/inkscape.cpp:327
 msgid "Autosave failed! Cannot open directory %1."
 msgstr ""
 
-#: ../src/inkscape.cpp:341
+#: ../src/inkscape.cpp:343
 msgid "Autosaving documents..."
 msgstr ""
 
-#: ../src/inkscape.cpp:412
+#: ../src/inkscape.cpp:414
 msgid "Autosave failed! Could not find inkscape extension to save document."
 msgstr ""
 
-#: ../src/inkscape.cpp:415 ../src/inkscape.cpp:422
+#: ../src/inkscape.cpp:417 ../src/inkscape.cpp:424
 #, c-format
 msgid "Autosave failed! File %s could not be saved."
 msgstr ""
 
-#: ../src/inkscape.cpp:437
+#: ../src/inkscape.cpp:439
 msgid "Autosave complete."
 msgstr ""
 
-#: ../src/inkscape.cpp:683
+#: ../src/inkscape.cpp:685
 msgid "Untitled document"
 msgstr ""
 
 #. Show nice dialog box
-#: ../src/inkscape.cpp:715
+#: ../src/inkscape.cpp:717
 msgid "Inkscape encountered an internal error and will close now.\n"
 msgstr ""
 
-#: ../src/inkscape.cpp:716
+#: ../src/inkscape.cpp:718
 msgid ""
 "Automatic backups of unsaved documents were done to the following "
 "locations:\n"
 msgstr ""
 
-#: ../src/inkscape.cpp:717
+#: ../src/inkscape.cpp:719
 msgid "Automatic backup of the following documents failed:\n"
 msgstr ""
 
-#: ../src/interface.cpp:921
+#: ../src/interface.cpp:866
 msgctxt "Interface setup"
 msgid "Default"
 msgstr ""
 
-#: ../src/interface.cpp:921
+#: ../src/interface.cpp:866
 msgid "Default interface setup"
 msgstr ""
 
-#: ../src/interface.cpp:922
+#: ../src/interface.cpp:867
 msgctxt "Interface setup"
 msgid "Custom"
 msgstr ""
 
-#: ../src/interface.cpp:922
+#: ../src/interface.cpp:867
 msgid "Setup for custom task"
 msgstr ""
 
-#: ../src/interface.cpp:923
+#: ../src/interface.cpp:868
 msgctxt "Interface setup"
 msgid "Wide"
 msgstr ""
 
-#: ../src/interface.cpp:923
+#: ../src/interface.cpp:868
 msgid "Setup for widescreen work"
 msgstr ""
 
-#: ../src/interface.cpp:1035
+#: ../src/interface.cpp:980
 #, c-format
 msgid "Verb \"%s\" Unknown"
 msgstr ""
 
-#: ../src/interface.cpp:1077
+#: ../src/interface.cpp:1022
 msgid "Open _Recent"
 msgstr ""
 
-#: ../src/interface.cpp:1185 ../src/interface.cpp:1271
-#: ../src/interface.cpp:1374 ../src/ui/widget/selected-style.cpp:498
+#: ../src/interface.cpp:1130 ../src/interface.cpp:1216
+#: ../src/interface.cpp:1319 ../src/ui/widget/selected-style.cpp:498
 msgid "Drop color"
 msgstr ""
 
-#: ../src/interface.cpp:1224 ../src/interface.cpp:1334
+#: ../src/interface.cpp:1169 ../src/interface.cpp:1279
 msgid "Drop color on gradient"
 msgstr ""
 
-#: ../src/interface.cpp:1387
+#: ../src/interface.cpp:1332
 msgid "Could not parse SVG data"
 msgstr ""
 
-#: ../src/interface.cpp:1426
+#: ../src/interface.cpp:1371
 msgid "Drop SVG"
 msgstr ""
 
-#: ../src/interface.cpp:1439
+#: ../src/interface.cpp:1384
 msgid "Drop Symbol"
 msgstr ""
 
-#: ../src/interface.cpp:1470
+#: ../src/interface.cpp:1415
 msgid "Drop bitmap image"
 msgstr ""
 
-#: ../src/interface.cpp:1562
+#: ../src/interface.cpp:1507
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do "
@@ -8927,160 +8927,160 @@ msgid ""
 "The file already exists in \"%s\". Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../src/interface.cpp:1569 ../share/extensions/web-set-att.inx.h:21
+#: ../src/interface.cpp:1514 ../share/extensions/web-set-att.inx.h:21
 #: ../share/extensions/web-transmit-att.inx.h:19
 msgid "Replace"
 msgstr ""
 
-#: ../src/interface.cpp:1638
+#: ../src/interface.cpp:1583
 msgid "Go to parent"
 msgstr ""
 
 #. TRANSLATORS: #%1 is the id of the group e.g. <g id="#g7">, not a number.
-#: ../src/interface.cpp:1679
+#: ../src/interface.cpp:1624
 msgid "Enter group #%1"
 msgstr ""
 
 #. Item dialog
-#: ../src/interface.cpp:1818 ../src/verbs.cpp:2797
+#: ../src/interface.cpp:1736 ../src/verbs.cpp:2797
 msgid "_Object Properties..."
 msgstr ""
 
-#: ../src/interface.cpp:1827
+#: ../src/interface.cpp:1745
 msgid "_Select This"
 msgstr ""
 
-#: ../src/interface.cpp:1838
+#: ../src/interface.cpp:1756
 msgid "Select Same"
 msgstr ""
 
 #. Select same fill and stroke
-#: ../src/interface.cpp:1848
+#: ../src/interface.cpp:1766
 msgid "Fill and Stroke"
 msgstr ""
 
 #. Select same fill color
-#: ../src/interface.cpp:1855
+#: ../src/interface.cpp:1773
 msgid "Fill Color"
 msgstr ""
 
 #. Select same stroke color
-#: ../src/interface.cpp:1862
+#: ../src/interface.cpp:1780
 msgid "Stroke Color"
 msgstr ""
 
 #. Select same stroke style
-#: ../src/interface.cpp:1869
+#: ../src/interface.cpp:1787
 msgid "Stroke Style"
 msgstr ""
 
 #. Select same stroke style
-#: ../src/interface.cpp:1876
+#: ../src/interface.cpp:1794
 msgid "Object type"
 msgstr ""
 
 #. Move to layer
-#: ../src/interface.cpp:1883
+#: ../src/interface.cpp:1801
 msgid "_Move to layer ..."
 msgstr ""
 
 #. Create link
-#: ../src/interface.cpp:1893
+#: ../src/interface.cpp:1811
 msgid "Create _Link"
 msgstr ""
 
 #. Set mask
-#: ../src/interface.cpp:1916
+#: ../src/interface.cpp:1834
 msgid "Set Mask"
 msgstr ""
 
 #. Release mask
-#: ../src/interface.cpp:1927
+#: ../src/interface.cpp:1845
 msgid "Release Mask"
 msgstr ""
 
 #. Set Clip
-#: ../src/interface.cpp:1938
+#: ../src/interface.cpp:1856
 msgid "Set Cl_ip"
 msgstr ""
 
 #. Release Clip
-#: ../src/interface.cpp:1949
+#: ../src/interface.cpp:1867
 msgid "Release C_lip"
 msgstr ""
 
 #. Group
-#: ../src/interface.cpp:1960 ../src/verbs.cpp:2436
+#: ../src/interface.cpp:1878 ../src/verbs.cpp:2436
 msgid "_Group"
 msgstr ""
 
-#: ../src/interface.cpp:2031
+#: ../src/interface.cpp:1949
 msgid "Create link"
 msgstr ""
 
 #. Ungroup
-#: ../src/interface.cpp:2062 ../src/verbs.cpp:2438
+#: ../src/interface.cpp:1980 ../src/verbs.cpp:2438
 msgid "_Ungroup"
 msgstr ""
 
 #. Link dialog
-#: ../src/interface.cpp:2087
+#: ../src/interface.cpp:2005
 msgid "Link _Properties..."
 msgstr ""
 
 #. Select item
-#: ../src/interface.cpp:2093
+#: ../src/interface.cpp:2011
 msgid "_Follow Link"
 msgstr ""
 
 #. Reset transformations
-#: ../src/interface.cpp:2099
+#: ../src/interface.cpp:2017
 msgid "_Remove Link"
 msgstr ""
 
-#: ../src/interface.cpp:2130
+#: ../src/interface.cpp:2048
 msgid "Remove link"
 msgstr ""
 
 #. Image properties
-#: ../src/interface.cpp:2141
+#: ../src/interface.cpp:2059
 msgid "Image _Properties..."
 msgstr ""
 
 #. Edit externally
-#: ../src/interface.cpp:2147
+#: ../src/interface.cpp:2065
 msgid "Edit Externally..."
 msgstr ""
 
 #. Trace Bitmap
 #. TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
-#: ../src/interface.cpp:2156 ../src/verbs.cpp:2499
+#: ../src/interface.cpp:2074 ../src/verbs.cpp:2499
 msgid "_Trace Bitmap..."
 msgstr ""
 
-#: ../src/interface.cpp:2166
+#: ../src/interface.cpp:2084
 msgctxt "Context menu"
 msgid "Embed Image"
 msgstr ""
 
-#: ../src/interface.cpp:2177
+#: ../src/interface.cpp:2095
 msgctxt "Context menu"
 msgid "Extract Image..."
 msgstr ""
 
 #. Item dialog
 #. Fill and Stroke dialog
-#: ../src/interface.cpp:2316 ../src/interface.cpp:2336 ../src/verbs.cpp:2760
+#: ../src/interface.cpp:2234 ../src/interface.cpp:2254 ../src/verbs.cpp:2760
 msgid "_Fill and Stroke..."
 msgstr ""
 
 #. Edit Text dialog
-#: ../src/interface.cpp:2342 ../src/verbs.cpp:2777
+#: ../src/interface.cpp:2260 ../src/verbs.cpp:2777
 msgid "_Text and Font..."
 msgstr ""
 
 #. Spellcheck dialog
-#: ../src/interface.cpp:2348 ../src/verbs.cpp:2785
+#: ../src/interface.cpp:2266 ../src/verbs.cpp:2785
 msgid "Check Spellin_g..."
 msgstr ""
 
@@ -9143,9 +9143,10 @@ msgid "Dockitem which 'owns' this grip"
 msgstr ""
 
 #. Name
-#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1640
+#: ../src/libgdl/gdl-dock-item.c:298 ../src/widgets/text-toolbar.cpp:1432
 #: ../share/extensions/gcodetools_graffiti.inx.h:9
 #: ../share/extensions/gcodetools_orientation_points.inx.h:2
+#: ../share/extensions/hpgl_output.inx.h:7
 msgid "Orientation"
 msgstr ""
 
@@ -9275,7 +9276,7 @@ msgstr ""
 #: ../src/ui/dialog/align-and-distribute.cpp:1047
 #: ../src/ui/dialog/document-properties.cpp:144
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1546
-#: ../src/widgets/desktop-widget.cpp:1912
+#: ../src/widgets/desktop-widget.cpp:1919
 #: ../share/extensions/voronoi2svg.inx.h:9
 msgid "Page"
 msgstr ""
@@ -9285,7 +9286,7 @@ msgid "The index of the current page"
 msgstr ""
 
 #: ../src/libgdl/gdl-dock-object.c:125
-#: ../src/ui/dialog/inkscape-preferences.cpp:1431
+#: ../src/ui/dialog/inkscape-preferences.cpp:1450
 #: ../src/ui/widget/page-sizer.cpp:260
 #: ../src/widgets/gradient-selector.cpp:156
 #: ../src/widgets/sp-xmlview-attr-list.cpp:54
@@ -9454,8 +9455,8 @@ msgstr ""
 msgid "Dockitem which 'owns' this tablabel"
 msgstr ""
 
-#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:613
-#: ../src/ui/dialog/inkscape-preferences.cpp:647
+#: ../src/libgdl/gdl-dock.c:176 ../src/ui/dialog/inkscape-preferences.cpp:632
+#: ../src/ui/dialog/inkscape-preferences.cpp:666
 msgid "Floating"
 msgstr ""
 
@@ -9496,7 +9497,7 @@ msgstr ""
 msgid "Dock #%d"
 msgstr ""
 
-#: ../src/libnrtype/FontFactory.cpp:909
+#: ../src/libnrtype/FontFactory.cpp:955
 msgid "Ignoring font without family that will crash Pango"
 msgstr ""
 
@@ -10508,7 +10509,7 @@ msgid "How many construction lines (tangents) to draw"
 msgstr ""
 
 #: ../src/live_effects/lpe-sketch.cpp:58
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2564
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2548
 #: ../share/extensions/render_alphabetsoup.inx.h:3
 msgid "Scale:"
 msgstr ""
@@ -10764,7 +10765,7 @@ msgid "The ID of the object to export"
 msgstr ""
 
 #: ../src/main.cpp:335 ../src/main.cpp:433
-#: ../src/ui/dialog/inkscape-preferences.cpp:1434
+#: ../src/ui/dialog/inkscape-preferences.cpp:1453
 msgid "ID"
 msgstr ""
 
@@ -11290,7 +11291,7 @@ msgstr ""
 msgid "Tracing"
 msgstr ""
 
-#: ../src/preferences.cpp:131
+#: ../src/preferences.cpp:132
 msgid ""
 "Inkscape will run with default settings, and new settings will not be saved. "
 msgstr ""
@@ -11298,7 +11299,7 @@ msgstr ""
 #. the creation failed
 #. _reportError(Glib::ustring::compose(_("Cannot create profile directory %1."),
 #. Glib::filename_to_utf8(_prefs_dir)), not_saved);
-#: ../src/preferences.cpp:146
+#: ../src/preferences.cpp:147
 #, c-format
 msgid "Cannot create profile directory %s."
 msgstr ""
@@ -11306,7 +11307,7 @@ msgstr ""
 #. The profile dir is not actually a directory
 #. _reportError(Glib::ustring::compose(_("%1 is not a valid directory."),
 #. Glib::filename_to_utf8(_prefs_dir)), not_saved);
-#: ../src/preferences.cpp:164
+#: ../src/preferences.cpp:165
 #, c-format
 msgid "%s is not a valid directory."
 msgstr ""
@@ -11314,27 +11315,27 @@ msgstr ""
 #. The write failed.
 #. _reportError(Glib::ustring::compose(_("Failed to create the preferences file %1."),
 #. Glib::filename_to_utf8(_prefs_filename)), not_saved);
-#: ../src/preferences.cpp:175
+#: ../src/preferences.cpp:176
 #, c-format
 msgid "Failed to create the preferences file %s."
 msgstr ""
 
-#: ../src/preferences.cpp:211
+#: ../src/preferences.cpp:212
 #, c-format
 msgid "The preferences file %s is not a regular file."
 msgstr ""
 
-#: ../src/preferences.cpp:221
+#: ../src/preferences.cpp:222
 #, c-format
 msgid "The preferences file %s could not be read."
 msgstr ""
 
-#: ../src/preferences.cpp:232
+#: ../src/preferences.cpp:233
 #, c-format
 msgid "The preferences file %s is not a valid XML document."
 msgstr ""
 
-#: ../src/preferences.cpp:241
+#: ../src/preferences.cpp:242
 #, c-format
 msgid "The file %s is not a valid Inkscape preferences file."
 msgstr ""
@@ -11450,7 +11451,7 @@ msgstr ""
 msgid "Unique URI to a related document"
 msgstr ""
 
-#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1772
+#: ../src/rdf.cpp:264 ../src/ui/dialog/inkscape-preferences.cpp:1791
 msgid "Language:"
 msgstr ""
 
@@ -11614,7 +11615,7 @@ msgstr ""
 
 #: ../src/selection-chemistry.cpp:374 ../src/text-context.cpp:1008
 #: ../src/ui/dialog/calligraphic-profile-rename.cpp:55
-#: ../src/ui/dialog/swatches.cpp:277 ../src/widgets/erasor-toolbar.cpp:116
+#: ../src/ui/dialog/swatches.cpp:278 ../src/widgets/erasor-toolbar.cpp:116
 #: ../src/widgets/gradient-toolbar.cpp:1193
 #: ../src/widgets/gradient-toolbar.cpp:1207
 #: ../src/widgets/gradient-toolbar.cpp:1221
@@ -11723,7 +11724,7 @@ msgid "Select <b>object(s)</b> to remove filters from."
 msgstr ""
 
 #: ../src/selection-chemistry.cpp:1207
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1420
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1419
 msgid "Remove filter"
 msgstr ""
 
@@ -12020,7 +12021,7 @@ msgstr ""
 
 #. Ellipse
 #: ../src/selection-describer.cpp:49 ../src/selection-describer.cpp:74
-#: ../src/ui/dialog/inkscape-preferences.cpp:403
+#: ../src/ui/dialog/inkscape-preferences.cpp:404
 #: ../src/widgets/pencil-toolbar.cpp:193
 msgid "Ellipse"
 msgstr ""
@@ -12047,13 +12048,13 @@ msgstr ""
 
 #. Rectangle
 #: ../src/selection-describer.cpp:65
-#: ../src/ui/dialog/inkscape-preferences.cpp:393
+#: ../src/ui/dialog/inkscape-preferences.cpp:394
 msgid "Rectangle"
 msgstr ""
 
 #. 3D box
 #: ../src/selection-describer.cpp:67
-#: ../src/ui/dialog/inkscape-preferences.cpp:398
+#: ../src/ui/dialog/inkscape-preferences.cpp:399
 msgid "3D Box"
 msgstr ""
 
@@ -12075,14 +12076,14 @@ msgstr ""
 
 #. Spiral
 #: ../src/selection-describer.cpp:78
-#: ../src/ui/dialog/inkscape-preferences.cpp:411
+#: ../src/ui/dialog/inkscape-preferences.cpp:412
 #: ../share/extensions/gcodetools_area.inx.h:11
 msgid "Spiral"
 msgstr ""
 
 #. Star
 #: ../src/selection-describer.cpp:80
-#: ../src/ui/dialog/inkscape-preferences.cpp:407
+#: ../src/ui/dialog/inkscape-preferences.cpp:408
 #: ../src/widgets/star-toolbar.cpp:482
 msgid "Star"
 msgstr ""
@@ -12585,70 +12586,70 @@ msgid ""
 "One of the objects is <b>not a path</b>, cannot perform boolean operation."
 msgstr ""
 
-#: ../src/splivarot.cpp:907
+#: ../src/splivarot.cpp:910
 msgid "Select <b>stroked path(s)</b> to convert stroke to path."
 msgstr ""
 
-#: ../src/splivarot.cpp:1260
+#: ../src/splivarot.cpp:1263
 msgid "Convert stroke to path"
 msgstr ""
 
 #. TRANSLATORS: "to outline" means "to convert stroke to path"
-#: ../src/splivarot.cpp:1263
+#: ../src/splivarot.cpp:1266
 msgid "<b>No stroked paths</b> in the selection."
 msgstr ""
 
-#: ../src/splivarot.cpp:1334
+#: ../src/splivarot.cpp:1337
 msgid "Selected object is <b>not a path</b>, cannot inset/outset."
 msgstr ""
 
-#: ../src/splivarot.cpp:1460 ../src/splivarot.cpp:1525
+#: ../src/splivarot.cpp:1463 ../src/splivarot.cpp:1528
 msgid "Create linked offset"
 msgstr ""
 
-#: ../src/splivarot.cpp:1461 ../src/splivarot.cpp:1526
+#: ../src/splivarot.cpp:1464 ../src/splivarot.cpp:1529
 msgid "Create dynamic offset"
 msgstr ""
 
-#: ../src/splivarot.cpp:1551
+#: ../src/splivarot.cpp:1554
 msgid "Select <b>path(s)</b> to inset/outset."
 msgstr ""
 
-#: ../src/splivarot.cpp:1764
+#: ../src/splivarot.cpp:1767
 msgid "Outset path"
 msgstr ""
 
-#: ../src/splivarot.cpp:1764
+#: ../src/splivarot.cpp:1767
 msgid "Inset path"
 msgstr ""
 
-#: ../src/splivarot.cpp:1766
+#: ../src/splivarot.cpp:1769
 msgid "<b>No paths</b> to inset/outset in the selection."
 msgstr ""
 
-#: ../src/splivarot.cpp:1928
+#: ../src/splivarot.cpp:1931
 msgid "Simplifying paths (separately):"
 msgstr ""
 
-#: ../src/splivarot.cpp:1930
+#: ../src/splivarot.cpp:1933
 msgid "Simplifying paths:"
 msgstr ""
 
-#: ../src/splivarot.cpp:1967
+#: ../src/splivarot.cpp:1970
 #, c-format
 msgid "%s <b>%d</b> of <b>%d</b> paths simplified..."
 msgstr ""
 
-#: ../src/splivarot.cpp:1979
+#: ../src/splivarot.cpp:1982
 #, c-format
 msgid "<b>%d</b> paths simplified."
 msgstr ""
 
-#: ../src/splivarot.cpp:1993
+#: ../src/splivarot.cpp:1996
 msgid "Select <b>path(s)</b> to simplify."
 msgstr ""
 
-#: ../src/splivarot.cpp:2009
+#: ../src/splivarot.cpp:2012
 msgid "<b>No paths</b> to simplify in the selection."
 msgstr ""
 
@@ -12935,7 +12936,7 @@ msgstr ""
 msgid "Type text"
 msgstr ""
 
-#: ../src/text-editing.cpp:43
+#: ../src/text-editing.cpp:44
 msgid "You cannot edit <b>cloned character data</b>."
 msgstr ""
 
@@ -13537,7 +13538,7 @@ msgstr ""
 
 #: ../src/ui/dialog/align-and-distribute.cpp:1049
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1550 ../src/verbs.cpp:174
-#: ../src/widgets/desktop-widget.cpp:1920
+#: ../src/widgets/desktop-widget.cpp:1927
 #: ../share/extensions/printing_marks.inx.h:18
 msgid "Selection"
 msgstr ""
@@ -14099,36 +14100,36 @@ msgstr ""
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:774
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:790
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:805
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:284
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:415
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:291
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:422
 msgid "All Files"
 msgstr ""
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:771
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:787
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:802
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:285
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:292
 msgid "All Inkscape Files"
 msgstr ""
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:778
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:794
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:808
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:286
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:293
 msgid "All Images"
 msgstr ""
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:781
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:797
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:811
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:287
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:294
 msgid "All Vectors"
 msgstr ""
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:784
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:800
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:814
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:288
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:295
 msgid "All Bitmaps"
 msgstr ""
 
@@ -14209,15 +14210,15 @@ msgstr ""
 msgid "Destination"
 msgstr ""
 
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:416
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:423
 msgid "All Executable Files"
 msgstr ""
 
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:608
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:615
 msgid "Show Preview"
 msgstr ""
 
-#: ../src/ui/dialog/filedialogimpl-win32.cpp:746
+#: ../src/ui/dialog/filedialogimpl-win32.cpp:753
 msgid "No file selected"
 msgstr ""
 
@@ -14349,95 +14350,95 @@ msgstr ""
 msgid "R_ename"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1270
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1269
 msgid "Rename filter"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1307
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1306
 msgid "Apply filter"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1377
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1376
 msgid "filter"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1384
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1383
 msgid "Add filter"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1436
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1435
 msgid "Duplicate filter"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1535
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1534
 msgid "_Effect"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1544
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1543
 msgid "Connections"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:1682
+#: ../src/ui/dialog/filter-effects-dialog.cpp:1681
 msgid "Remove filter primitive"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2242
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2226
 msgid "Remove merge node"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2362
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2346
 msgid "Reorder filter primitive"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2414
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2398
 msgid "Add Effect:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2415
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2399
 msgid "No effect selected"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2416
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2400
 msgid "No filter selected"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2459
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2443
 msgid "Effect parameters"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2460
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2444
 msgid "Filter General Settings"
 msgstr ""
 
 #. default x:
 #. default y:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2516
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2500
 msgid "Coordinates:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2516
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2500
 msgid "X coordinate of the left corners of filter effects region"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2516
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2500
 msgid "Y coordinate of the upper corners of filter effects region"
 msgstr ""
 
 #. default width:
 #. default height:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2517
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2501
 msgid "Dimensions:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2517
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2501
 msgid "Width of filter effects region"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2517
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2501
 msgid "Height of filter effects region"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2523
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2507
 msgid ""
 "Indicates the type of matrix operation. The keyword 'matrix' indicates that "
 "a full 5x4 matrix of values will be provided. The other keywords represent "
@@ -14445,78 +14446,78 @@ msgid ""
 "performed without specifying a complete matrix."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2524
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2508
 msgid "Value(s):"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2539
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2579
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2523
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2563
 msgid "Operator:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2540
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2524
 msgid "K1:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2540
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2541
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2542
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2543
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2524
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2525
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2526
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2527
 msgid ""
 "If the arithmetic operation is chosen, each result pixel is computed using "
 "the formula k1*i1*i2 + k2*i1 + k3*i2 + k4 where i1 and i2 are the pixel "
 "values of the first and second inputs respectively."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2541
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2525
 msgid "K2:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2542
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2526
 msgid "K3:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2543
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2527
 msgid "K4:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2546
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2530
 msgid "Size:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2546
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2530
 msgid "width of the convolve matrix"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2546
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2530
 msgid "height of the convolve matrix"
 msgstr ""
 
 #. default x:
 #. default y:
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2547
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2531
 #: ../src/ui/dialog/object-attributes.cpp:47
 msgid "Target:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2547
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2531
 msgid ""
 "X coordinate of the target point in the convolve matrix. The convolution is "
 "applied to pixels around this point."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2547
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2531
 msgid ""
 "Y coordinate of the target point in the convolve matrix. The convolution is "
 "applied to pixels around this point."
 msgstr ""
 
 #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix)
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2549
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2533
 msgid "Kernel:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2549
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2533
 msgid ""
 "This matrix describes the convolve operation that is applied to the input "
 "image in order to calculate the pixel colors at the output. Different "
@@ -14526,11 +14527,11 @@ msgid ""
 "would lead to a common blur effect."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2551
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2535
 msgid "Divisor:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2551
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2535
 msgid ""
 "After applying the kernelMatrix to the input image to yield a number, that "
 "number is divided by divisor to yield the final destination color value. A "
@@ -14538,189 +14539,189 @@ msgid ""
 "effect on the overall color intensity of the result."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2552
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2536
 msgid "Bias:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2552
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2536
 msgid ""
 "This value is added to each component. This is useful to define a constant "
 "value as the zero response of the filter."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2553
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2537
 msgid "Edge Mode:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2553
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2537
 msgid ""
 "Determines how to extend the input image as necessary with color values so "
 "that the matrix operations can be applied when the kernel is positioned at "
 "or near the edge of the input image."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2554
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2538
 msgid "Preserve Alpha"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2554
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2538
 msgid "If set, the alpha channel won't be altered by this filter primitive."
 msgstr ""
 
 #. default: white
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2557
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2541
 msgid "Diffuse Color:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2557
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2590
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2541
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2574
 msgid "Defines the color of the light source"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2558
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2591
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2542
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2575
 msgid "Surface Scale:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2558
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2591
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2542
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2575
 msgid ""
 "This value amplifies the heights of the bump map defined by the input alpha "
 "channel"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2559
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2592
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2543
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2576
 msgid "Constant:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2559
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2592
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2543
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2576
 msgid "This constant affects the Phong lighting model."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2560
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2594
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2544
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2578
 msgid "Kernel Unit Length:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2564
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2548
 msgid "This defines the intensity of the displacement effect."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2565
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2549
 msgid "X displacement:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2565
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2549
 msgid "Color component that controls the displacement in the X direction"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2566
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2550
 msgid "Y displacement:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2566
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2550
 msgid "Color component that controls the displacement in the Y direction"
 msgstr ""
 
 #. default: black
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2569
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2553
 msgid "Flood Color:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2569
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2553
 msgid "The whole filter region will be filled with this color."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2573
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2557
 msgid "Standard Deviation:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2573
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2557
 msgid "The standard deviation for the blur operation."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2579
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2563
 msgid ""
 "Erode: performs \"thinning\" of input image.\n"
 "Dilate: performs \"fattenning\" of input image."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2583
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2567
 msgid "Source of Image:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2586
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2570
 msgid "Delta X:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2586
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2570
 msgid "This is how far the input image gets shifted to the right"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2587
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2571
 msgid "Delta Y:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2587
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2571
 msgid "This is how far the input image gets shifted downwards"
 msgstr ""
 
 #. default: white
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2590
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2574
 msgid "Specular Color:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2593
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2577
 #: ../share/extensions/interp.inx.h:2
 msgid "Exponent:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2593
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2577
 msgid "Exponent for specular term, larger is more \"shiny\"."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2602
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2586
 msgid ""
 "Indicates whether the filter primitive should perform a noise or turbulence "
 "function."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2603
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2587
 msgid "Base Frequency:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2604
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2588
 msgid "Octaves:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2605
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2589
 msgid "Seed:"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2605
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2589
 msgid "The starting number for the pseudo random number generator."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2617
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2601
 msgid "Add filter primitive"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2634
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2618
 msgid ""
 "The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, "
 "multiply, darken and lighten."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2638
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2622
 msgid ""
 "The <b>feColorMatrix</b> filter primitive applies a matrix transformation to "
 "color of each rendered pixel. This allows for effects like turning object to "
 "grayscale, modifying color saturation and changing color hue."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2642
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2626
 msgid ""
 "The <b>feComponentTransfer</b> filter primitive manipulates the input's "
 "color components (red, green, blue, and alpha) according to particular "
@@ -14728,7 +14729,7 @@ msgid ""
 "adjustment, color balance, and thresholding."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2646
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2630
 msgid ""
 "The <b>feComposite</b> filter primitive composites two images using one of "
 "the Porter-Duff blending modes or the arithmetic mode described in SVG "
@@ -14736,7 +14737,7 @@ msgid ""
 "between the corresponding pixel values of the images."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2650
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2634
 msgid ""
 "The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on "
 "the image. Common effects created using convolution matrices are blur, "
@@ -14745,7 +14746,7 @@ msgid ""
 "is faster and resolution-independent."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2654
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2638
 msgid ""
 "The <b>feDiffuseLighting</b> and feSpecularLighting filter primitives create "
 "\"embossed\" shadings.  The input's alpha channel is used to provide depth "
@@ -14753,7 +14754,7 @@ msgid ""
 "opacity areas recede away from the viewer."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2658
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2642
 msgid ""
 "The <b>feDisplacementMap</b> filter primitive displaces the pixels in the "
 "first input using the second input as a displacement map, that shows from "
@@ -14761,26 +14762,26 @@ msgid ""
 "effects."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2662
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2646
 msgid ""
 "The <b>feFlood</b> filter primitive fills the region with a given color and "
 "opacity.  It is usually used as an input to other filters to apply color to "
 "a graphic."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2666
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2650
 msgid ""
 "The <b>feGaussianBlur</b> filter primitive uniformly blurs its input.  It is "
 "commonly used together with feOffset to create a drop shadow effect."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2670
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2654
 msgid ""
 "The <b>feImage</b> filter primitive fills the region with an external image "
 "or another part of the document."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2674
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2658
 msgid ""
 "The <b>feMerge</b> filter primitive composites several temporary images "
 "inside the filter primitive to a single image. It uses normal alpha "
@@ -14788,45 +14789,45 @@ msgid ""
 "in 'normal' mode or several feComposite primitives in 'over' mode."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2678
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2662
 msgid ""
 "The <b>feMorphology</b> filter primitive provides erode and dilate effects. "
 "For single-color objects erode makes the object thinner and dilate makes it "
 "thicker."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2682
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2666
 msgid ""
 "The <b>feOffset</b> filter primitive offsets the image by an user-defined "
 "amount. For example, this is useful for drop shadows, where the shadow is in "
 "a slightly different position than the actual object."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2686
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2670
 msgid ""
-"The feDiffuseLighting and <b>feSpecularLighting</b> filter primitives create "
-"\"embossed\" shadings.  The input's alpha channel is used to provide depth "
-"information: higher opacity areas are raised toward the viewer and lower "
-"opacity areas recede away from the viewer."
+"The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter primitives "
+"create \"embossed\" shadings.  The input's alpha channel is used to provide "
+"depth information: higher opacity areas are raised toward the viewer and "
+"lower opacity areas recede away from the viewer."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2690
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2674
 msgid ""
 "The <b>feTile</b> filter primitive tiles a region with its input graphic"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2694
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2678
 msgid ""
 "The <b>feTurbulence</b> filter primitive renders Perlin noise. This kind of "
 "noise is useful in simulating several nature phenomena like clouds, fire and "
 "smoke and in generating complex textures like marble or granite."
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2713
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2697
 msgid "Duplicate filter primitive"
 msgstr ""
 
-#: ../src/ui/dialog/filter-effects-dialog.cpp:2766
+#: ../src/ui/dialog/filter-effects-dialog.cpp:2750
 msgid "Set filter primitive attribute"
 msgstr ""
 
@@ -15822,333 +15823,333 @@ msgstr ""
 msgid "Selection only or whole document"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:181
+#: ../src/ui/dialog/inkscape-preferences.cpp:182
 msgid "Show selection cue"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:182
+#: ../src/ui/dialog/inkscape-preferences.cpp:183
 msgid ""
 "Whether selected objects display a selection cue (the same as in selector)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:188
+#: ../src/ui/dialog/inkscape-preferences.cpp:189
 msgid "Enable gradient editing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:189
+#: ../src/ui/dialog/inkscape-preferences.cpp:190
 msgid "Whether selected objects display gradient editing controls"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:194
+#: ../src/ui/dialog/inkscape-preferences.cpp:195
 msgid "Conversion to guides uses edges instead of bounding box"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:195
+#: ../src/ui/dialog/inkscape-preferences.cpp:196
 msgid ""
 "Converting an object to guides places these along the object's true edges "
 "(imitating the object's shape), not along the bounding box"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:202
+#: ../src/ui/dialog/inkscape-preferences.cpp:203
 msgid "Ctrl+click _dot size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:202
+#: ../src/ui/dialog/inkscape-preferences.cpp:203
 msgid "times current stroke width"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:203
+#: ../src/ui/dialog/inkscape-preferences.cpp:204
 msgid "Size of dots created with Ctrl+click (relative to current stroke width)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:218
+#: ../src/ui/dialog/inkscape-preferences.cpp:219
 msgid "<b>No objects selected</b> to take the style from."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:227
+#: ../src/ui/dialog/inkscape-preferences.cpp:228
 msgid ""
 "<b>More than one object selected.</b>  Cannot take style from multiple "
 "objects."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:260
+#: ../src/ui/dialog/inkscape-preferences.cpp:261
 msgid "Style of new objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:262
+#: ../src/ui/dialog/inkscape-preferences.cpp:263
 msgid "Last used style"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:264
+#: ../src/ui/dialog/inkscape-preferences.cpp:265
 msgid "Apply the style you last set on an object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:269
+#: ../src/ui/dialog/inkscape-preferences.cpp:270
 msgid "This tool's own style:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:273
+#: ../src/ui/dialog/inkscape-preferences.cpp:274
 msgid ""
 "Each tool may store its own style to apply to the newly created objects. Use "
 "the button below to set it."
 msgstr ""
 
 #. style swatch
-#: ../src/ui/dialog/inkscape-preferences.cpp:277
+#: ../src/ui/dialog/inkscape-preferences.cpp:278
 msgid "Take from selection"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:282
+#: ../src/ui/dialog/inkscape-preferences.cpp:283
 msgid "This tool's style of new objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:289
+#: ../src/ui/dialog/inkscape-preferences.cpp:290
 msgid "Remember the style of the (first) selected object as this tool's style"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:294
+#: ../src/ui/dialog/inkscape-preferences.cpp:295
 msgid "Tools"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:297
+#: ../src/ui/dialog/inkscape-preferences.cpp:298
 msgid "Bounding box to use"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:298
+#: ../src/ui/dialog/inkscape-preferences.cpp:299
 msgid "Visual bounding box"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:300
+#: ../src/ui/dialog/inkscape-preferences.cpp:301
 msgid "This bounding box includes stroke width, markers, filter margins, etc."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:301
+#: ../src/ui/dialog/inkscape-preferences.cpp:302
 msgid "Geometric bounding box"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:303
+#: ../src/ui/dialog/inkscape-preferences.cpp:304
 msgid "This bounding box includes only the bare path"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:305
+#: ../src/ui/dialog/inkscape-preferences.cpp:306
 msgid "Conversion to guides"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:306
+#: ../src/ui/dialog/inkscape-preferences.cpp:307
 msgid "Keep objects after conversion to guides"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:308
+#: ../src/ui/dialog/inkscape-preferences.cpp:309
 msgid ""
 "When converting an object to guides, don't delete the object after the "
 "conversion"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:309
+#: ../src/ui/dialog/inkscape-preferences.cpp:310
 msgid "Treat groups as a single object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:311
+#: ../src/ui/dialog/inkscape-preferences.cpp:312
 msgid ""
 "Treat groups as a single object during conversion to guides rather than "
 "converting each child separately"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:313
+#: ../src/ui/dialog/inkscape-preferences.cpp:314
 msgid "Average all sketches"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:314
+#: ../src/ui/dialog/inkscape-preferences.cpp:315
 msgid "Width is in absolute units"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:315
+#: ../src/ui/dialog/inkscape-preferences.cpp:316
 msgid "Select new path"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:316
+#: ../src/ui/dialog/inkscape-preferences.cpp:317
 msgid "Don't attach connectors to text objects"
 msgstr ""
 
 #. Selector
-#: ../src/ui/dialog/inkscape-preferences.cpp:319
+#: ../src/ui/dialog/inkscape-preferences.cpp:320
 msgid "Selector"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:324
+#: ../src/ui/dialog/inkscape-preferences.cpp:325
 msgid "When transforming, show"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:325
+#: ../src/ui/dialog/inkscape-preferences.cpp:326
 msgid "Objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:327
+#: ../src/ui/dialog/inkscape-preferences.cpp:328
 msgid "Show the actual objects when moving or transforming"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:328
+#: ../src/ui/dialog/inkscape-preferences.cpp:329
 msgid "Box outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:330
+#: ../src/ui/dialog/inkscape-preferences.cpp:331
 msgid "Show only a box outline of the objects when moving or transforming"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:331
+#: ../src/ui/dialog/inkscape-preferences.cpp:332
 msgid "Per-object selection cue"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:334
+#: ../src/ui/dialog/inkscape-preferences.cpp:335
 msgid "No per-object selection indication"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:335
+#: ../src/ui/dialog/inkscape-preferences.cpp:336
 msgid "Mark"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:337
+#: ../src/ui/dialog/inkscape-preferences.cpp:338
 msgid "Each selected object has a diamond mark in the top left corner"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:338
+#: ../src/ui/dialog/inkscape-preferences.cpp:339
 msgid "Box"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:340
+#: ../src/ui/dialog/inkscape-preferences.cpp:341
 msgid "Each selected object displays its bounding box"
 msgstr ""
 
 #. Node
-#: ../src/ui/dialog/inkscape-preferences.cpp:343
+#: ../src/ui/dialog/inkscape-preferences.cpp:344
 msgid "Node"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:346
+#: ../src/ui/dialog/inkscape-preferences.cpp:347
 msgid "Path outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:347
+#: ../src/ui/dialog/inkscape-preferences.cpp:348
 msgid "Path outline color"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:348
+#: ../src/ui/dialog/inkscape-preferences.cpp:349
 msgid "Selects the color used for showing the path outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:349
+#: ../src/ui/dialog/inkscape-preferences.cpp:350
 msgid "Always show outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:350
+#: ../src/ui/dialog/inkscape-preferences.cpp:351
 msgid "Show outlines for all paths, not only invisible paths"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:351
+#: ../src/ui/dialog/inkscape-preferences.cpp:352
 msgid "Update outline when dragging nodes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:352
+#: ../src/ui/dialog/inkscape-preferences.cpp:353
 msgid ""
 "Update the outline when dragging or transforming nodes; if this is off, the "
 "outline will only update when completing a drag"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:353
+#: ../src/ui/dialog/inkscape-preferences.cpp:354
 msgid "Update paths when dragging nodes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:354
+#: ../src/ui/dialog/inkscape-preferences.cpp:355
 msgid ""
 "Update paths when dragging or transforming nodes; if this is off, paths will "
 "only be updated when completing a drag"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:355
+#: ../src/ui/dialog/inkscape-preferences.cpp:356
 msgid "Show path direction on outlines"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:356
+#: ../src/ui/dialog/inkscape-preferences.cpp:357
 msgid ""
 "Visualize the direction of selected paths by drawing small arrows in the "
 "middle of each outline segment"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:357
+#: ../src/ui/dialog/inkscape-preferences.cpp:358
 msgid "Show temporary path outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:358
+#: ../src/ui/dialog/inkscape-preferences.cpp:359
 msgid "When hovering over a path, briefly flash its outline"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:359
+#: ../src/ui/dialog/inkscape-preferences.cpp:360
 msgid "Show temporary outline for selected paths"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:360
+#: ../src/ui/dialog/inkscape-preferences.cpp:361
 msgid "Show temporary outline even when a path is selected for editing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:362
+#: ../src/ui/dialog/inkscape-preferences.cpp:363
 msgid "_Flash time:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:362
+#: ../src/ui/dialog/inkscape-preferences.cpp:363
 msgid ""
 "Specifies how long the path outline will be visible after a mouse-over (in "
 "milliseconds); specify 0 to have the outline shown until mouse leaves the "
 "path"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:363
+#: ../src/ui/dialog/inkscape-preferences.cpp:364
 msgid "Editing preferences"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:364
+#: ../src/ui/dialog/inkscape-preferences.cpp:365
 msgid "Show transform handles for single nodes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:365
+#: ../src/ui/dialog/inkscape-preferences.cpp:366
 msgid "Show transform handles even when only a single node is selected"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:366
+#: ../src/ui/dialog/inkscape-preferences.cpp:367
 msgid "Deleting nodes preserves shape"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:367
+#: ../src/ui/dialog/inkscape-preferences.cpp:368
 msgid ""
 "Move handles next to deleted nodes to resemble original shape; hold Ctrl to "
 "get the other behavior"
 msgstr ""
 
 #. Tweak
-#: ../src/ui/dialog/inkscape-preferences.cpp:370
+#: ../src/ui/dialog/inkscape-preferences.cpp:371
 msgid "Tweak"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:371
+#: ../src/ui/dialog/inkscape-preferences.cpp:372
 msgid "Object paint style"
 msgstr ""
 
 #. Zoom
-#: ../src/ui/dialog/inkscape-preferences.cpp:376
+#: ../src/ui/dialog/inkscape-preferences.cpp:377
 #: ../src/widgets/desktop-widget.cpp:632
 msgid "Zoom"
 msgstr ""
 
 #. Measure
-#: ../src/ui/dialog/inkscape-preferences.cpp:381 ../src/verbs.cpp:2626
+#: ../src/ui/dialog/inkscape-preferences.cpp:382 ../src/verbs.cpp:2626
 msgctxt "ContextVerb"
 msgid "Measure"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:383
+#: ../src/ui/dialog/inkscape-preferences.cpp:384
 msgid "Ignore first and last points"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:384
+#: ../src/ui/dialog/inkscape-preferences.cpp:385
 msgid ""
 "The start and end of the measurement tool's control line will not be "
 "considered for calculating lengths. Only lengths between actual curve "
@@ -16156,63 +16157,63 @@ msgid ""
 msgstr ""
 
 #. Shapes
-#: ../src/ui/dialog/inkscape-preferences.cpp:387
+#: ../src/ui/dialog/inkscape-preferences.cpp:388
 msgid "Shapes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:419
+#: ../src/ui/dialog/inkscape-preferences.cpp:420
 msgid "Sketch mode"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:421
+#: ../src/ui/dialog/inkscape-preferences.cpp:422
 msgid ""
 "If on, the sketch result will be the normal average of all sketches made, "
 "instead of averaging the old result with the new sketch"
 msgstr ""
 
 #. Pen
-#: ../src/ui/dialog/inkscape-preferences.cpp:424
+#: ../src/ui/dialog/inkscape-preferences.cpp:425
 #: ../src/ui/dialog/input.cpp:1399
 msgid "Pen"
 msgstr ""
 
 #. Calligraphy
-#: ../src/ui/dialog/inkscape-preferences.cpp:430
+#: ../src/ui/dialog/inkscape-preferences.cpp:431
 msgid "Calligraphy"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:434
+#: ../src/ui/dialog/inkscape-preferences.cpp:435
 msgid ""
 "If on, pen width is in absolute units (px) independent of zoom; otherwise "
 "pen width depends on zoom so that it looks the same at any zoom"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:436
+#: ../src/ui/dialog/inkscape-preferences.cpp:437
 msgid ""
 "If on, each newly created object will be selected (deselecting previous "
 "selection)"
 msgstr ""
 
 #. Text
-#: ../src/ui/dialog/inkscape-preferences.cpp:439 ../src/verbs.cpp:2618
+#: ../src/ui/dialog/inkscape-preferences.cpp:440 ../src/verbs.cpp:2618
 msgctxt "ContextVerb"
 msgid "Text"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:444
+#: ../src/ui/dialog/inkscape-preferences.cpp:445
 msgid "Show font samples in the drop-down list"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:445
+#: ../src/ui/dialog/inkscape-preferences.cpp:446
 msgid ""
 "Show font samples alongside font names in the drop-down list in Text bar"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:447
+#: ../src/ui/dialog/inkscape-preferences.cpp:448
 msgid "Show font substitution warning dialog"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:448
+#: ../src/ui/dialog/inkscape-preferences.cpp:449
 msgid ""
 "Show font substitution warning dialog when requested fonts are not available "
 "on the system"
@@ -16220,881 +16221,915 @@ msgstr ""
 
 #. , _("Ex square"), _("Percent")
 #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT
-#: ../src/ui/dialog/inkscape-preferences.cpp:454
+#: ../src/ui/dialog/inkscape-preferences.cpp:455
 msgid "Text units"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:456
+#: ../src/ui/dialog/inkscape-preferences.cpp:457
 msgid "Text size unit type:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:457
+#: ../src/ui/dialog/inkscape-preferences.cpp:458
 msgid "Set the type of unit used in the text toolbar and text dialogs"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:458
+#: ../src/ui/dialog/inkscape-preferences.cpp:459
 msgid "Always output text size in pixels (px)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:459
+#: ../src/ui/dialog/inkscape-preferences.cpp:460
 msgid ""
 "Always convert the text size units above into pixels (px) before saving to "
 "file"
 msgstr ""
 
 #. Spray
-#: ../src/ui/dialog/inkscape-preferences.cpp:464
+#: ../src/ui/dialog/inkscape-preferences.cpp:465
 msgid "Spray"
 msgstr ""
 
 #. Eraser
-#: ../src/ui/dialog/inkscape-preferences.cpp:469
+#: ../src/ui/dialog/inkscape-preferences.cpp:470
 msgid "Eraser"
 msgstr ""
 
 #. Paint Bucket
-#: ../src/ui/dialog/inkscape-preferences.cpp:473
+#: ../src/ui/dialog/inkscape-preferences.cpp:474
 msgid "Paint Bucket"
 msgstr ""
 
 #. Gradient
-#: ../src/ui/dialog/inkscape-preferences.cpp:478
+#: ../src/ui/dialog/inkscape-preferences.cpp:479
 #: ../src/widgets/gradient-selector.cpp:150
 #: ../src/widgets/gradient-selector.cpp:302
 msgid "Gradient"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:480
+#: ../src/ui/dialog/inkscape-preferences.cpp:481
 msgid "Prevent sharing of gradient definitions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:482
+#: ../src/ui/dialog/inkscape-preferences.cpp:483
 msgid ""
 "When on, shared gradient definitions are automatically forked on change; "
 "uncheck to allow sharing of gradient definitions so that editing one object "
 "may affect other objects using the same gradient"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:483
+#: ../src/ui/dialog/inkscape-preferences.cpp:484
 msgid "Use legacy Gradient Editor"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:485
+#: ../src/ui/dialog/inkscape-preferences.cpp:486
 msgid ""
 "When on, the Gradient Edit button in the Fill & Stroke dialog will show the "
 "legacy Gradient Editor dialog, when off the Gradient Tool will be used"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:488
+#: ../src/ui/dialog/inkscape-preferences.cpp:489
 msgid "Linear gradient _angle:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:489
+#: ../src/ui/dialog/inkscape-preferences.cpp:490
 msgid ""
 "Default angle of new linear gradients in degrees (clockwise from horizontal)"
 msgstr ""
 
 #. Dropper
-#: ../src/ui/dialog/inkscape-preferences.cpp:493
+#: ../src/ui/dialog/inkscape-preferences.cpp:494
 msgid "Dropper"
 msgstr ""
 
 #. Connector
-#: ../src/ui/dialog/inkscape-preferences.cpp:498
+#: ../src/ui/dialog/inkscape-preferences.cpp:499
 msgid "Connector"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:501
+#: ../src/ui/dialog/inkscape-preferences.cpp:502
 msgid "If on, connector attachment points will not be shown for text objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:511
+#: ../src/ui/dialog/inkscape-preferences.cpp:512
 msgid "Interface"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "System default"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Albanian (sq)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Amharic (am)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Arabic (ar)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Armenian (hy)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Azerbaijani (az)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Basque (eu)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:514
+#: ../src/ui/dialog/inkscape-preferences.cpp:515
 msgid "Belarusian (be)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Bulgarian (bg)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Bengali (bn)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Bengali/Bangladesh (bn_BD)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Breton (br)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Catalan (ca)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Valencian Catalan (ca@valencia)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:515
+#: ../src/ui/dialog/inkscape-preferences.cpp:516
 msgid "Chinese/China (zh_CN)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:516
+#: ../src/ui/dialog/inkscape-preferences.cpp:517
 msgid "Chinese/Taiwan (zh_TW)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:516
+#: ../src/ui/dialog/inkscape-preferences.cpp:517
 msgid "Croatian (hr)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:516
+#: ../src/ui/dialog/inkscape-preferences.cpp:517
 msgid "Czech (cs)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "Danish (da)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "Dutch (nl)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "Dzongkha (dz)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "German (de)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "Greek (el)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "English (en)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:517
+#: ../src/ui/dialog/inkscape-preferences.cpp:518
 msgid "English/Australia (en_AU)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:518
+#: ../src/ui/dialog/inkscape-preferences.cpp:519
 msgid "English/Canada (en_CA)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:518
+#: ../src/ui/dialog/inkscape-preferences.cpp:519
 msgid "English/Great Britain (en_GB)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:518
+#: ../src/ui/dialog/inkscape-preferences.cpp:519
 msgid "Pig Latin (en_US@piglatin)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:519
+#: ../src/ui/dialog/inkscape-preferences.cpp:520
 msgid "Esperanto (eo)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:519
+#: ../src/ui/dialog/inkscape-preferences.cpp:520
 msgid "Estonian (et)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:519
+#: ../src/ui/dialog/inkscape-preferences.cpp:520
 msgid "Farsi (fa)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:519
+#: ../src/ui/dialog/inkscape-preferences.cpp:520
 msgid "Finnish (fi)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:520
+#: ../src/ui/dialog/inkscape-preferences.cpp:521
 msgid "French (fr)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:520
+#: ../src/ui/dialog/inkscape-preferences.cpp:521
 msgid "Irish (ga)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:520
+#: ../src/ui/dialog/inkscape-preferences.cpp:521
 msgid "Galician (gl)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:520
+#: ../src/ui/dialog/inkscape-preferences.cpp:521
 msgid "Hebrew (he)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:520
+#: ../src/ui/dialog/inkscape-preferences.cpp:521
 msgid "Hungarian (hu)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Indonesian (id)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Italian (it)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Japanese (ja)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Khmer (km)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Kinyarwanda (rw)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Korean (ko)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Lithuanian (lt)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Latvian (lv)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:521
+#: ../src/ui/dialog/inkscape-preferences.cpp:522
 msgid "Macedonian (mk)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:522
+#: ../src/ui/dialog/inkscape-preferences.cpp:523
 msgid "Mongolian (mn)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:522
+#: ../src/ui/dialog/inkscape-preferences.cpp:523
 msgid "Nepali (ne)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:522
+#: ../src/ui/dialog/inkscape-preferences.cpp:523
 msgid "Norwegian Bokmål (nb)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:522
+#: ../src/ui/dialog/inkscape-preferences.cpp:523
 msgid "Norwegian Nynorsk (nn)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:522
+#: ../src/ui/dialog/inkscape-preferences.cpp:523
 msgid "Panjabi (pa)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:523
+#: ../src/ui/dialog/inkscape-preferences.cpp:524
 msgid "Polish (pl)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:523
+#: ../src/ui/dialog/inkscape-preferences.cpp:524
 msgid "Portuguese (pt)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:523
+#: ../src/ui/dialog/inkscape-preferences.cpp:524
 msgid "Portuguese/Brazil (pt_BR)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:523
+#: ../src/ui/dialog/inkscape-preferences.cpp:524
 msgid "Romanian (ro)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:523
+#: ../src/ui/dialog/inkscape-preferences.cpp:524
 msgid "Russian (ru)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Serbian (sr)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Serbian in Latin script (sr@latin)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Slovak (sk)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Slovenian (sl)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Spanish (es)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:524
+#: ../src/ui/dialog/inkscape-preferences.cpp:525
 msgid "Spanish/Mexico (es_MX)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Swedish (sv)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Telugu (te_IN)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Thai (th)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Turkish (tr)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Ukrainian (uk)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:525
+#: ../src/ui/dialog/inkscape-preferences.cpp:526
 msgid "Vietnamese (vi)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:557
+#: ../src/ui/dialog/inkscape-preferences.cpp:558
 msgid "Language (requires restart):"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:558
+#: ../src/ui/dialog/inkscape-preferences.cpp:559
 msgid "Set the language for menus and number formats"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:561
+#: ../src/ui/dialog/inkscape-preferences.cpp:562
 msgid "Large"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:561
+#: ../src/ui/dialog/inkscape-preferences.cpp:562
 msgid "Small"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:561
+#: ../src/ui/dialog/inkscape-preferences.cpp:562
 msgid "Smaller"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:565
+#: ../src/ui/dialog/inkscape-preferences.cpp:566
 msgid "Toolbox icon size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:566
+#: ../src/ui/dialog/inkscape-preferences.cpp:567
 msgid "Set the size for the tool icons (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:569
+#: ../src/ui/dialog/inkscape-preferences.cpp:570
 msgid "Control bar icon size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:570
+#: ../src/ui/dialog/inkscape-preferences.cpp:571
 msgid ""
 "Set the size for the icons in tools' control bars to use (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:573
+#: ../src/ui/dialog/inkscape-preferences.cpp:574
 msgid "Secondary toolbar icon size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:574
+#: ../src/ui/dialog/inkscape-preferences.cpp:575
 msgid ""
 "Set the size for the icons in secondary toolbars to use (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:577
+#: ../src/ui/dialog/inkscape-preferences.cpp:578
 msgid "Work-around color sliders not drawing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:579
+#: ../src/ui/dialog/inkscape-preferences.cpp:580
 msgid ""
 "When on, will attempt to work around bugs in certain GTK themes drawing "
 "color sliders"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:584
+#: ../src/ui/dialog/inkscape-preferences.cpp:585
 msgid "Clear list"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:587
+#: ../src/ui/dialog/inkscape-preferences.cpp:588
 msgid "Maximum documents in Open _Recent:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:588
+#: ../src/ui/dialog/inkscape-preferences.cpp:589
 msgid ""
 "Set the maximum length of the Open Recent list in the File menu, or clear "
 "the list"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:591
+#: ../src/ui/dialog/inkscape-preferences.cpp:592
 msgid "_Zoom correction factor (in %):"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:592
+#: ../src/ui/dialog/inkscape-preferences.cpp:593
 msgid ""
 "Adjust the slider until the length of the ruler on your screen matches its "
 "real length. This information is used when zooming to 1:1, 1:2, etc., to "
 "display objects in their true sizes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:595
+#: ../src/ui/dialog/inkscape-preferences.cpp:596
 msgid "Enable dynamic relayout for incomplete sections"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:597
+#: ../src/ui/dialog/inkscape-preferences.cpp:598
 msgid ""
 "When on, will allow dynamic layout of components that are not completely "
 "finished being refactored"
 msgstr ""
 
 #. show infobox
-#: ../src/ui/dialog/inkscape-preferences.cpp:600
+#: ../src/ui/dialog/inkscape-preferences.cpp:601
 msgid "Show filter primitives infobox"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:602
+#: ../src/ui/dialog/inkscape-preferences.cpp:603
 msgid ""
 "Show icons and descriptions for the filter primitives available at the "
 "filter effects dialog"
 msgstr ""
 
+#: ../src/ui/dialog/inkscape-preferences.cpp:606
+#: ../src/ui/dialog/inkscape-preferences.cpp:614
+msgid "Icons only"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:606
+#: ../src/ui/dialog/inkscape-preferences.cpp:614
+msgid "Text only"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:606
+#: ../src/ui/dialog/inkscape-preferences.cpp:614
+msgid "Icons and text"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:611
+msgid "Dockbar style (requires restart):"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:612
+msgid ""
+"Selects whether the vertical bars on the dockbar will show text labels, "
+"icons, or both"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:619
+msgid "Switcher style (requires restart):"
+msgstr ""
+
+#: ../src/ui/dialog/inkscape-preferences.cpp:620
+msgid ""
+"Selects whether the dockbar switcher will show text labels, icons, or both"
+msgstr ""
+
 #. Windows
-#: ../src/ui/dialog/inkscape-preferences.cpp:605
+#: ../src/ui/dialog/inkscape-preferences.cpp:624
 msgid "Save and restore window geometry for each document"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:606
+#: ../src/ui/dialog/inkscape-preferences.cpp:625
 msgid "Remember and use last window's geometry"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:607
+#: ../src/ui/dialog/inkscape-preferences.cpp:626
 msgid "Don't save window geometry"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:609
+#: ../src/ui/dialog/inkscape-preferences.cpp:628
 msgid "Save and restore dialogs status"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:610
-#: ../src/ui/dialog/inkscape-preferences.cpp:637
+#: ../src/ui/dialog/inkscape-preferences.cpp:629
+#: ../src/ui/dialog/inkscape-preferences.cpp:656
 msgid "Don't save dialogs status"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:612
-#: ../src/ui/dialog/inkscape-preferences.cpp:645
+#: ../src/ui/dialog/inkscape-preferences.cpp:631
+#: ../src/ui/dialog/inkscape-preferences.cpp:664
 msgid "Dockable"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:616
+#: ../src/ui/dialog/inkscape-preferences.cpp:635
 msgid "Native open/save dialogs"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:617
+#: ../src/ui/dialog/inkscape-preferences.cpp:636
 msgid "GTK open/save dialogs"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:619
+#: ../src/ui/dialog/inkscape-preferences.cpp:638
 msgid "Dialogs are hidden in taskbar"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:620
+#: ../src/ui/dialog/inkscape-preferences.cpp:639
 msgid "Save and restore documents viewport"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:621
+#: ../src/ui/dialog/inkscape-preferences.cpp:640
 msgid "Zoom when window is resized"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:622
+#: ../src/ui/dialog/inkscape-preferences.cpp:641
 msgid "Show close button on dialogs"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:625
+#: ../src/ui/dialog/inkscape-preferences.cpp:644
 msgid "Aggressive"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:627
+#: ../src/ui/dialog/inkscape-preferences.cpp:646
 msgid "Saving window geometry (size and position)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:629
+#: ../src/ui/dialog/inkscape-preferences.cpp:648
 msgid "Let the window manager determine placement of all windows"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:631
+#: ../src/ui/dialog/inkscape-preferences.cpp:650
 msgid ""
 "Remember and use the last window's geometry (saves geometry to user "
 "preferences)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:633
+#: ../src/ui/dialog/inkscape-preferences.cpp:652
 msgid ""
 "Save and restore window geometry for each document (saves geometry in the "
 "document)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:635
+#: ../src/ui/dialog/inkscape-preferences.cpp:654
 msgid "Saving dialogs status"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:639
+#: ../src/ui/dialog/inkscape-preferences.cpp:658
 msgid ""
 "Save and restore dialogs status (the last open windows dialogs are saved "
 "when it closes)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:643
+#: ../src/ui/dialog/inkscape-preferences.cpp:662
 msgid "Dialog behavior (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:649
+#: ../src/ui/dialog/inkscape-preferences.cpp:668
 msgid "Desktop integration"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:651
+#: ../src/ui/dialog/inkscape-preferences.cpp:670
 msgid "Use Windows like open and save dialogs"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:653
+#: ../src/ui/dialog/inkscape-preferences.cpp:672
 msgid "Use GTK open and save dialogs "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:657
+#: ../src/ui/dialog/inkscape-preferences.cpp:676
 msgid "Dialogs on top:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:660
+#: ../src/ui/dialog/inkscape-preferences.cpp:679
 msgid "Dialogs are treated as regular windows"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:662
+#: ../src/ui/dialog/inkscape-preferences.cpp:681
 msgid "Dialogs stay on top of document windows"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:664
+#: ../src/ui/dialog/inkscape-preferences.cpp:683
 msgid "Same as Normal but may work better with some window managers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:667
+#: ../src/ui/dialog/inkscape-preferences.cpp:686
 msgid "Dialog Transparency"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:669
+#: ../src/ui/dialog/inkscape-preferences.cpp:688
 msgid "_Opacity when focused:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:671
+#: ../src/ui/dialog/inkscape-preferences.cpp:690
 msgid "Opacity when _unfocused:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:673
+#: ../src/ui/dialog/inkscape-preferences.cpp:692
 msgid "_Time of opacity change animation:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:676
+#: ../src/ui/dialog/inkscape-preferences.cpp:695
 msgid "Miscellaneous"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:679
+#: ../src/ui/dialog/inkscape-preferences.cpp:698
 msgid "Whether dialog windows are to be hidden in the window manager taskbar"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:682
+#: ../src/ui/dialog/inkscape-preferences.cpp:701
 msgid ""
 "Zoom drawing when document window is resized, to keep the same area visible "
 "(this is the default which can be changed in any window using the button "
 "above the right scrollbar)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:684
+#: ../src/ui/dialog/inkscape-preferences.cpp:703
 msgid ""
 "Save documents viewport (zoom and panning position). Useful to turn off when "
 "sharing version controlled files."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:686
+#: ../src/ui/dialog/inkscape-preferences.cpp:705
 msgid "Whether dialog windows have a close button (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:687
+#: ../src/ui/dialog/inkscape-preferences.cpp:706
 msgid "Windows"
 msgstr ""
 
 #. Grids
-#: ../src/ui/dialog/inkscape-preferences.cpp:690
+#: ../src/ui/dialog/inkscape-preferences.cpp:709
 msgid "Line color when zooming out"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:693
+#: ../src/ui/dialog/inkscape-preferences.cpp:712
 msgid "The gridlines will be shown in minor grid line color"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:695
+#: ../src/ui/dialog/inkscape-preferences.cpp:714
 msgid "The gridlines will be shown in major grid line color"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:697
+#: ../src/ui/dialog/inkscape-preferences.cpp:716
 msgid "Default grid settings"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:703
-#: ../src/ui/dialog/inkscape-preferences.cpp:728
+#: ../src/ui/dialog/inkscape-preferences.cpp:722
+#: ../src/ui/dialog/inkscape-preferences.cpp:747
 msgid "Grid units:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:708
-#: ../src/ui/dialog/inkscape-preferences.cpp:733
+#: ../src/ui/dialog/inkscape-preferences.cpp:727
+#: ../src/ui/dialog/inkscape-preferences.cpp:752
 msgid "Origin X:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:709
-#: ../src/ui/dialog/inkscape-preferences.cpp:734
+#: ../src/ui/dialog/inkscape-preferences.cpp:728
+#: ../src/ui/dialog/inkscape-preferences.cpp:753
 msgid "Origin Y:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:714
+#: ../src/ui/dialog/inkscape-preferences.cpp:733
 msgid "Spacing X:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:715
-#: ../src/ui/dialog/inkscape-preferences.cpp:737
+#: ../src/ui/dialog/inkscape-preferences.cpp:734
+#: ../src/ui/dialog/inkscape-preferences.cpp:756
 msgid "Spacing Y:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:717
-#: ../src/ui/dialog/inkscape-preferences.cpp:718
-#: ../src/ui/dialog/inkscape-preferences.cpp:742
-#: ../src/ui/dialog/inkscape-preferences.cpp:743
+#: ../src/ui/dialog/inkscape-preferences.cpp:736
+#: ../src/ui/dialog/inkscape-preferences.cpp:737
+#: ../src/ui/dialog/inkscape-preferences.cpp:761
+#: ../src/ui/dialog/inkscape-preferences.cpp:762
 msgid "Minor grid line color:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:718
-#: ../src/ui/dialog/inkscape-preferences.cpp:743
+#: ../src/ui/dialog/inkscape-preferences.cpp:737
+#: ../src/ui/dialog/inkscape-preferences.cpp:762
 msgid "Color used for normal grid lines"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:719
-#: ../src/ui/dialog/inkscape-preferences.cpp:720
-#: ../src/ui/dialog/inkscape-preferences.cpp:744
-#: ../src/ui/dialog/inkscape-preferences.cpp:745
+#: ../src/ui/dialog/inkscape-preferences.cpp:738
+#: ../src/ui/dialog/inkscape-preferences.cpp:739
+#: ../src/ui/dialog/inkscape-preferences.cpp:763
+#: ../src/ui/dialog/inkscape-preferences.cpp:764
 msgid "Major grid line color:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:720
-#: ../src/ui/dialog/inkscape-preferences.cpp:745
+#: ../src/ui/dialog/inkscape-preferences.cpp:739
+#: ../src/ui/dialog/inkscape-preferences.cpp:764
 msgid "Color used for major (highlighted) grid lines"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:722
-#: ../src/ui/dialog/inkscape-preferences.cpp:747
+#: ../src/ui/dialog/inkscape-preferences.cpp:741
+#: ../src/ui/dialog/inkscape-preferences.cpp:766
 msgid "Major grid line every:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:723
+#: ../src/ui/dialog/inkscape-preferences.cpp:742
 msgid "Show dots instead of lines"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:724
+#: ../src/ui/dialog/inkscape-preferences.cpp:743
 msgid "If set, display dots at gridpoints instead of gridlines"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:798
+#: ../src/ui/dialog/inkscape-preferences.cpp:817
 msgid "Input/Output"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:801
+#: ../src/ui/dialog/inkscape-preferences.cpp:820
 msgid "Use current directory for \"Save As ...\""
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:803
+#: ../src/ui/dialog/inkscape-preferences.cpp:822
 msgid ""
 "When this option is on, the \"Save as...\" and \"Save a Copy\" dialogs will "
 "always open in the directory where the currently open document is; when it's "
 "off, each will open in the directory where you last saved a file using it"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:805
+#: ../src/ui/dialog/inkscape-preferences.cpp:824
 msgid "Add label comments to printing output"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:807
+#: ../src/ui/dialog/inkscape-preferences.cpp:826
 msgid ""
 "When on, a comment will be added to the raw print output, marking the "
 "rendered output for an object with its label"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:809
+#: ../src/ui/dialog/inkscape-preferences.cpp:828
 msgid "Add default metadata to new documents"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:811
+#: ../src/ui/dialog/inkscape-preferences.cpp:830
 msgid ""
 "Add default metadata to new documents. Default metadata can be set from "
 "Document Properties->Metadata."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:815
+#: ../src/ui/dialog/inkscape-preferences.cpp:834
 msgid "_Grab sensitivity:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:815
+#: ../src/ui/dialog/inkscape-preferences.cpp:834
 msgid "pixels (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:816
+#: ../src/ui/dialog/inkscape-preferences.cpp:835
 msgid ""
 "How close on the screen you need to be to an object to be able to grab it "
 "with mouse (in screen pixels)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:818
+#: ../src/ui/dialog/inkscape-preferences.cpp:837
 msgid "_Click/drag threshold:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:818
-#: ../src/ui/dialog/inkscape-preferences.cpp:1149
-#: ../src/ui/dialog/inkscape-preferences.cpp:1153
-#: ../src/ui/dialog/inkscape-preferences.cpp:1163
+#: ../src/ui/dialog/inkscape-preferences.cpp:837
+#: ../src/ui/dialog/inkscape-preferences.cpp:1168
+#: ../src/ui/dialog/inkscape-preferences.cpp:1172
+#: ../src/ui/dialog/inkscape-preferences.cpp:1182
 msgid "pixels"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:819
+#: ../src/ui/dialog/inkscape-preferences.cpp:838
 msgid ""
 "Maximum mouse drag (in screen pixels) which is considered a click, not a drag"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:822
+#: ../src/ui/dialog/inkscape-preferences.cpp:841
 msgid "_Handle size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:823
+#: ../src/ui/dialog/inkscape-preferences.cpp:842
 msgid "Set the relative size of node handles"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:825
+#: ../src/ui/dialog/inkscape-preferences.cpp:844
 msgid "Use pressure-sensitive tablet (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:827
+#: ../src/ui/dialog/inkscape-preferences.cpp:846
 msgid ""
 "Use the capabilities of a tablet or other pressure-sensitive device. Disable "
 "this only if you have problems with the tablet (you can still use it as a "
 "mouse)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:829
+#: ../src/ui/dialog/inkscape-preferences.cpp:848
 msgid "Switch tool based on tablet device (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:831
+#: ../src/ui/dialog/inkscape-preferences.cpp:850
 msgid ""
 "Change tool as different devices are used on the tablet (pen, eraser, mouse)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:832
+#: ../src/ui/dialog/inkscape-preferences.cpp:851
 msgid "Input devices"
 msgstr ""
 
 #. SVG output options
-#: ../src/ui/dialog/inkscape-preferences.cpp:835
+#: ../src/ui/dialog/inkscape-preferences.cpp:854
 msgid "Use named colors"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:836
+#: ../src/ui/dialog/inkscape-preferences.cpp:855
 msgid ""
 "If set, write the CSS name of the color when available (e.g. 'red' or "
 "'magenta') instead of the numeric value"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:838
+#: ../src/ui/dialog/inkscape-preferences.cpp:857
 msgid "XML formatting"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:840
+#: ../src/ui/dialog/inkscape-preferences.cpp:859
 msgid "Inline attributes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:841
+#: ../src/ui/dialog/inkscape-preferences.cpp:860
 msgid "Put attributes on the same line as the element tag"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:844
+#: ../src/ui/dialog/inkscape-preferences.cpp:863
 msgid "_Indent, spaces:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:844
+#: ../src/ui/dialog/inkscape-preferences.cpp:863
 msgid ""
 "The number of spaces to use for indenting nested elements; set to 0 for no "
 "indentation"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:846
+#: ../src/ui/dialog/inkscape-preferences.cpp:865
 msgid "Path data"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:848
+#: ../src/ui/dialog/inkscape-preferences.cpp:867
 msgid "Allow relative coordinates"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:849
+#: ../src/ui/dialog/inkscape-preferences.cpp:868
 msgid "If set, relative coordinates may be used in path data"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:851
+#: ../src/ui/dialog/inkscape-preferences.cpp:870
 msgid "Force repeat commands"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:852
+#: ../src/ui/dialog/inkscape-preferences.cpp:871
 msgid ""
 "Force repeating of the same path command (for example, 'L 1,2 L 3,4' instead "
 "of 'L 1,2 3,4')"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:854
+#: ../src/ui/dialog/inkscape-preferences.cpp:873
 msgid "Numbers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:857
+#: ../src/ui/dialog/inkscape-preferences.cpp:876
 msgid "_Numeric precision:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:857
+#: ../src/ui/dialog/inkscape-preferences.cpp:876
 msgid "Significant figures of the values written to the SVG file"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:860
+#: ../src/ui/dialog/inkscape-preferences.cpp:879
 msgid "Minimum _exponent:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:860
+#: ../src/ui/dialog/inkscape-preferences.cpp:879
 msgid ""
 "The smallest number written to SVG is 10 to the power of this exponent; "
 "anything smaller is written as zero"
@@ -17102,56 +17137,56 @@ msgstr ""
 
 #. Code to add controls for attribute checking options
 #. Add incorrect style properties options
-#: ../src/ui/dialog/inkscape-preferences.cpp:865
+#: ../src/ui/dialog/inkscape-preferences.cpp:884
 msgid "Improper Attributes Actions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:867
-#: ../src/ui/dialog/inkscape-preferences.cpp:875
-#: ../src/ui/dialog/inkscape-preferences.cpp:883
+#: ../src/ui/dialog/inkscape-preferences.cpp:886
+#: ../src/ui/dialog/inkscape-preferences.cpp:894
+#: ../src/ui/dialog/inkscape-preferences.cpp:902
 msgid "Print warnings"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:868
+#: ../src/ui/dialog/inkscape-preferences.cpp:887
 msgid ""
 "Print warning if invalid or non-useful attributes found. Database files "
 "located in inkscape_data_dir/attributes."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:869
+#: ../src/ui/dialog/inkscape-preferences.cpp:888
 msgid "Remove attributes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:870
+#: ../src/ui/dialog/inkscape-preferences.cpp:889
 msgid "Delete invalid or non-useful attributes from element tag"
 msgstr ""
 
 #. Add incorrect style properties options
-#: ../src/ui/dialog/inkscape-preferences.cpp:873
+#: ../src/ui/dialog/inkscape-preferences.cpp:892
 msgid "Inappropriate Style Properties Actions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:876
+#: ../src/ui/dialog/inkscape-preferences.cpp:895
 msgid ""
 "Print warning if inappropriate style properties found (i.e. 'font-family' "
 "set on a <rect>). Database files located in inkscape_data_dir/attributes."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:877
-#: ../src/ui/dialog/inkscape-preferences.cpp:885
+#: ../src/ui/dialog/inkscape-preferences.cpp:896
+#: ../src/ui/dialog/inkscape-preferences.cpp:904
 msgid "Remove style properties"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:878
+#: ../src/ui/dialog/inkscape-preferences.cpp:897
 msgid "Delete inappropriate style properties"
 msgstr ""
 
 #. Add default or inherited style properties options
-#: ../src/ui/dialog/inkscape-preferences.cpp:881
+#: ../src/ui/dialog/inkscape-preferences.cpp:900
 msgid "Non-useful Style Properties Actions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:884
+#: ../src/ui/dialog/inkscape-preferences.cpp:903
 msgid ""
 "Print warning if redundant style properties found (i.e. if a property has "
 "the default value and a different value is not inherited or if value is the "
@@ -17159,207 +17194,207 @@ msgid ""
 "attributes."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:886
+#: ../src/ui/dialog/inkscape-preferences.cpp:905
 msgid "Delete redundant style properties"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:888
+#: ../src/ui/dialog/inkscape-preferences.cpp:907
 msgid "Check Attributes and Style Properties on"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:890
+#: ../src/ui/dialog/inkscape-preferences.cpp:909
 msgid "Reading"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:891
+#: ../src/ui/dialog/inkscape-preferences.cpp:910
 msgid ""
 "Check attributes and style properties on reading in SVG files (including "
 "those internal to Inkscape which will slow down startup)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:892
+#: ../src/ui/dialog/inkscape-preferences.cpp:911
 msgid "Editing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:893
+#: ../src/ui/dialog/inkscape-preferences.cpp:912
 msgid ""
 "Check attributes and style properties while editing SVG files (may slow down "
 "Inkscape, mostly useful for debugging)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:894
+#: ../src/ui/dialog/inkscape-preferences.cpp:913
 msgid "Writing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:895
+#: ../src/ui/dialog/inkscape-preferences.cpp:914
 msgid "Check attributes and style properties on writing out SVG files"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:897
+#: ../src/ui/dialog/inkscape-preferences.cpp:916
 msgid "SVG output"
 msgstr ""
 
 #. TRANSLATORS: see http://www.newsandtech.com/issues/2004/03-04/pt/03-04_rendering.htm
-#: ../src/ui/dialog/inkscape-preferences.cpp:903
+#: ../src/ui/dialog/inkscape-preferences.cpp:922
 msgid "Perceptual"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:903
+#: ../src/ui/dialog/inkscape-preferences.cpp:922
 msgid "Relative Colorimetric"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:903
+#: ../src/ui/dialog/inkscape-preferences.cpp:922
 msgid "Absolute Colorimetric"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:907
+#: ../src/ui/dialog/inkscape-preferences.cpp:926
 msgid "(Note: Color management has been disabled in this build)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:911
+#: ../src/ui/dialog/inkscape-preferences.cpp:930
 msgid "Display adjustment"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:921
+#: ../src/ui/dialog/inkscape-preferences.cpp:940
 #, c-format
 msgid ""
 "The ICC profile to use to calibrate display output.\n"
 "Searched directories:%s"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:922
+#: ../src/ui/dialog/inkscape-preferences.cpp:941
 msgid "Display profile:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:927
+#: ../src/ui/dialog/inkscape-preferences.cpp:946
 msgid "Retrieve profile from display"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:930
+#: ../src/ui/dialog/inkscape-preferences.cpp:949
 msgid "Retrieve profiles from those attached to displays via XICC"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:932
+#: ../src/ui/dialog/inkscape-preferences.cpp:951
 msgid "Retrieve profiles from those attached to displays"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:937
+#: ../src/ui/dialog/inkscape-preferences.cpp:956
 msgid "Display rendering intent:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:938
+#: ../src/ui/dialog/inkscape-preferences.cpp:957
 msgid "The rendering intent to use to calibrate display output"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:940
+#: ../src/ui/dialog/inkscape-preferences.cpp:959
 msgid "Proofing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:942
+#: ../src/ui/dialog/inkscape-preferences.cpp:961
 msgid "Simulate output on screen"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:944
+#: ../src/ui/dialog/inkscape-preferences.cpp:963
 msgid "Simulates output of target device"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:946
+#: ../src/ui/dialog/inkscape-preferences.cpp:965
 msgid "Mark out of gamut colors"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:948
+#: ../src/ui/dialog/inkscape-preferences.cpp:967
 msgid "Highlights colors that are out of gamut for the target device"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:953
+#: ../src/ui/dialog/inkscape-preferences.cpp:972
 msgid "Out of gamut warning color:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:954
+#: ../src/ui/dialog/inkscape-preferences.cpp:973
 msgid "Selects the color used for out of gamut warning"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:956
+#: ../src/ui/dialog/inkscape-preferences.cpp:975
 msgid "Device profile:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:957
+#: ../src/ui/dialog/inkscape-preferences.cpp:976
 msgid "The ICC profile to use to simulate device output"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:960
+#: ../src/ui/dialog/inkscape-preferences.cpp:979
 msgid "Device rendering intent:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:961
+#: ../src/ui/dialog/inkscape-preferences.cpp:980
 msgid "The rendering intent to use to calibrate device output"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:963
+#: ../src/ui/dialog/inkscape-preferences.cpp:982
 msgid "Black point compensation"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:965
+#: ../src/ui/dialog/inkscape-preferences.cpp:984
 msgid "Enables black point compensation"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:967
+#: ../src/ui/dialog/inkscape-preferences.cpp:986
 msgid "Preserve black"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:974
+#: ../src/ui/dialog/inkscape-preferences.cpp:993
 msgid "(LittleCMS 1.15 or later required)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:976
+#: ../src/ui/dialog/inkscape-preferences.cpp:995
 msgid "Preserve K channel in CMYK -> CMYK transforms"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:990
+#: ../src/ui/dialog/inkscape-preferences.cpp:1009
 #: ../src/widgets/sp-color-icc-selector.cpp:324
 #: ../src/widgets/sp-color-icc-selector.cpp:677
 msgid "<none>"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1035
+#: ../src/ui/dialog/inkscape-preferences.cpp:1054
 msgid "Color management"
 msgstr ""
 
 #. Autosave options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1038
+#: ../src/ui/dialog/inkscape-preferences.cpp:1057
 msgid "Enable autosave (requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1039
+#: ../src/ui/dialog/inkscape-preferences.cpp:1058
 msgid ""
 "Automatically save the current document(s) at a given interval, thus "
 "minimizing loss in case of a crash"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1045
+#: ../src/ui/dialog/inkscape-preferences.cpp:1064
 msgctxt "Filesystem"
 msgid "Autosave _directory:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1045
+#: ../src/ui/dialog/inkscape-preferences.cpp:1064
 msgid ""
 "The directory where autosaves will be written. This should be an absolute "
 "path (starts with / on UNIX or a drive letter such as C: on Windows). "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1047
+#: ../src/ui/dialog/inkscape-preferences.cpp:1066
 msgid "_Interval (in minutes):"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1047
+#: ../src/ui/dialog/inkscape-preferences.cpp:1066
 msgid "Interval (in minutes) at which document will be autosaved"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1049
+#: ../src/ui/dialog/inkscape-preferences.cpp:1068
 msgid "_Maximum number of autosaves:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1049
+#: ../src/ui/dialog/inkscape-preferences.cpp:1068
 msgid ""
 "Maximum number of autosaved files; use this to limit the storage space used"
 msgstr ""
@@ -17376,261 +17411,261 @@ msgstr ""
 #. _autosave_autosave_interval.signal_changed().connect( sigc::ptr_fun(inkscape_autosave_init), TRUE );
 #.
 #. -----------
-#: ../src/ui/dialog/inkscape-preferences.cpp:1064
+#: ../src/ui/dialog/inkscape-preferences.cpp:1083
 msgid "Autosave"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1068
+#: ../src/ui/dialog/inkscape-preferences.cpp:1087
 msgid "Open Clip Art Library _Server Name:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1069
+#: ../src/ui/dialog/inkscape-preferences.cpp:1088
 msgid ""
 "The server name of the Open Clip Art Library webdav server; it's used by the "
 "Import and Export to OCAL function"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1071
+#: ../src/ui/dialog/inkscape-preferences.cpp:1090
 msgid "Open Clip Art Library _Username:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1072
+#: ../src/ui/dialog/inkscape-preferences.cpp:1091
 msgid "The username used to log into Open Clip Art Library"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1074
+#: ../src/ui/dialog/inkscape-preferences.cpp:1093
 msgid "Open Clip Art Library _Password:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1075
+#: ../src/ui/dialog/inkscape-preferences.cpp:1094
 msgid "The password used to log into Open Clip Art Library"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1076
+#: ../src/ui/dialog/inkscape-preferences.cpp:1095
 msgid "Open Clip Art"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1081
+#: ../src/ui/dialog/inkscape-preferences.cpp:1100
 msgid "Behavior"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1085
+#: ../src/ui/dialog/inkscape-preferences.cpp:1104
 msgid "_Simplification threshold:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1086
+#: ../src/ui/dialog/inkscape-preferences.cpp:1105
 msgid ""
 "How strong is the Node tool's Simplify command by default. If you invoke "
 "this command several times in quick succession, it will act more and more "
 "aggressively; invoking it again after a pause restores the default threshold."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1088
+#: ../src/ui/dialog/inkscape-preferences.cpp:1107
 msgid "Color stock markers the same color as object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1089
+#: ../src/ui/dialog/inkscape-preferences.cpp:1108
 msgid "Color custom markers the same color as object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1090
-#: ../src/ui/dialog/inkscape-preferences.cpp:1300
+#: ../src/ui/dialog/inkscape-preferences.cpp:1109
+#: ../src/ui/dialog/inkscape-preferences.cpp:1319
 msgid "Update marker color when object color changes"
 msgstr ""
 
 #. Selecting options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1093
+#: ../src/ui/dialog/inkscape-preferences.cpp:1112
 msgid "Select in all layers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1094
+#: ../src/ui/dialog/inkscape-preferences.cpp:1113
 msgid "Select only within current layer"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1095
+#: ../src/ui/dialog/inkscape-preferences.cpp:1114
 msgid "Select in current layer and sublayers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1096
+#: ../src/ui/dialog/inkscape-preferences.cpp:1115
 msgid "Ignore hidden objects and layers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1097
+#: ../src/ui/dialog/inkscape-preferences.cpp:1116
 msgid "Ignore locked objects and layers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1098
+#: ../src/ui/dialog/inkscape-preferences.cpp:1117
 msgid "Deselect upon layer change"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1101
+#: ../src/ui/dialog/inkscape-preferences.cpp:1120
 msgid ""
 "Uncheck this to be able to keep the current objects selected when the "
 "current layer changes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1103
+#: ../src/ui/dialog/inkscape-preferences.cpp:1122
 msgid "Ctrl+A, Tab, Shift+Tab"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1105
+#: ../src/ui/dialog/inkscape-preferences.cpp:1124
 msgid "Make keyboard selection commands work on objects in all layers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1107
+#: ../src/ui/dialog/inkscape-preferences.cpp:1126
 msgid "Make keyboard selection commands work on objects in current layer only"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1109
+#: ../src/ui/dialog/inkscape-preferences.cpp:1128
 msgid ""
 "Make keyboard selection commands work on objects in current layer and all "
 "its sublayers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1111
+#: ../src/ui/dialog/inkscape-preferences.cpp:1130
 msgid ""
 "Uncheck this to be able to select objects that are hidden (either by "
 "themselves or by being in a hidden layer)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1113
+#: ../src/ui/dialog/inkscape-preferences.cpp:1132
 msgid ""
 "Uncheck this to be able to select objects that are locked (either by "
 "themselves or by being in a locked layer)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1115
+#: ../src/ui/dialog/inkscape-preferences.cpp:1134
 msgid "Wrap when cycling objects in z-order"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1117
+#: ../src/ui/dialog/inkscape-preferences.cpp:1136
 msgid "Alt+Scroll Wheel"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1119
+#: ../src/ui/dialog/inkscape-preferences.cpp:1138
 msgid "Wrap around at start and end when cycling objects in z-order"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1121
+#: ../src/ui/dialog/inkscape-preferences.cpp:1140
 msgid "Selecting"
 msgstr ""
 
 #. Transforms options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1124
+#: ../src/ui/dialog/inkscape-preferences.cpp:1143
 #: ../src/widgets/select-toolbar.cpp:572
 msgid "Scale stroke width"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1125
+#: ../src/ui/dialog/inkscape-preferences.cpp:1144
 msgid "Scale rounded corners in rectangles"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1126
+#: ../src/ui/dialog/inkscape-preferences.cpp:1145
 msgid "Transform gradients"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1127
+#: ../src/ui/dialog/inkscape-preferences.cpp:1146
 msgid "Transform patterns"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1128
+#: ../src/ui/dialog/inkscape-preferences.cpp:1147
 msgid "Optimized"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1129
+#: ../src/ui/dialog/inkscape-preferences.cpp:1148
 msgid "Preserved"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1132
+#: ../src/ui/dialog/inkscape-preferences.cpp:1151
 #: ../src/widgets/select-toolbar.cpp:573
 msgid "When scaling objects, scale the stroke width by the same proportion"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1134
+#: ../src/ui/dialog/inkscape-preferences.cpp:1153
 #: ../src/widgets/select-toolbar.cpp:584
 msgid "When scaling rectangles, scale the radii of rounded corners"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1136
+#: ../src/ui/dialog/inkscape-preferences.cpp:1155
 #: ../src/widgets/select-toolbar.cpp:595
 msgid "Move gradients (in fill or stroke) along with the objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1138
+#: ../src/ui/dialog/inkscape-preferences.cpp:1157
 #: ../src/widgets/select-toolbar.cpp:606
 msgid "Move patterns (in fill or stroke) along with the objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1139
+#: ../src/ui/dialog/inkscape-preferences.cpp:1158
 msgid "Store transformation"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1141
+#: ../src/ui/dialog/inkscape-preferences.cpp:1160
 msgid ""
 "If possible, apply transformation to objects without adding a transform= "
 "attribute"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1143
+#: ../src/ui/dialog/inkscape-preferences.cpp:1162
 msgid "Always store transformation as a transform= attribute on objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1145
+#: ../src/ui/dialog/inkscape-preferences.cpp:1164
 msgid "Transforms"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1149
+#: ../src/ui/dialog/inkscape-preferences.cpp:1168
 msgid "Mouse _wheel scrolls by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1150
+#: ../src/ui/dialog/inkscape-preferences.cpp:1169
 msgid ""
 "One mouse wheel notch scrolls by this distance in screen pixels "
 "(horizontally with Shift)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1151
+#: ../src/ui/dialog/inkscape-preferences.cpp:1170
 msgid "Ctrl+arrows"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1153
+#: ../src/ui/dialog/inkscape-preferences.cpp:1172
 msgid "Sc_roll by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1154
+#: ../src/ui/dialog/inkscape-preferences.cpp:1173
 msgid "Pressing Ctrl+arrow key scrolls by this distance (in screen pixels)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1156
+#: ../src/ui/dialog/inkscape-preferences.cpp:1175
 msgid "_Acceleration:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1157
+#: ../src/ui/dialog/inkscape-preferences.cpp:1176
 msgid ""
 "Pressing and holding Ctrl+arrow will gradually speed up scrolling (0 for no "
 "acceleration)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1158
+#: ../src/ui/dialog/inkscape-preferences.cpp:1177
 msgid "Autoscrolling"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1160
+#: ../src/ui/dialog/inkscape-preferences.cpp:1179
 msgid "_Speed:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1161
+#: ../src/ui/dialog/inkscape-preferences.cpp:1180
 msgid ""
 "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn "
 "autoscroll off)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1163
+#: ../src/ui/dialog/inkscape-preferences.cpp:1182
 #: ../src/ui/dialog/tracedialog.cpp:521 ../src/ui/dialog/tracedialog.cpp:720
 msgid "_Threshold:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1164
+#: ../src/ui/dialog/inkscape-preferences.cpp:1183
 msgid ""
 "How far (in screen pixels) you need to be from the canvas edge to trigger "
 "autoscroll; positive is outside the canvas, negative is within the canvas"
@@ -17641,211 +17676,211 @@ msgstr ""
 #. _page_scrolling.add_line( false, "", _scroll_space, "",
 #. _("When on, pressing and holding Space and dragging with left mouse button pans canvas (as in Adobe Illustrator); when off, Space temporarily switches to Selector tool (default)"));
 #.
-#: ../src/ui/dialog/inkscape-preferences.cpp:1170
+#: ../src/ui/dialog/inkscape-preferences.cpp:1189
 msgid "Mouse wheel zooms by default"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1172
+#: ../src/ui/dialog/inkscape-preferences.cpp:1191
 msgid ""
 "When on, mouse wheel zooms without Ctrl and scrolls canvas with Ctrl; when "
 "off, it zooms with Ctrl and scrolls without Ctrl"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1173
+#: ../src/ui/dialog/inkscape-preferences.cpp:1192
 msgid "Scrolling"
 msgstr ""
 
 #. Snapping options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1176
+#: ../src/ui/dialog/inkscape-preferences.cpp:1195
 msgid "Enable snap indicator"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1178
+#: ../src/ui/dialog/inkscape-preferences.cpp:1197
 msgid "After snapping, a symbol is drawn at the point that has snapped"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1181
+#: ../src/ui/dialog/inkscape-preferences.cpp:1200
 msgid "_Delay (in ms):"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1182
+#: ../src/ui/dialog/inkscape-preferences.cpp:1201
 msgid ""
 "Postpone snapping as long as the mouse is moving, and then wait an "
 "additional fraction of a second. This additional delay is specified here. "
 "When set to zero or to a very small number, snapping will be immediate."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1184
+#: ../src/ui/dialog/inkscape-preferences.cpp:1203
 msgid "Only snap the node closest to the pointer"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1186
+#: ../src/ui/dialog/inkscape-preferences.cpp:1205
 msgid ""
 "Only try to snap the node that is initially closest to the mouse pointer"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1189
+#: ../src/ui/dialog/inkscape-preferences.cpp:1208
 msgid "_Weight factor:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1190
+#: ../src/ui/dialog/inkscape-preferences.cpp:1209
 msgid ""
 "When multiple snap solutions are found, then Inkscape can either prefer the "
 "closest transformation (when set to 0), or prefer the node that was "
 "initially the closest to the pointer (when set to 1)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1192
+#: ../src/ui/dialog/inkscape-preferences.cpp:1211
 msgid "Snap the mouse pointer when dragging a constrained knot"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1194
+#: ../src/ui/dialog/inkscape-preferences.cpp:1213
 msgid ""
 "When dragging a knot along a constraint line, then snap the position of the "
 "mouse pointer instead of snapping the projection of the knot onto the "
 "constraint line"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1196
+#: ../src/ui/dialog/inkscape-preferences.cpp:1215
 msgid "Snapping"
 msgstr ""
 
 #. nudgedistance is limited to 1000 in select-context.cpp: use the same limit here
-#: ../src/ui/dialog/inkscape-preferences.cpp:1201
+#: ../src/ui/dialog/inkscape-preferences.cpp:1220
 msgid "_Arrow keys move by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1202
+#: ../src/ui/dialog/inkscape-preferences.cpp:1221
 msgid ""
 "Pressing an arrow key moves selected object(s) or node(s) by this distance"
 msgstr ""
 
 #. defaultscale is limited to 1000 in select-context.cpp: use the same limit here
-#: ../src/ui/dialog/inkscape-preferences.cpp:1205
+#: ../src/ui/dialog/inkscape-preferences.cpp:1224
 msgid "> and < _scale by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1206
+#: ../src/ui/dialog/inkscape-preferences.cpp:1225
 msgid "Pressing > or < scales selection up or down by this increment"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1208
+#: ../src/ui/dialog/inkscape-preferences.cpp:1227
 msgid "_Inset/Outset by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1209
+#: ../src/ui/dialog/inkscape-preferences.cpp:1228
 msgid "Inset and Outset commands displace the path by this distance"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1210
+#: ../src/ui/dialog/inkscape-preferences.cpp:1229
 msgid "Compass-like display of angles"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1212
+#: ../src/ui/dialog/inkscape-preferences.cpp:1231
 msgid ""
 "When on, angles are displayed with 0 at north, 0 to 360 range, positive "
 "clockwise; otherwise with 0 at east, -180 to 180 range, positive "
 "counterclockwise"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1218
+#: ../src/ui/dialog/inkscape-preferences.cpp:1237
 msgid "_Rotation snaps every:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1218
+#: ../src/ui/dialog/inkscape-preferences.cpp:1237
 msgid "degrees"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1219
+#: ../src/ui/dialog/inkscape-preferences.cpp:1238
 msgid ""
 "Rotating with Ctrl pressed snaps every that much degrees; also, pressing "
 "[ or ] rotates by this amount"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1220
+#: ../src/ui/dialog/inkscape-preferences.cpp:1239
 msgid "Relative snapping of guideline angles"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1222
+#: ../src/ui/dialog/inkscape-preferences.cpp:1241
 msgid ""
 "When on, the snap angles when rotating a guideline will be relative to the "
 "original angle"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1224
+#: ../src/ui/dialog/inkscape-preferences.cpp:1243
 msgid "_Zoom in/out by:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1225
+#: ../src/ui/dialog/inkscape-preferences.cpp:1244
 msgid ""
 "Zoom tool click, +/- keys, and middle click zoom in and out by this "
 "multiplier"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1226
+#: ../src/ui/dialog/inkscape-preferences.cpp:1245
 msgid "Steps"
 msgstr ""
 
 #. Clones options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1229
+#: ../src/ui/dialog/inkscape-preferences.cpp:1248
 msgid "Move in parallel"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1231
+#: ../src/ui/dialog/inkscape-preferences.cpp:1250
 msgid "Stay unmoved"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1233
+#: ../src/ui/dialog/inkscape-preferences.cpp:1252
 msgid "Move according to transform"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1235
+#: ../src/ui/dialog/inkscape-preferences.cpp:1254
 msgid "Are unlinked"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1237
+#: ../src/ui/dialog/inkscape-preferences.cpp:1256
 msgid "Are deleted"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1240
+#: ../src/ui/dialog/inkscape-preferences.cpp:1259
 msgid "Moving original: clones and linked offsets"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1242
+#: ../src/ui/dialog/inkscape-preferences.cpp:1261
 msgid "Clones are translated by the same vector as their original"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1244
+#: ../src/ui/dialog/inkscape-preferences.cpp:1263
 msgid "Clones preserve their positions when their original is moved"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1246
+#: ../src/ui/dialog/inkscape-preferences.cpp:1265
 msgid ""
 "Each clone moves according to the value of its transform= attribute; for "
 "example, a rotated clone will move in a different direction than its original"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1247
+#: ../src/ui/dialog/inkscape-preferences.cpp:1266
 msgid "Deleting original: clones"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1249
+#: ../src/ui/dialog/inkscape-preferences.cpp:1268
 msgid "Orphaned clones are converted to regular objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1251
+#: ../src/ui/dialog/inkscape-preferences.cpp:1270
 msgid "Orphaned clones are deleted along with their original"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1253
+#: ../src/ui/dialog/inkscape-preferences.cpp:1272
 msgid "Duplicating original+clones/linked offset"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1255
+#: ../src/ui/dialog/inkscape-preferences.cpp:1274
 msgid "Relink duplicated clones"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1257
+#: ../src/ui/dialog/inkscape-preferences.cpp:1276
 msgid ""
 "When duplicating a selection containing both a clone and its original "
 "(possibly in groups), relink the duplicated clone to the duplicated original "
@@ -17853,112 +17888,112 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: Heading for the Inkscape Preferences "Clones" Page
-#: ../src/ui/dialog/inkscape-preferences.cpp:1260
+#: ../src/ui/dialog/inkscape-preferences.cpp:1279
 msgid "Clones"
 msgstr ""
 
 #. Clip paths and masks options
-#: ../src/ui/dialog/inkscape-preferences.cpp:1263
+#: ../src/ui/dialog/inkscape-preferences.cpp:1282
 msgid "When applying, use the topmost selected object as clippath/mask"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1265
+#: ../src/ui/dialog/inkscape-preferences.cpp:1284
 msgid ""
 "Uncheck this to use the bottom selected object as the clipping path or mask"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1266
+#: ../src/ui/dialog/inkscape-preferences.cpp:1285
 msgid "Remove clippath/mask object after applying"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1268
+#: ../src/ui/dialog/inkscape-preferences.cpp:1287
 msgid ""
 "After applying, remove the object used as the clipping path or mask from the "
 "drawing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1270
+#: ../src/ui/dialog/inkscape-preferences.cpp:1289
 msgid "Before applying"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1272
+#: ../src/ui/dialog/inkscape-preferences.cpp:1291
 msgid "Do not group clipped/masked objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1273
-msgid "Enclose every clipped/masked object in its own group"
+#: ../src/ui/dialog/inkscape-preferences.cpp:1292
+msgid "Put every clipped/masked object in its own group"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1274
+#: ../src/ui/dialog/inkscape-preferences.cpp:1293
 msgid "Put all clipped/masked objects into one group"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1277
+#: ../src/ui/dialog/inkscape-preferences.cpp:1296
 msgid "Apply clippath/mask to every object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1280
+#: ../src/ui/dialog/inkscape-preferences.cpp:1299
 msgid "Apply clippath/mask to groups containing single object"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1283
+#: ../src/ui/dialog/inkscape-preferences.cpp:1302
 msgid "Apply clippath/mask to group containing all objects"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1285
+#: ../src/ui/dialog/inkscape-preferences.cpp:1304
 msgid "After releasing"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1287
+#: ../src/ui/dialog/inkscape-preferences.cpp:1306
 msgid "Ungroup automatically created groups"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1289
+#: ../src/ui/dialog/inkscape-preferences.cpp:1308
 msgid "Ungroup groups created when setting clip/mask"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1291
+#: ../src/ui/dialog/inkscape-preferences.cpp:1310
 msgid "Clippaths and masks"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1294
+#: ../src/ui/dialog/inkscape-preferences.cpp:1313
 msgid "Stroke Style Markers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1296
-#: ../src/ui/dialog/inkscape-preferences.cpp:1298
+#: ../src/ui/dialog/inkscape-preferences.cpp:1315
+#: ../src/ui/dialog/inkscape-preferences.cpp:1317
 msgid ""
 "Stroke color same as object, fill color either object fill color or marker "
 "fill color"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1302
+#: ../src/ui/dialog/inkscape-preferences.cpp:1321
 msgid "Markers"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1310
+#: ../src/ui/dialog/inkscape-preferences.cpp:1329
 msgid "Number of _Threads:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1310
-#: ../src/ui/dialog/inkscape-preferences.cpp:1811
+#: ../src/ui/dialog/inkscape-preferences.cpp:1329
+#: ../src/ui/dialog/inkscape-preferences.cpp:1830
 msgid "(requires restart)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1311
+#: ../src/ui/dialog/inkscape-preferences.cpp:1330
 msgid "Configure number of processors/threads to use when rendering filters"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1315
+#: ../src/ui/dialog/inkscape-preferences.cpp:1334
 msgid "Rendering _cache size:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1315
+#: ../src/ui/dialog/inkscape-preferences.cpp:1334
 msgctxt "mebibyte (2^20 bytes) abbreviation"
 msgid "MiB"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1315
+#: ../src/ui/dialog/inkscape-preferences.cpp:1334
 msgid ""
 "Set the amount of memory per document which can be used to store rendered "
 "parts of the drawing for later reuse; set to zero to disable caching"
@@ -17966,358 +18001,358 @@ msgstr ""
 
 #. blur quality
 #. filter quality
-#: ../src/ui/dialog/inkscape-preferences.cpp:1318
-#: ../src/ui/dialog/inkscape-preferences.cpp:1342
+#: ../src/ui/dialog/inkscape-preferences.cpp:1337
+#: ../src/ui/dialog/inkscape-preferences.cpp:1361
 msgid "Best quality (slowest)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1320
-#: ../src/ui/dialog/inkscape-preferences.cpp:1344
+#: ../src/ui/dialog/inkscape-preferences.cpp:1339
+#: ../src/ui/dialog/inkscape-preferences.cpp:1363
 msgid "Better quality (slower)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1322
-#: ../src/ui/dialog/inkscape-preferences.cpp:1346
+#: ../src/ui/dialog/inkscape-preferences.cpp:1341
+#: ../src/ui/dialog/inkscape-preferences.cpp:1365
 msgid "Average quality"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1324
-#: ../src/ui/dialog/inkscape-preferences.cpp:1348
+#: ../src/ui/dialog/inkscape-preferences.cpp:1343
+#: ../src/ui/dialog/inkscape-preferences.cpp:1367
 msgid "Lower quality (faster)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1326
-#: ../src/ui/dialog/inkscape-preferences.cpp:1350
+#: ../src/ui/dialog/inkscape-preferences.cpp:1345
+#: ../src/ui/dialog/inkscape-preferences.cpp:1369
 msgid "Lowest quality (fastest)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1329
+#: ../src/ui/dialog/inkscape-preferences.cpp:1348
 msgid "Gaussian blur quality for display"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1331
-#: ../src/ui/dialog/inkscape-preferences.cpp:1355
+#: ../src/ui/dialog/inkscape-preferences.cpp:1350
+#: ../src/ui/dialog/inkscape-preferences.cpp:1374
 msgid ""
 "Best quality, but display may be very slow at high zooms (bitmap export "
 "always uses best quality)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1333
-#: ../src/ui/dialog/inkscape-preferences.cpp:1357
+#: ../src/ui/dialog/inkscape-preferences.cpp:1352
+#: ../src/ui/dialog/inkscape-preferences.cpp:1376
 msgid "Better quality, but slower display"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1335
-#: ../src/ui/dialog/inkscape-preferences.cpp:1359
+#: ../src/ui/dialog/inkscape-preferences.cpp:1354
+#: ../src/ui/dialog/inkscape-preferences.cpp:1378
 msgid "Average quality, acceptable display speed"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1337
-#: ../src/ui/dialog/inkscape-preferences.cpp:1361
+#: ../src/ui/dialog/inkscape-preferences.cpp:1356
+#: ../src/ui/dialog/inkscape-preferences.cpp:1380
 msgid "Lower quality (some artifacts), but display is faster"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1339
-#: ../src/ui/dialog/inkscape-preferences.cpp:1363
+#: ../src/ui/dialog/inkscape-preferences.cpp:1358
+#: ../src/ui/dialog/inkscape-preferences.cpp:1382
 msgid "Lowest quality (considerable artifacts), but display is fastest"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1353
+#: ../src/ui/dialog/inkscape-preferences.cpp:1372
 msgid "Filter effects quality for display"
 msgstr ""
 
 #. build custom preferences tab
-#: ../src/ui/dialog/inkscape-preferences.cpp:1365
+#: ../src/ui/dialog/inkscape-preferences.cpp:1384
 #: ../src/ui/dialog/print.cpp:224
 msgid "Rendering"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1371
+#: ../src/ui/dialog/inkscape-preferences.cpp:1390
 msgid "2x2"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1371
+#: ../src/ui/dialog/inkscape-preferences.cpp:1390
 msgid "4x4"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1371
+#: ../src/ui/dialog/inkscape-preferences.cpp:1390
 msgid "8x8"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1371
+#: ../src/ui/dialog/inkscape-preferences.cpp:1390
 msgid "16x16"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1375
+#: ../src/ui/dialog/inkscape-preferences.cpp:1394
 msgid "Oversample bitmaps:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1378
+#: ../src/ui/dialog/inkscape-preferences.cpp:1397
 msgid "Automatically reload bitmaps"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1380
+#: ../src/ui/dialog/inkscape-preferences.cpp:1399
 msgid "Automatically reload linked images when file is changed on disk"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1382
+#: ../src/ui/dialog/inkscape-preferences.cpp:1401
 msgid "_Bitmap editor:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1384
+#: ../src/ui/dialog/inkscape-preferences.cpp:1403
 msgid "Default export _resolution:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1385
+#: ../src/ui/dialog/inkscape-preferences.cpp:1404
 msgid "Default bitmap resolution (in dots per inch) in the Export dialog"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1387
+#: ../src/ui/dialog/inkscape-preferences.cpp:1406
 msgid "Resolution for Create Bitmap _Copy:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1388
+#: ../src/ui/dialog/inkscape-preferences.cpp:1407
 msgid "Resolution used by the Create Bitmap Copy command"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1390
+#: ../src/ui/dialog/inkscape-preferences.cpp:1409
 msgid "Always embed"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1390
+#: ../src/ui/dialog/inkscape-preferences.cpp:1409
 msgid "Always link"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1390
+#: ../src/ui/dialog/inkscape-preferences.cpp:1409
 msgid "Ask"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1393
+#: ../src/ui/dialog/inkscape-preferences.cpp:1412
 msgid "Bitmap import:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1396
+#: ../src/ui/dialog/inkscape-preferences.cpp:1415
 msgid "Default _import resolution:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1397
+#: ../src/ui/dialog/inkscape-preferences.cpp:1416
 msgid "Default bitmap resolution (in dots per inch) for bitmap import"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1398
+#: ../src/ui/dialog/inkscape-preferences.cpp:1417
 msgid "Override file resolution"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1400
+#: ../src/ui/dialog/inkscape-preferences.cpp:1419
 msgid "Use default bitmap resolution in favor of information from file"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1402
+#: ../src/ui/dialog/inkscape-preferences.cpp:1421
 msgid "Bitmaps"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1414
+#: ../src/ui/dialog/inkscape-preferences.cpp:1433
 msgid ""
 "Select a file of predefined shortcuts to use. Any customized shortcuts you "
 "create will be added seperately to "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1417
+#: ../src/ui/dialog/inkscape-preferences.cpp:1436
 msgid "Shortcut file:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1420
+#: ../src/ui/dialog/inkscape-preferences.cpp:1439
 msgid "Search:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1432
+#: ../src/ui/dialog/inkscape-preferences.cpp:1451
 msgid "Shortcut"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1433
+#: ../src/ui/dialog/inkscape-preferences.cpp:1452
 #: ../src/ui/widget/page-sizer.cpp:262
 msgid "Description"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1474
+#: ../src/ui/dialog/inkscape-preferences.cpp:1493
 #: ../src/ui/dialog/svg-fonts-dialog.cpp:693
 #: ../src/ui/dialog/tracedialog.cpp:812
 #: ../src/ui/widget/preferences-widget.cpp:662
 msgid "Reset"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1474
+#: ../src/ui/dialog/inkscape-preferences.cpp:1493
 msgid ""
 "Remove all your customized keyboard shortcuts, and revert to the shortcuts "
 "in the shortcut file listed above"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1478
+#: ../src/ui/dialog/inkscape-preferences.cpp:1497
 msgid "Import ..."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1478
+#: ../src/ui/dialog/inkscape-preferences.cpp:1497
 msgid "Import custom keyboard shortcuts from a file"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1481
+#: ../src/ui/dialog/inkscape-preferences.cpp:1500
 msgid "Export ..."
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1481
+#: ../src/ui/dialog/inkscape-preferences.cpp:1500
 msgid "Export custom keyboard shortcuts to a file"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1491
+#: ../src/ui/dialog/inkscape-preferences.cpp:1510
 msgid "Keyboard Shortcuts"
 msgstr ""
 
 #. Find this group in the tree
-#: ../src/ui/dialog/inkscape-preferences.cpp:1654
+#: ../src/ui/dialog/inkscape-preferences.cpp:1673
 msgid "Misc"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1773
+#: ../src/ui/dialog/inkscape-preferences.cpp:1792
 msgid "Set the main spell check language"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1776
+#: ../src/ui/dialog/inkscape-preferences.cpp:1795
 msgid "Second language:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1777
+#: ../src/ui/dialog/inkscape-preferences.cpp:1796
 msgid ""
 "Set the second spell check language; checking will only stop on words "
 "unknown in ALL chosen languages"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1780
+#: ../src/ui/dialog/inkscape-preferences.cpp:1799
 msgid "Third language:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1781
+#: ../src/ui/dialog/inkscape-preferences.cpp:1800
 msgid ""
 "Set the third spell check language; checking will only stop on words unknown "
 "in ALL chosen languages"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1783
+#: ../src/ui/dialog/inkscape-preferences.cpp:1802
 msgid "Ignore words with digits"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1785
+#: ../src/ui/dialog/inkscape-preferences.cpp:1804
 msgid "Ignore words containing digits, such as \"R2D2\""
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1787
+#: ../src/ui/dialog/inkscape-preferences.cpp:1806
 msgid "Ignore words in ALL CAPITALS"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1789
+#: ../src/ui/dialog/inkscape-preferences.cpp:1808
 msgid "Ignore words in all capitals, such as \"IUPAC\""
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1791
+#: ../src/ui/dialog/inkscape-preferences.cpp:1810
 msgid "Spellcheck"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1811
+#: ../src/ui/dialog/inkscape-preferences.cpp:1830
 msgid "Latency _skew:"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1812
+#: ../src/ui/dialog/inkscape-preferences.cpp:1831
 msgid ""
 "Factor by which the event clock is skewed from the actual time (0.9766 on "
 "some systems)"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1814
+#: ../src/ui/dialog/inkscape-preferences.cpp:1833
 msgid "Pre-render named icons"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1816
+#: ../src/ui/dialog/inkscape-preferences.cpp:1835
 msgid ""
 "When on, named icons will be rendered before displaying the ui. This is for "
 "working around bugs in GTK+ named icon notification"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1824
+#: ../src/ui/dialog/inkscape-preferences.cpp:1843
 msgid "System info"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1828
+#: ../src/ui/dialog/inkscape-preferences.cpp:1847
 msgid "User config: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1828
+#: ../src/ui/dialog/inkscape-preferences.cpp:1847
 msgid "Location of users configuration"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1832
+#: ../src/ui/dialog/inkscape-preferences.cpp:1851
 msgid "User preferences: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1832
+#: ../src/ui/dialog/inkscape-preferences.cpp:1851
 msgid "Location of the users preferences file"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1836
+#: ../src/ui/dialog/inkscape-preferences.cpp:1855
 msgid "User extensions: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1836
+#: ../src/ui/dialog/inkscape-preferences.cpp:1855
 msgid "Location of the users extensions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1840
+#: ../src/ui/dialog/inkscape-preferences.cpp:1859
 msgid "User cache: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1840
+#: ../src/ui/dialog/inkscape-preferences.cpp:1859
 msgid "Location of users cache"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1848
+#: ../src/ui/dialog/inkscape-preferences.cpp:1867
 msgid "Temporary files: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1848
+#: ../src/ui/dialog/inkscape-preferences.cpp:1867
 msgid "Location of the temporary files used for autosave"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1852
+#: ../src/ui/dialog/inkscape-preferences.cpp:1871
 msgid "Inkscape data: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1852
+#: ../src/ui/dialog/inkscape-preferences.cpp:1871
 msgid "Location of Inkscape data"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1856
+#: ../src/ui/dialog/inkscape-preferences.cpp:1875
 msgid "Inkscape extensions: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1856
+#: ../src/ui/dialog/inkscape-preferences.cpp:1875
 msgid "Location of the Inkscape extensions"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1865
+#: ../src/ui/dialog/inkscape-preferences.cpp:1884
 msgid "System data: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1865
+#: ../src/ui/dialog/inkscape-preferences.cpp:1884
 msgid "Locations of system data"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1889
+#: ../src/ui/dialog/inkscape-preferences.cpp:1908
 msgid "Icon theme: "
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1889
+#: ../src/ui/dialog/inkscape-preferences.cpp:1908
 msgid "Locations of icon themes"
 msgstr ""
 
-#: ../src/ui/dialog/inkscape-preferences.cpp:1891
+#: ../src/ui/dialog/inkscape-preferences.cpp:1910
 msgid "System"
 msgstr ""
 
@@ -18397,7 +18432,7 @@ msgid ""
 "or to a single (usually focused) 'Window'"
 msgstr ""
 
-#: ../src/ui/dialog/input.cpp:1530 ../src/ui/dialog/layers.cpp:912
+#: ../src/ui/dialog/input.cpp:1530 ../src/ui/dialog/layers.cpp:913
 msgid "X"
 msgstr ""
 
@@ -18458,7 +18493,7 @@ msgstr ""
 msgid "_Rename"
 msgstr ""
 
-#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:746
+#: ../src/ui/dialog/layer-properties.cpp:368 ../src/ui/dialog/layers.cpp:747
 msgid "Rename layer"
 msgstr ""
 
@@ -18488,55 +18523,55 @@ msgstr ""
 msgid "_Move"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:522 ../src/ui/widget/layer-selector.cpp:624
+#: ../src/ui/dialog/layers.cpp:523 ../src/ui/widget/layer-selector.cpp:624
 msgid "Unhide layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:522 ../src/ui/widget/layer-selector.cpp:624
+#: ../src/ui/dialog/layers.cpp:523 ../src/ui/widget/layer-selector.cpp:624
 msgid "Hide layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:533 ../src/ui/widget/layer-selector.cpp:616
+#: ../src/ui/dialog/layers.cpp:534 ../src/ui/widget/layer-selector.cpp:616
 msgid "Lock layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:533 ../src/ui/widget/layer-selector.cpp:616
+#: ../src/ui/dialog/layers.cpp:534 ../src/ui/widget/layer-selector.cpp:616
 msgid "Unlock layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:620 ../src/verbs.cpp:1348
+#: ../src/ui/dialog/layers.cpp:621 ../src/verbs.cpp:1348
 msgid "Toggle layer solo"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:623 ../src/verbs.cpp:1372
+#: ../src/ui/dialog/layers.cpp:624 ../src/verbs.cpp:1372
 msgid "Lock other layers"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:717
+#: ../src/ui/dialog/layers.cpp:718
 msgid "Moved layer"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:879
+#: ../src/ui/dialog/layers.cpp:880
 msgctxt "Layers"
 msgid "New"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:884
+#: ../src/ui/dialog/layers.cpp:885
 msgctxt "Layers"
 msgid "Bot"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:890
+#: ../src/ui/dialog/layers.cpp:891
 msgctxt "Layers"
 msgid "Dn"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:896
+#: ../src/ui/dialog/layers.cpp:897
 msgctxt "Layers"
 msgid "Up"
 msgstr ""
 
-#: ../src/ui/dialog/layers.cpp:902
+#: ../src/ui/dialog/layers.cpp:903
 msgctxt "Layers"
 msgid "Top"
 msgstr ""
@@ -19087,24 +19122,24 @@ msgid "Preview size: "
 msgstr ""
 
 #. TRANSLATORS: An item in context menu on a colour in the swatches
-#: ../src/ui/dialog/swatches.cpp:257
+#: ../src/ui/dialog/swatches.cpp:258
 msgid "Set fill"
 msgstr ""
 
 #. TRANSLATORS: An item in context menu on a colour in the swatches
-#: ../src/ui/dialog/swatches.cpp:265
+#: ../src/ui/dialog/swatches.cpp:266
 msgid "Set stroke"
 msgstr ""
 
-#: ../src/ui/dialog/swatches.cpp:286
+#: ../src/ui/dialog/swatches.cpp:287
 msgid "Edit..."
 msgstr ""
 
-#: ../src/ui/dialog/swatches.cpp:298
+#: ../src/ui/dialog/swatches.cpp:299
 msgid "Convert"
 msgstr ""
 
-#: ../src/ui/dialog/swatches.cpp:542
+#: ../src/ui/dialog/swatches.cpp:543
 #, c-format
 msgid "Palettes directory (%s) is unavailable."
 msgstr ""
@@ -20301,7 +20336,7 @@ msgid ""
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:124
-#: ../src/ui/widget/style-swatch.cpp:119
+#: ../src/ui/widget/style-swatch.cpp:120
 msgid "Fill:"
 msgstr ""
 
@@ -20321,35 +20356,35 @@ msgid "Nothing selected"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:171
-#: ../src/ui/widget/style-swatch.cpp:300
+#: ../src/ui/widget/style-swatch.cpp:301
 msgctxt "Fill and stroke"
 msgid "<i>None</i>"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:174
-#: ../src/ui/widget/style-swatch.cpp:302
+#: ../src/ui/widget/style-swatch.cpp:303
 msgctxt "Fill and stroke"
 msgid "No fill"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:174
-#: ../src/ui/widget/style-swatch.cpp:302
+#: ../src/ui/widget/style-swatch.cpp:303
 msgctxt "Fill and stroke"
 msgid "No stroke"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:176
-#: ../src/ui/widget/style-swatch.cpp:281 ../src/widgets/paint-selector.cpp:239
+#: ../src/ui/widget/style-swatch.cpp:282 ../src/widgets/paint-selector.cpp:239
 msgid "Pattern"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:179
-#: ../src/ui/widget/style-swatch.cpp:283
+#: ../src/ui/widget/style-swatch.cpp:284
 msgid "Pattern fill"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:179
-#: ../src/ui/widget/style-swatch.cpp:283
+#: ../src/ui/widget/style-swatch.cpp:284
 msgid "Pattern stroke"
 msgstr ""
 
@@ -20358,12 +20393,12 @@ msgid "<b>L</b>"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:184
-#: ../src/ui/widget/style-swatch.cpp:275
+#: ../src/ui/widget/style-swatch.cpp:276
 msgid "Linear gradient fill"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:184
-#: ../src/ui/widget/style-swatch.cpp:275
+#: ../src/ui/widget/style-swatch.cpp:276
 msgid "Linear gradient stroke"
 msgstr ""
 
@@ -20372,12 +20407,12 @@ msgid "<b>R</b>"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:194
-#: ../src/ui/widget/style-swatch.cpp:279
+#: ../src/ui/widget/style-swatch.cpp:280
 msgid "Radial gradient fill"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:194
-#: ../src/ui/widget/style-swatch.cpp:279
+#: ../src/ui/widget/style-swatch.cpp:280
 msgid "Radial gradient stroke"
 msgstr ""
 
@@ -20394,7 +20429,7 @@ msgid "Different strokes"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:206
-#: ../src/ui/widget/style-swatch.cpp:305
+#: ../src/ui/widget/style-swatch.cpp:306
 msgid "<b>Unset</b>"
 msgstr ""
 
@@ -20402,14 +20437,14 @@ msgstr ""
 #: ../src/ui/widget/selected-style.cpp:209
 #: ../src/ui/widget/selected-style.cpp:267
 #: ../src/ui/widget/selected-style.cpp:529
-#: ../src/ui/widget/style-swatch.cpp:307 ../src/widgets/fill-style.cpp:708
+#: ../src/ui/widget/style-swatch.cpp:308 ../src/widgets/fill-style.cpp:708
 msgid "Unset fill"
 msgstr ""
 
 #: ../src/ui/widget/selected-style.cpp:209
 #: ../src/ui/widget/selected-style.cpp:267
 #: ../src/ui/widget/selected-style.cpp:545
-#: ../src/ui/widget/style-swatch.cpp:307 ../src/widgets/fill-style.cpp:708
+#: ../src/ui/widget/style-swatch.cpp:308 ../src/widgets/fill-style.cpp:708
 msgid "Unset stroke"
 msgstr ""
 
@@ -20633,35 +20668,35 @@ msgctxt "Sliders"
 msgid "Link"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:273
+#: ../src/ui/widget/style-swatch.cpp:274
 msgid "L Gradient"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:277
+#: ../src/ui/widget/style-swatch.cpp:278
 msgid "R Gradient"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:293
+#: ../src/ui/widget/style-swatch.cpp:294
 #, c-format
 msgid "Fill: %06x/%.3g"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:295
+#: ../src/ui/widget/style-swatch.cpp:296
 #, c-format
 msgid "Stroke: %06x/%.3g"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:327
+#: ../src/ui/widget/style-swatch.cpp:328
 #, c-format
 msgid "Stroke width: %.5g%s"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:343
+#: ../src/ui/widget/style-swatch.cpp:344
 #, c-format
 msgid "O: %2.0f"
 msgstr ""
 
-#: ../src/ui/widget/style-swatch.cpp:348
+#: ../src/ui/widget/style-swatch.cpp:349
 #, c-format
 msgid "Opacity: %2.1f %%"
 msgstr ""
@@ -23443,69 +23478,69 @@ msgid ""
 "use selector (arrow) to move or transform them."
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:823
+#: ../src/widgets/desktop-widget.cpp:829
 msgid "grayscale"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:824
+#: ../src/widgets/desktop-widget.cpp:830
 msgid ", grayscale"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:825
+#: ../src/widgets/desktop-widget.cpp:831
 msgid "print colors preview"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:826
+#: ../src/widgets/desktop-widget.cpp:832
 msgid ", print colors preview"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:827
+#: ../src/widgets/desktop-widget.cpp:833
 msgid "outline"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:828
+#: ../src/widgets/desktop-widget.cpp:834
 msgid "no filters"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:855
+#: ../src/widgets/desktop-widget.cpp:861
 #, c-format
 msgid "%s%s: %d (%s%s) - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:857 ../src/widgets/desktop-widget.cpp:861
+#: ../src/widgets/desktop-widget.cpp:863 ../src/widgets/desktop-widget.cpp:867
 #, c-format
 msgid "%s%s: %d (%s) - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:863
+#: ../src/widgets/desktop-widget.cpp:869
 #, c-format
 msgid "%s%s: %d - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:869
+#: ../src/widgets/desktop-widget.cpp:875
 #, c-format
 msgid "%s%s (%s%s) - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:871 ../src/widgets/desktop-widget.cpp:875
+#: ../src/widgets/desktop-widget.cpp:877 ../src/widgets/desktop-widget.cpp:881
 #, c-format
 msgid "%s%s (%s) - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:877
+#: ../src/widgets/desktop-widget.cpp:883
 #, c-format
 msgid "%s%s - Inkscape"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1045
+#: ../src/widgets/desktop-widget.cpp:1052
 msgid "Color-managed display is <b>enabled</b> in this window"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1047
+#: ../src/widgets/desktop-widget.cpp:1054
 msgid "Color-managed display is <b>disabled</b> in this window"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1102
+#: ../src/widgets/desktop-widget.cpp:1109
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before "
@@ -23514,12 +23549,12 @@ msgid ""
 "If you close without saving, your changes will be discarded."
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1112
-#: ../src/widgets/desktop-widget.cpp:1171
+#: ../src/widgets/desktop-widget.cpp:1119
+#: ../src/widgets/desktop-widget.cpp:1178
 msgid "Close _without saving"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1161
+#: ../src/widgets/desktop-widget.cpp:1168
 #, c-format
 msgid ""
 "<span weight=\"bold\" size=\"larger\">The file \"%s\" was saved with a "
@@ -23528,11 +23563,11 @@ msgid ""
 "Do you want to save this file as Inkscape SVG?"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1173
+#: ../src/widgets/desktop-widget.cpp:1180
 msgid "_Save as Inkscape SVG"
 msgstr ""
 
-#: ../src/widgets/desktop-widget.cpp:1383
+#: ../src/widgets/desktop-widget.cpp:1390
 msgid "Note:"
 msgstr ""
 
@@ -23615,23 +23650,23 @@ msgstr ""
 msgid "Set pattern on stroke"
 msgstr ""
 
-#: ../src/widgets/font-selector.cpp:136 ../src/widgets/text-toolbar.cpp:1239
-#: ../src/widgets/text-toolbar.cpp:1498
+#: ../src/widgets/font-selector.cpp:134 ../src/widgets/text-toolbar.cpp:968
+#: ../src/widgets/text-toolbar.cpp:1286
 msgid "Font size"
 msgstr ""
 
 #. Family frame
-#: ../src/widgets/font-selector.cpp:147
+#: ../src/widgets/font-selector.cpp:145
 msgid "Font family"
 msgstr ""
 
 #. Style frame
-#: ../src/widgets/font-selector.cpp:178
+#: ../src/widgets/font-selector.cpp:189
 msgctxt "Font selector"
 msgid "Style"
 msgstr ""
 
-#: ../src/widgets/font-selector.cpp:228 ../share/extensions/dots.inx.h:3
+#: ../src/widgets/font-selector.cpp:239 ../share/extensions/dots.inx.h:3
 msgid "Font size:"
 msgstr ""
 
@@ -23911,7 +23946,7 @@ msgstr ""
 msgid "Open LPE dialog (to adapt parameters numerically)"
 msgstr ""
 
-#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1501
+#: ../src/widgets/measure-toolbar.cpp:103 ../src/widgets/text-toolbar.cpp:1289
 msgid "Font Size"
 msgstr ""
 
@@ -25154,242 +25189,238 @@ msgstr ""
 msgid "Change swatch color"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:374
-#, c-format
-msgid "Failed to find font matching: %s\n"
-msgstr ""
-
-#: ../src/widgets/text-toolbar.cpp:408
+#: ../src/widgets/text-toolbar.cpp:180
 msgid "Text: Change font family"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:476
+#: ../src/widgets/text-toolbar.cpp:244
 msgid "Text: Change font size"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:568
+#: ../src/widgets/text-toolbar.cpp:282
 msgid "Text: Change font style"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:648
+#: ../src/widgets/text-toolbar.cpp:360
 msgid "Text: Change superscript or subscript"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:793
+#: ../src/widgets/text-toolbar.cpp:505
 msgid "Text: Change alignment"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:836
+#: ../src/widgets/text-toolbar.cpp:548
 msgid "Text: Change line-height"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:885
+#: ../src/widgets/text-toolbar.cpp:597
 msgid "Text: Change word-spacing"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:926
+#: ../src/widgets/text-toolbar.cpp:638
 msgid "Text: Change letter-spacing"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:966
+#: ../src/widgets/text-toolbar.cpp:678
 msgid "Text: Change dx (kern)"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1000
+#: ../src/widgets/text-toolbar.cpp:712
 msgid "Text: Change dy"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1035
+#: ../src/widgets/text-toolbar.cpp:747
 msgid "Text: Change rotate"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1083
+#: ../src/widgets/text-toolbar.cpp:795
 msgid "Text: Change orientation"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1464
+#: ../src/widgets/text-toolbar.cpp:1237
 msgid "Font Family"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1465
+#: ../src/widgets/text-toolbar.cpp:1238
 msgid "Select Font Family (Alt-X to access)"
 msgstr ""
 
-#. Entry width
-#. Extra list width
-#. Cell layout
 #. Focus widget
 #. Enable entry completion
-#: ../src/widgets/text-toolbar.cpp:1473
+#: ../src/widgets/text-toolbar.cpp:1248
+msgid "Select all text with this font-family"
+msgstr ""
+
+#: ../src/widgets/text-toolbar.cpp:1252
 msgid "Font not found on system"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1520
+#: ../src/widgets/text-toolbar.cpp:1311
 msgid "Font Style"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1521
+#: ../src/widgets/text-toolbar.cpp:1312
 msgid "Font style"
 msgstr ""
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1537
+#: ../src/widgets/text-toolbar.cpp:1329
 msgid "Toggle Superscript"
 msgstr ""
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1538
+#: ../src/widgets/text-toolbar.cpp:1330
 msgid "Toggle superscript"
 msgstr ""
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1550
+#: ../src/widgets/text-toolbar.cpp:1342
 msgid "Toggle Subscript"
 msgstr ""
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1551
+#: ../src/widgets/text-toolbar.cpp:1343
 msgid "Toggle subscript"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1592
+#: ../src/widgets/text-toolbar.cpp:1384
 msgid "Justify"
 msgstr ""
 
 #. Name
-#: ../src/widgets/text-toolbar.cpp:1599
+#: ../src/widgets/text-toolbar.cpp:1391
 msgid "Alignment"
 msgstr ""
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1600
+#: ../src/widgets/text-toolbar.cpp:1392
 msgid "Text alignment"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1627
+#: ../src/widgets/text-toolbar.cpp:1419
 msgid "Horizontal"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1634
+#: ../src/widgets/text-toolbar.cpp:1426
 msgid "Vertical"
 msgstr ""
 
 #. Label
-#: ../src/widgets/text-toolbar.cpp:1641
+#: ../src/widgets/text-toolbar.cpp:1433
 msgid "Text orientation"
 msgstr ""
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1664
+#: ../src/widgets/text-toolbar.cpp:1456
 msgid "Smaller spacing"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1664 ../src/widgets/text-toolbar.cpp:1695
-#: ../src/widgets/text-toolbar.cpp:1726
+#: ../src/widgets/text-toolbar.cpp:1456 ../src/widgets/text-toolbar.cpp:1487
+#: ../src/widgets/text-toolbar.cpp:1518
 msgctxt "Text tool"
 msgid "Normal"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1664
+#: ../src/widgets/text-toolbar.cpp:1456
 msgid "Larger spacing"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1669
+#: ../src/widgets/text-toolbar.cpp:1461
 msgid "Line Height"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1670
+#: ../src/widgets/text-toolbar.cpp:1462
 msgid "Line:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1671
+#: ../src/widgets/text-toolbar.cpp:1463
 msgid "Spacing between lines (times font size)"
 msgstr ""
 
 #. Drop down menu
-#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726
+#: ../src/widgets/text-toolbar.cpp:1487 ../src/widgets/text-toolbar.cpp:1518
 msgid "Negative spacing"
 msgstr ""
 
-#: ../src/widgets/text-toolbar.cpp:1695 ../src/widgets/text-toolbar.cpp:1726
+#: ../src/widgets/text-toolbar.cpp:1487 ../src/widgets/text-toolbar.cpp:1518
 msgid "Positive spacing"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1700
+#: ../src/widgets/text-toolbar.cpp:1492
 msgid "Word spacing"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1701
+#: ../src/widgets/text-toolbar.cpp:1493
 msgid "Word:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1702
+#: ../src/widgets/text-toolbar.cpp:1494
 msgid "Spacing between words (px)"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1731
+#: ../src/widgets/text-toolbar.cpp:1523
 msgid "Letter spacing"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1732
+#: ../src/widgets/text-toolbar.cpp:1524
 msgid "Letter:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1733
+#: ../src/widgets/text-toolbar.cpp:1525
 msgid "Spacing between letters (px)"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1762
+#: ../src/widgets/text-toolbar.cpp:1554
 msgid "Kerning"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1763
+#: ../src/widgets/text-toolbar.cpp:1555
 msgid "Kern:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1764
+#: ../src/widgets/text-toolbar.cpp:1556
 msgid "Horizontal kerning (px)"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1793
+#: ../src/widgets/text-toolbar.cpp:1585
 msgid "Vertical Shift"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1794
+#: ../src/widgets/text-toolbar.cpp:1586
 msgid "Vert:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1795
+#: ../src/widgets/text-toolbar.cpp:1587
 msgid "Vertical shift (px)"
 msgstr ""
 
 #. name
-#: ../src/widgets/text-toolbar.cpp:1824
+#: ../src/widgets/text-toolbar.cpp:1616
 msgid "Letter rotation"
 msgstr ""
 
 #. label
-#: ../src/widgets/text-toolbar.cpp:1825
+#: ../src/widgets/text-toolbar.cpp:1617
 msgid "Rot:"
 msgstr ""
 
 #. short label
-#: ../src/widgets/text-toolbar.cpp:1826
+#: ../src/widgets/text-toolbar.cpp:1618
 msgid "Character rotation (degrees)"
 msgstr ""
 
@@ -26582,39 +26613,39 @@ msgid "Cleans the cruft out of Adobe Illustrator SVGs before opening"
 msgstr ""
 
 #: ../share/extensions/ccx_input.inx.h:1
-msgid "Corel DRAW Compressed Exchange files input"
+msgid "Corel DRAW Compressed Exchange files input (UC)"
 msgstr ""
 
 #: ../share/extensions/ccx_input.inx.h:2
-msgid "Corel DRAW Compressed Exchange files (.ccx)"
+msgid "Corel DRAW Compressed Exchange files (UC) (.ccx)"
 msgstr ""
 
 #: ../share/extensions/ccx_input.inx.h:3
-msgid "Open compressed exchange files saved in Corel DRAW"
+msgid "Open compressed exchange files saved in Corel DRAW (UC)"
 msgstr ""
 
 #: ../share/extensions/cdr_input.inx.h:1
-msgid "Corel DRAW Input"
+msgid "Corel DRAW Input (UC)"
 msgstr ""
 
 #: ../share/extensions/cdr_input.inx.h:2
-msgid "Corel DRAW 7-X4 files (*.cdr)"
+msgid "Corel DRAW 7-X4 files (UC) (*.cdr)"
 msgstr ""
 
 #: ../share/extensions/cdr_input.inx.h:3
-msgid "Open files saved in Corel DRAW 7-X4"
+msgid "Open files saved in Corel DRAW 7-X4 (UC)"
 msgstr ""
 
 #: ../share/extensions/cdt_input.inx.h:1
-msgid "Corel DRAW templates input"
+msgid "Corel DRAW templates input (UC)"
 msgstr ""
 
 #: ../share/extensions/cdt_input.inx.h:2
-msgid "Corel DRAW 7-13 template files (.cdt)"
+msgid "Corel DRAW 7-13 template files (UC) (.cdt)"
 msgstr ""
 
 #: ../share/extensions/cdt_input.inx.h:3
-msgid "Open files saved in Corel DRAW 7-13"
+msgid "Open files saved in Corel DRAW 7-13 (UC)"
 msgstr ""
 
 #: ../share/extensions/cgm_input.inx.h:1
@@ -26630,15 +26661,15 @@ msgid "Open Computer Graphics Metafile files"
 msgstr ""
 
 #: ../share/extensions/cmx_input.inx.h:1
-msgid "Corel DRAW Presentation Exchange files input"
+msgid "Corel DRAW Presentation Exchange files input (UC)"
 msgstr ""
 
 #: ../share/extensions/cmx_input.inx.h:2
-msgid "Corel DRAW Presentation Exchange files (.cmx)"
+msgid "Corel DRAW Presentation Exchange files (UC) (.cmx)"
 msgstr ""
 
 #: ../share/extensions/cmx_input.inx.h:3
-msgid "Open presentation exchange files saved in Corel DRAW"
+msgid "Open presentation exchange files saved in Corel DRAW (UC)"
 msgstr ""
 
 #: ../share/extensions/color_blackandwhite.inx.h:1
@@ -28505,38 +28536,160 @@ msgid "HPGL Output"
 msgstr ""
 
 #: ../share/extensions/hpgl_output.inx.h:2
-msgid "hpgl output flatness"
+msgid ""
+"Please make sure that all objects you want to plot are converted to paths. "
+"The plot will automatically be aligned to the zero point."
 msgstr ""
 
 #: ../share/extensions/hpgl_output.inx.h:3
-msgid "Mirror Y-axis"
+msgid "Resolution (dpi)"
 msgstr ""
 
 #: ../share/extensions/hpgl_output.inx.h:4
-msgid "X-origin (px)"
+msgid ""
+"The amount of steps the cutter moves if it moves for 1 inch, either get this "
+"value from your plotter manual or learn it by trial and error (Standard: "
+"'1016')"
 msgstr ""
 
 #: ../share/extensions/hpgl_output.inx.h:5
-msgid "Y-origin (px)"
+msgid "Pen number"
 msgstr ""
 
 #: ../share/extensions/hpgl_output.inx.h:6
-msgid "Resolution (dpi)"
+msgid "The number of the pen (tool) to use, on most plotters 1 (Standard: '1')"
 msgstr ""
 
-#: ../share/extensions/hpgl_output.inx.h:7
-msgid "Pen number"
+#: ../share/extensions/hpgl_output.inx.h:8
+msgid ""
+"Orientation of the plot, change this if your plotter is plotting horizontal "
+"instead of vertical (Standard: '-90°')"
 msgstr ""
 
-#: ../share/extensions/hpgl_output.inx.h:8
+#: ../share/extensions/hpgl_output.inx.h:9
+msgid "Mirror Y-axis"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:10
+msgid ""
+"Whether to mirror the Y axis. Some plotters need this, some not. Look in "
+"your plotter manual or learn it by trial and error (Standard: 'False')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:11
+msgid "Curve flatness (mm)"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:12
+msgid ""
+"Curves get divided into lines, this is the approximate length of one line in "
+"mm (Standard: '0.50')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:13
+msgid "Use Overcut"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:14
+msgid ""
+"Whether the overcut will be used, if not the 'Overcut' parameter is unused "
+"(Standard: 'True')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:15
+msgid "Overcut (mm)"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:16
+msgid ""
+"The distance in mm that will be cut over the starting point of the path to "
+"prevent open paths (Standard: '1.00')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:17
+msgid "Correct tool offset"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:18
+msgid ""
+"Whether the tool offset should be corrected, if not the 'Tool offset' and "
+"'Return Factor' parameters are unused (Standard: 'True')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:19
+msgid "Tool offset (mm)"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:20
+msgid "The offset from the tool tip to the tool axis in mm (Standard: '0.25')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:21
+msgid "Return Factor"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:22
+msgid ""
+"The return factor multiplied by the tool offset is the length that is used "
+"to guide the tool back to the original path after an overcut is performed, "
+"you can only determine this value by experimentation (Standard: '2.50')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:23
+msgid "X offset (mm)"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:24
+msgid ""
+"The offset to move your plot away from the zero point in mm (Standard: "
+"'0.00')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:25
+msgid "Y offset (mm)"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:26
 msgid "Plot invisible layers"
 msgstr ""
 
-#: ../share/extensions/hpgl_output.inx.h:9
+#: ../share/extensions/hpgl_output.inx.h:27
+msgid "Plot invisible layers (Standard: 'False')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:28
+msgid "Send to Plotter also"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:29
+msgid ""
+"Sends the generated HPGL data also via serial connection to your plotter "
+"(Standard: 'False')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:30
+msgid "Serial Port"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:31
+msgid ""
+"The port of your serial connection, on Windows something like 'COM1', on "
+"Linux something like: '/dev/ttyUSB0' (Standard: 'COM1')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:32
+msgid "Baud Rate"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:33
+msgid "The Baud rate of your serial connection (Standard: '9600')"
+msgstr ""
+
+#: ../share/extensions/hpgl_output.inx.h:34
 msgid "HP Graphics Language file (*.hpgl)"
 msgstr ""
 
-#: ../share/extensions/hpgl_output.inx.h:10
+#: ../share/extensions/hpgl_output.inx.h:35
 msgid "Export to an HP Graphics Language file"
 msgstr ""
 
@@ -29619,9 +29772,9 @@ msgstr ""
 
 #: ../share/extensions/pathalongpath.inx.h:17
 msgid ""
-"This effect bends a pattern object along arbitrary \"skeleton\" paths. The "
-"pattern is the topmost object in the selection (groups of paths/shapes/"
-"clones... allowed)."
+"This effect scatters or bends a pattern along arbitrary \"skeleton\" paths. "
+"The pattern is the topmost object in the selection. Groups of paths, shapes "
+"or clones are allowed."
 msgstr ""
 
 #: ../share/extensions/pathscatter.inx.h:3
diff --git a/po/lv.po b/po/lv.po
index f5584a44d..2f1ab3de1 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Inkscape\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2013-01-30 12:08+0100\n"
-"PO-Revision-Date: 2013-02-13 01:07+0300\n"
+"PO-Revision-Date: 2013-02-19 16:27+0300\n"
 "Last-Translator: Jānis Eisaks <jancs@dv.lv>\n"
 "Language-Team: Latvian\n"
 "Language: lv\n"
@@ -764,15 +764,15 @@ msgstr "Ieplīsušas malas"
 #: ../share/filters/filters.svg.h:1
 msgid ""
 "Displace the outside of shapes and pictures without altering their content"
-msgstr ""
+msgstr "Pārvietot figūru un attēlu ārmalas nemainot to saturu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Roughen Inside"
-msgstr ""
+msgstr "Raupjot iekšpusi"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Roughen all inside shapes"
-msgstr ""
+msgstr "Padarīt raupjas (raupjot) visas iekšējās figūras"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Evanescent"
@@ -818,14 +818,17 @@ msgstr "Baudu dārzs"
 msgid ""
 "Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights"
 msgstr ""
+"Fantasmagoriski, nekārtīgi kušķi, līdzīgi kā Jeronīma Boša (Hieronymus "
+"Bosch) gleznā \"Baudu dārzs\""
 
 #: ../share/filters/filters.svg.h:1
 msgid "Cutout Glow"
-msgstr ""
+msgstr "Izgriezuma spīdums"
 
 #: ../share/filters/filters.svg.h:1
 msgid "In and out glow with a possible offset and colorizable flood"
 msgstr ""
+"Iekšējais un ārējais spīdums ar iespējamu nobīdi un krāsojamu pludinājumu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Dark Emboss"
@@ -893,7 +896,7 @@ msgstr "Tonēta varavīksne"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Smooth rainbow colors melted along the edges and colorizable"
-msgstr ""
+msgstr "Gludas, gar malām sakusušas, krāsojamas varavīksnes krāsas"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Melted Rainbow"
@@ -1051,7 +1054,7 @@ msgstr "Nereālie 3D ēnotāji"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Comics shader with creamy waves transparency"
-msgstr ""
+msgstr "Komiksu ēnotās ar krēmīgu viļņu caurspīdīgumu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Chewing Gum"
@@ -1065,11 +1068,11 @@ msgstr ""
 
 #: ../share/filters/filters.svg.h:1
 msgid "Dark And Glow"
-msgstr ""
+msgstr "Tumšs un spīdīgs"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Darkens the edge with an inner blur and adds a flexible glow"
-msgstr ""
+msgstr "Aptumšo malu ar iekšēju izpludinājumu un pievieno pielāgojamu spīdumu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Warped Rainbow"
@@ -1077,11 +1080,11 @@ msgstr "Savīta varavīksne"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Smooth rainbow colors warped along the edges and colorizable"
-msgstr ""
+msgstr "Gludas, gar malām savijušās, krāsojamas varavīksnes krāsas"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Rough and Dilate"
-msgstr ""
+msgstr "Raupjot un izplest"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Create a turbulent contour around"
@@ -1093,7 +1096,7 @@ msgstr "Veca pastkarte"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Slightly posterize and draw edges like on old printed postcards"
-msgstr ""
+msgstr "Viegli posterizē un zīmē senlaicīgām pastkartēm līdzīgas malas"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Dots Transparency"
@@ -1101,7 +1104,7 @@ msgstr "Punktu caurspīdīgums"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Gives a pointillist HSL sensitive transparency"
-msgstr ""
+msgstr "Rada puantilisku HLS-jūtīgu caurspīdīgumu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Canvas Transparency"
@@ -1109,11 +1112,11 @@ msgstr "Auduma causpīdīgums"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Gives a canvas like HSL sensitive transparency."
-msgstr ""
+msgstr "Rada audeklam līdzīgu HLS-jūtīgu caurspīdīgumu."
 
 #: ../share/filters/filters.svg.h:1
 msgid "Smear Transparency"
-msgstr ""
+msgstr "Nosmērēts caurspīdīgums"
 
 #: ../share/filters/filters.svg.h:1
 msgid ""
@@ -1645,7 +1648,7 @@ msgstr "Divtoņu nekārtīgais"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Light Eraser Cracked"
-msgstr ""
+msgstr "Ieplīsusi gaismas dzēšgumija"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Poster Turbulent"
@@ -1697,7 +1700,7 @@ msgstr "Komiksa uzmetums"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Draft painted cartoon shading with a glassy look"
-msgstr ""
+msgstr "Izkrāsota komiksa ēnojuma uzmetums ar stiklainu izskatu"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Comics Fading"
@@ -1717,11 +1720,11 @@ msgstr "Atlasa metāla virsmas efekts"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Opaline"
-msgstr ""
+msgstr "Pienstikls"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Contouring version of smooth shader"
-msgstr ""
+msgstr "Gludā ēnotāja kontūru versija"
 
 #: ../share/filters/filters.svg.h:1
 msgid "Chrome"
@@ -2059,7 +2062,7 @@ msgstr "Ūdens (#00FFFF)"
 #: ../share/palettes/palettes.h:24
 msgctxt "Palette"
 msgid "Navy (#000080)"
-msgstr ""
+msgstr "Flote (#000080)"
 
 #. Palette: ./inkscape.gpl
 #: ../share/palettes/palettes.h:25
@@ -2155,7 +2158,7 @@ msgstr "brūns (#A52A2A)"
 #: ../share/palettes/palettes.h:40
 msgctxt "Palette"
 msgid "firebrick (#B22222)"
-msgstr ""
+msgstr "ugunsizturīgs ķieģelis (#B22222)"
 
 #. Palette: ./svg.gpl
 #: ../share/palettes/palettes.h:41
@@ -2221,7 +2224,7 @@ msgstr "koraļļi (#FF7F50)"
 #: ../share/palettes/palettes.h:51
 msgctxt "Palette"
 msgid "orangered (#FF4500)"
-msgstr ""
+msgstr "oranžsarkans (#FF4500)"
 
 #. Palette: ./svg.gpl
 #: ../share/palettes/palettes.h:52
@@ -2641,7 +2644,7 @@ msgstr "tumši tirkīza (#00CED1)"
 #: ../share/palettes/palettes.h:121
 msgctxt "Palette"
 msgid "cadetblue (#5F9EA0)"
-msgstr ""
+msgstr "kadetzils (#5F9EA0)"
 
 #. Palette: ./svg.gpl
 #: ../share/palettes/palettes.h:122
@@ -3533,7 +3536,7 @@ msgstr ""
 #: ../src/ui/dialog/clonetiler.cpp:515 ../src/ui/dialog/clonetiler.cpp:588
 #: ../src/ui/dialog/clonetiler.cpp:634 ../src/ui/dialog/clonetiler.cpp:761
 msgid "<small>Alternate:</small>"
-msgstr ""
+msgstr "<small>Alternatīvs:</small>"
 
 #: ../src/ui/dialog/clonetiler.cpp:281
 msgid "Alternate the sign of shifts for each row"
@@ -4921,11 +4924,11 @@ msgstr "palīglīnijas-ceļa krustpunkts"
 
 #: ../src/display/snap-indicator.cpp:123
 msgid "clip-path"
-msgstr ""
+msgstr "izgriešanas ceļš"
 
 #: ../src/display/snap-indicator.cpp:126
 msgid "mask-path"
-msgstr ""
+msgstr "maskas ceļš"
 
 #: ../src/display/snap-indicator.cpp:129
 msgid "bounding box corner"
@@ -5162,7 +5165,7 @@ msgstr "Zīmēt kaligrāfisku vilkumu"
 
 #: ../src/eraser-context.cpp:504
 msgid "<b>Drawing</b> an eraser stroke"
-msgstr ""
+msgstr "<b>Zīme</b> dzēšgumijas vilkumu"
 
 #: ../src/eraser-context.cpp:810
 msgid "Draw eraser stroke"
@@ -5342,7 +5345,7 @@ msgstr ""
 
 #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:39
 msgid "Adaptive Threshold"
-msgstr ""
+msgstr "Pielāgojamais slieksnis"
 
 #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:41
 #: ../src/extension/internal/bitmap/raise.cpp:42
@@ -5419,7 +5422,7 @@ msgstr "Rastrs"
 
 #: ../src/extension/internal/bitmap/adaptiveThreshold.cpp:49
 msgid "Apply adaptive thresholding to selected bitmap(s)"
-msgstr ""
+msgstr "Atlasītajam(-iem) attēlam(-iem) pielietot pieskaņojošos slieksni"
 
 #: ../src/extension/internal/bitmap/addNoise.cpp:45
 msgid "Add Noise"
@@ -5684,11 +5687,11 @@ msgstr "Apstrādāt atlasīto(s) attēlu(s) ar Gausa izpludinājumu"
 
 #: ../src/extension/internal/bitmap/implode.cpp:37
 msgid "Implode"
-msgstr ""
+msgstr "Implozija"
 
 #: ../src/extension/internal/bitmap/implode.cpp:45
 msgid "Implode selected bitmap(s)"
-msgstr ""
+msgstr "Implodēt atlasīto(-ās) bitkarti(-es)"
 
 #: ../src/extension/internal/bitmap/level.cpp:41
 msgid "Level"
@@ -5928,7 +5931,7 @@ msgstr "Slieksnis:"
 
 #: ../src/extension/internal/bitmap/threshold.cpp:46
 msgid "Threshold selected bitmap(s)"
-msgstr ""
+msgstr "Sliekšņot atlasīto(-ās) bitkarti(-es)"
 
 #: ../src/extension/internal/bitmap/unsharpmask.cpp:41
 msgid "Unsharp Mask"
@@ -6268,12 +6271,11 @@ msgid "Strength:"
 msgstr "Stiprums:"
 
 #: ../src/extension/internal/filter/blurs.h:135
-#, fuzzy
 msgid ""
 "Removes or decreases glows and jaggeries around objects edges after applying "
 "some filters"
 msgstr ""
-"Novāc vai samazina spīdumu un hvz gar objekta malām pēc dažu filtru "
+"Novāc vai samazina spīdumu un kropļojumus gar objekta malām pēc dažu filtru "
 "pielietošanas"
 
 #: ../src/extension/internal/filter/blurs.h:185
@@ -6623,11 +6625,11 @@ msgstr "Apgaismojums"
 
 #: ../src/extension/internal/filter/bumps.h:337
 msgid "Lighting blend:"
-msgstr ""
+msgstr "Apgaismojuma sapludinājums:"
 
 #: ../src/extension/internal/filter/bumps.h:344
 msgid "Highlight blend:"
-msgstr ""
+msgstr "Izgaismojuma sapludinājums:"
 
 #: ../src/extension/internal/filter/bumps.h:353
 msgid "Bump color"
@@ -6730,7 +6732,7 @@ msgstr "Sapludinājums 2:"
 
 #: ../src/extension/internal/filter/color.h:350
 msgid "Blend image or object with a flood color"
-msgstr ""
+msgstr "Sapludināt attēlu vai objektu ar pludināšanas krāsu"
 
 #: ../src/extension/internal/filter/color.h:424 ../src/filter-enums.cpp:22
 msgid "Component Transfer"
@@ -6981,7 +6983,7 @@ msgstr "Mainīt gaišumu un kontrastu atsevišķi"
 
 #: ../src/extension/internal/filter/color.h:1190
 msgid "Nudge RGB"
-msgstr ""
+msgstr "Nobīdīt RGB"
 
 #: ../src/extension/internal/filter/color.h:1194
 msgid "Red offset"
@@ -7024,10 +7026,12 @@ msgid ""
 "Nudge RGB channels separately and blend them to different types of "
 "backgrounds"
 msgstr ""
+"Nobīdīt RGB kanālus atsevišķi vienu no otra un sajaukt tos dažādu fona krāsu "
+"iegūšanai"
 
 #: ../src/extension/internal/filter/color.h:1302
 msgid "Nudge CMY"
-msgstr ""
+msgstr "Nobīdīt CMY"
 
 #: ../src/extension/internal/filter/color.h:1306
 msgid "Cyan offset"
@@ -7046,6 +7050,8 @@ msgid ""
 "Nudge CMY channels separately and blend them to different types of "
 "backgrounds"
 msgstr ""
+"Nobīdīt CMY kanālus atsevišķi vienu no otra un sajaukt tos dažādu fona krāsu "
+"iegūšanai"
 
 #: ../src/extension/internal/filter/color.h:1408
 msgid "Quadritone fantasy"
@@ -7219,7 +7225,7 @@ msgstr "Izpludināt un nobīdīt figūru un attēlu malas"
 
 #: ../src/extension/internal/filter/distort.h:190
 msgid "Roughen"
-msgstr ""
+msgstr "Raupjot"
 
 #: ../src/extension/internal/filter/distort.h:192
 #: ../src/extension/internal/filter/overlays.h:60
@@ -7230,7 +7236,7 @@ msgstr "Nekārtības veids:"
 
 #: ../src/extension/internal/filter/distort.h:208
 msgid "Small-scale roughening to edges and content"
-msgstr ""
+msgstr "Neliela apjoma malu un satura raupjošana "
 
 #: ../src/extension/internal/filter/filter-file.cpp:33
 msgid "Bundled"
@@ -7317,7 +7323,7 @@ msgstr "Slēpt attēlu"
 
 #: ../src/extension/internal/filter/morphology.h:172
 msgid "Composite type:"
-msgstr ""
+msgstr "Saliktais tips:"
 
 #: ../src/extension/internal/filter/morphology.h:173
 #: ../src/filter-enums.cpp:71
@@ -7439,7 +7445,7 @@ msgstr "Zīmēšanas režīms"
 
 #: ../src/extension/internal/filter/paint.h:76
 msgid "Drawing blend:"
-msgstr ""
+msgstr "Zīmējuma sapludināšana"
 
 #: ../src/extension/internal/filter/paint.h:84
 msgid "Dented"
@@ -7597,11 +7603,11 @@ msgstr "Punkta gravēšana"
 
 #: ../src/extension/internal/filter/paint.h:701
 msgid "Noise blend:"
-msgstr ""
+msgstr "Trokšņa sapludināšana:"
 
 #: ../src/extension/internal/filter/paint.h:709
 msgid "Grain lightness:"
-msgstr ""
+msgstr "Grauda gaišums:"
 
 #: ../src/extension/internal/filter/paint.h:711
 #: ../src/extension/internal/filter/transparency.h:343
@@ -7638,11 +7644,11 @@ msgstr "Glezna"
 
 #: ../src/extension/internal/filter/paint.h:869
 msgid "Simplify (primary):"
-msgstr ""
+msgstr "Vienkāršot (pirmkārt):"
 
 #: ../src/extension/internal/filter/paint.h:870
 msgid "Simplify (secondary):"
-msgstr ""
+msgstr "Vienkāršot (otrkārt):"
 
 #: ../src/extension/internal/filter/paint.h:871
 msgid "Pre-saturation:"
@@ -7654,7 +7660,7 @@ msgstr "Pēcpiesātinājums:"
 
 #: ../src/extension/internal/filter/paint.h:873
 msgid "Simulate antialiasing"
-msgstr ""
+msgstr "Atdarināt kropļojumnovērsi"
 
 #: ../src/extension/internal/filter/paint.h:881
 msgid "Poster and painting effects"
@@ -7670,7 +7676,7 @@ msgstr "Vienkāršas posterizācijas efekts"
 
 #: ../src/extension/internal/filter/protrusions.h:48
 msgid "Snow crest"
-msgstr ""
+msgstr "Sniega kupena"
 
 #: ../src/extension/internal/filter/protrusions.h:50
 msgid "Drift Size:"
@@ -8022,7 +8028,7 @@ msgstr "no %i"
 #. Crop settings
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:110
 msgid "Clip to:"
-msgstr "t"
+msgstr "Izgriezt uz:"
 
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:121
 msgid "Page settings"
@@ -8047,7 +8053,7 @@ msgstr "raupjš"
 #. Text options
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:137
 msgid "Text handling:"
-msgstr ""
+msgstr "Apiešanās ar tekstu:"
 
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:139
 #: ../src/extension/internal/pdfinput/pdf-input.cpp:140
@@ -8208,7 +8214,7 @@ msgstr "Dzīvais priekšskats"
 
 #: ../src/extension/prefdialog.cpp:254
 msgid "Is the effect previewed live on canvas?"
-msgstr ""
+msgstr "Vai efekts tiek priekšskatīts \"dzīvajā\" uz audekla?"
 
 #: ../src/extension/system.cpp:154 ../src/extension/system.cpp:156
 msgid "Format autodetect failed. The file is being opened as SVG."
@@ -8354,7 +8360,7 @@ msgstr "Salikts"
 
 #: ../src/filter-enums.cpp:24
 msgid "Convolve Matrix"
-msgstr ""
+msgstr "Konvolēt matricu"
 
 #: ../src/filter-enums.cpp:25
 msgid "Diffuse Lighting"
@@ -8403,11 +8409,11 @@ msgstr "Fona Alfa"
 
 #: ../src/filter-enums.cpp:44
 msgid "Fill Paint"
-msgstr ""
+msgstr "Aizpildījuma krāsa"
 
 #: ../src/filter-enums.cpp:45
 msgid "Stroke Paint"
-msgstr ""
+msgstr "Vilkuma krāsa"
 
 #: ../src/filter-enums.cpp:61
 msgid "Matrix"
@@ -8554,7 +8560,14 @@ msgid ""
 msgid_plural ""
 "Area filled, path with <b>%d</b> nodes created and unioned with selection."
 msgstr[0] ""
+"Laukums aizpildīts, izveidots ceļš ar <b>%d</b> mezglu un apvienots ar "
+"atlasīto."
 msgstr[1] ""
+"Laukums aizpildīts, izveidots ceļš ar <b>%d</b> mezgliem un apvienots ar "
+"atlasīto."
+msgstr[2] ""
+"Laukums aizpildīts, izveidots ceļš ar <b>%d</b> mezgliem un apvienots ar "
+"atlasīto."
 
 #: ../src/flood-context.cpp:517
 #, c-format
@@ -8957,28 +8970,28 @@ msgstr "Pēdas"
 #. TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units
 #: ../src/helper/units.cpp:50 ../src/ui/dialog/inkscape-preferences.cpp:451
 msgid "Em square"
-msgstr ""
+msgstr "Em kvadrāts"
 
 #: ../src/helper/units.cpp:50
 msgid "em"
-msgstr ""
+msgstr "em"
 
 #: ../src/helper/units.cpp:50
 msgid "Em squares"
-msgstr ""
+msgstr "Em kvadrāti"
 
 #. TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units
 #: ../src/helper/units.cpp:52
 msgid "Ex square"
-msgstr ""
+msgstr "Ex kvadrāts"
 
 #: ../src/helper/units.cpp:52
 msgid "ex"
-msgstr ""
+msgstr "ex"
 
 #: ../src/helper/units.cpp:52
 msgid "Ex squares"
-msgstr ""
+msgstr "Ex kvadrāti"
 
 #: ../src/inkscape.cpp:316
 msgid "Autosave failed! Cannot create directory %1."
@@ -9044,7 +9057,7 @@ msgstr "Izvēles"
 
 #: ../src/interface.cpp:922
 msgid "Setup for custom task"
-msgstr ""
+msgstr "Papildu uzdevuma veidošana"
 
 #: ../src/interface.cpp:923
 msgctxt "Interface setup"
@@ -9449,6 +9462,8 @@ msgid ""
 "master %p: unable to add object %p[%s] to the hash.  There already is an "
 "item with that name (%p)."
 msgstr ""
+"galvenais %p: objektu %p[%s] nav iespējams pievienot hešam. Tas jau satur "
+"vienu ar tādu pašu nosaukumu (%p)."
 
 #: ../src/libgdl/gdl-dock-master.c:955
 #, c-format
@@ -9803,7 +9818,7 @@ msgstr "Izveidot režģi"
 
 #: ../src/live_effects/effect.cpp:117
 msgid "Spiro spline"
-msgstr ""
+msgstr "Spirālveida līkne"
 
 #: ../src/live_effects/effect.cpp:118
 msgid "Envelope Deformation"
@@ -10121,7 +10136,7 @@ msgstr ""
 
 #: ../src/live_effects/lpe-knot.cpp:351
 msgid "S_witcher size:"
-msgstr ""
+msgstr "Pārslēdzēja izmērs:"
 
 #: ../src/live_effects/lpe-knot.cpp:351
 msgid "Orientation indicator/switcher size"
@@ -10207,7 +10222,7 @@ msgstr ""
 
 #: ../src/live_effects/lpe-patternalongpath.cpp:70
 msgid "No_rmal offset:"
-msgstr ""
+msgstr "Pa_rasta nobīde:"
 
 #: ../src/live_effects/lpe-patternalongpath.cpp:71
 msgid "Tan_gential offset:"
@@ -10222,6 +10237,8 @@ msgid ""
 "Spacing, tangential and normal offset are expressed as a ratio of width/"
 "height"
 msgstr ""
+"Atstatums, tangenciālā un parastā nobīde, izteikta kā platuma/augstuma "
+"attiecība"
 
 #: ../src/live_effects/lpe-patternalongpath.cpp:75
 msgid "Pattern is _vertical"
@@ -10310,7 +10327,7 @@ msgstr "Šķirot punktus"
 
 #: ../src/live_effects/lpe-powerstroke.cpp:234
 msgid "Sort offset points according to their time value along the curve"
-msgstr ""
+msgstr "Šķirot nobīdes punktus gar līkni atbilstoši to laika vērtībām"
 
 #: ../src/live_effects/lpe-powerstroke.cpp:235
 msgid "Interpolator type:"
@@ -10375,7 +10392,7 @@ msgstr "Biežuma dažādība:"
 
 #: ../src/live_effects/lpe-rough-hatches.cpp:226
 msgid "Variation of distance between hatches, in %."
-msgstr ""
+msgstr "Attāluma variācija starp svītrinājuma līnijām, %"
 
 #: ../src/live_effects/lpe-rough-hatches.cpp:227
 msgid "Growth:"
@@ -10645,7 +10662,7 @@ msgstr "Vilkumi:"
 
 #: ../src/live_effects/lpe-sketch.cpp:38
 msgid "Draw that many approximating strokes"
-msgstr ""
+msgstr "Zīmēt norādīto skaitu tuvinošos vilkumu"
 
 #: ../src/live_effects/lpe-sketch.cpp:39
 msgid "Max stroke length:"
@@ -10653,7 +10670,7 @@ msgstr "Maks. vilkuma garums:"
 
 #: ../src/live_effects/lpe-sketch.cpp:40
 msgid "Maximum length of approximating strokes"
-msgstr ""
+msgstr "Tuvinošos vilkumu maksimālais garums"
 
 #: ../src/live_effects/lpe-sketch.cpp:41
 msgid "Stroke length variation:"
@@ -10695,7 +10712,7 @@ msgstr "Vidējā nobīde:"
 
 #: ../src/live_effects/lpe-sketch.cpp:50
 msgid "Average distance each stroke is away from the original path"
-msgstr ""
+msgstr "Aptuvenais katra vilkuma attālums no sākotnējā ceļa"
 
 #: ../src/live_effects/lpe-sketch.cpp:51
 msgid "Max. tremble:"
@@ -10715,11 +10732,11 @@ msgstr ""
 
 #: ../src/live_effects/lpe-sketch.cpp:56
 msgid "Construction lines:"
-msgstr ""
+msgstr "Palīglīnijas:"
 
 #: ../src/live_effects/lpe-sketch.cpp:57
 msgid "How many construction lines (tangents) to draw"
-msgstr ""
+msgstr "Cik daudz palīglīniju (tangenšu) zīmēt"
 
 #: ../src/live_effects/lpe-sketch.cpp:58
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2564
@@ -10732,6 +10749,7 @@ msgid ""
 "Scale factor relating curvature and length of construction lines (try "
 "5*offset)"
 msgstr ""
+"Mērogs, kas sasaista palīglīniju izliekumu un garumu (pamēģiniet 5*nobīde)"
 
 #: ../src/live_effects/lpe-sketch.cpp:60
 msgid "Max. length:"
@@ -10739,7 +10757,7 @@ msgstr "Maks. garums:"
 
 #: ../src/live_effects/lpe-sketch.cpp:60
 msgid "Maximum length of construction lines"
-msgstr ""
+msgstr "Palīglīniju maksimālais garums"
 
 #: ../src/live_effects/lpe-sketch.cpp:61
 msgid "Length variation:"
@@ -10747,7 +10765,7 @@ msgstr "Garuma novirze:"
 
 #: ../src/live_effects/lpe-sketch.cpp:61
 msgid "Random variation of the length of construction lines"
-msgstr ""
+msgstr "Brīva palīglīniju garuma variācija"
 
 #: ../src/live_effects/lpe-sketch.cpp:62
 msgid "Placement randomness:"
@@ -10755,7 +10773,7 @@ msgstr "Novietojuma dažādība:"
 
 #: ../src/live_effects/lpe-sketch.cpp:62
 msgid "0: evenly distributed construction lines, 1: purely random placement"
-msgstr ""
+msgstr "0: vienmērīgi izkārtotas palīglīnijas, 1: brīvs novietojums"
 
 #: ../src/live_effects/lpe-sketch.cpp:64
 msgid "k_min:"
@@ -10907,7 +10925,7 @@ msgstr "Mēģiniet izmantot X serveri (pat ja $DISPLAY nav iestatīts)"
 
 #: ../src/main.cpp:284
 msgid "Open specified document(s) (option string may be excluded)"
-msgstr ""
+msgstr "Atvērt norādīto(s) dokumentu(s)  (atslēgu virkne var tikt ignorēta)"
 
 #: ../src/main.cpp:285 ../src/main.cpp:290 ../src/main.cpp:295
 #: ../src/main.cpp:362 ../src/main.cpp:367 ../src/main.cpp:372
@@ -10918,6 +10936,8 @@ msgstr "FAILA NOSAUKUMS"
 #: ../src/main.cpp:289
 msgid "Print document(s) to specified output file (use '| program' for pipe)"
 msgstr ""
+"Drukāt dokumentu(s) uz norādīto izvades failu (izmantojiet ' | programma' "
+"konveijerapstrādei) "
 
 #: ../src/main.cpp:294
 msgid "Export document to a PNG file"
@@ -11059,6 +11079,7 @@ msgid ""
 "Render filtered objects without filters, instead of rasterizing (PS, EPS, "
 "PDF)"
 msgstr ""
+"Rastrēšanas vietā renderēt filtrētos objektus bez filtriem (PS, EPS, PDF)"
 
 #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help"
 #: ../src/main.cpp:404
@@ -11066,6 +11087,7 @@ msgid ""
 "Query the X coordinate of the drawing or, if specified, of the object with --"
 "query-id"
 msgstr ""
+"Pārbaudīt attēla, vai , ja norādīts, objekta,  X koordināti ar --query-id"
 
 #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help"
 #: ../src/main.cpp:410
@@ -11073,20 +11095,21 @@ msgid ""
 "Query the Y coordinate of the drawing or, if specified, of the object with --"
 "query-id"
 msgstr ""
+"Pārbaudīt attēla, vai , ja norādīts, objekta,  Y koordināti ar --query-id"
 
 #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help"
 #: ../src/main.cpp:416
 msgid ""
 "Query the width of the drawing or, if specified, of the object with --query-"
 "id"
-msgstr ""
+msgstr "Pārbaudīt attēla,  vai , ja norādīts, objekta, platumu ar --query-id"
 
 #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help"
 #: ../src/main.cpp:422
 msgid ""
 "Query the height of the drawing or, if specified, of the object with --query-"
 "id"
-msgstr ""
+msgstr "Pārbaudīt attēla,  vai , ja norādīts, objekta, augstumu ar --query-id"
 
 #: ../src/main.cpp:427
 msgid "List id,x,y,w,h for all objects"
@@ -11205,7 +11228,7 @@ msgstr "Objekts"
 
 #: ../src/menus-skeleton.h:190
 msgid "Cli_p"
-msgstr ""
+msgstr "Iz_griezt"
 
 #: ../src/menus-skeleton.h:194
 msgid "Mas_k"
@@ -11522,6 +11545,8 @@ msgid ""
 "<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. "
 "Release <b>Alt</b> to finalize."
 msgstr ""
+"<b>Skices režīms</b>: turot <b>Alt</b> interpolē starp ieskicētajiem ceļiem. "
+"Atlaidiet <b>Alt</b>,  lai pabeigtu."
 
 #: ../src/pencil-context.cpp:612
 msgid "Finishing freehand sketch"
@@ -11612,27 +11637,27 @@ msgstr "Fails %s nav derīgs Inkscape iestatījumu fails."
 
 #: ../src/rdf.cpp:175
 msgid "CC Attribution"
-msgstr ""
+msgstr "CC Attribution"
 
 #: ../src/rdf.cpp:180
 msgid "CC Attribution-ShareAlike"
-msgstr ""
+msgstr "CC Attribution-ShareAlike"
 
 #: ../src/rdf.cpp:185
 msgid "CC Attribution-NoDerivs"
-msgstr ""
+msgstr "CC Attribution-NoDerivs"
 
 #: ../src/rdf.cpp:190
 msgid "CC Attribution-NonCommercial"
-msgstr ""
+msgstr "CC Attribution-NonCommercial"
 
 #: ../src/rdf.cpp:195
 msgid "CC Attribution-NonCommercial-ShareAlike"
-msgstr ""
+msgstr "CC Attribution-NonCommercial-ShareAlike"
 
 #: ../src/rdf.cpp:200
 msgid "CC Attribution-NonCommercial-NoDerivs"
-msgstr ""
+msgstr "CC Attribution-NonCommercial-NoDerivs"
 
 #: ../src/rdf.cpp:205
 msgid "Public Domain"
@@ -11887,8 +11912,9 @@ msgstr ""
 "horizontāli/vertikāli"
 
 #: ../src/select-context.cpp:874
+#, fuzzy
 msgid "<b>Shift</b>: click to toggle select; drag for rubberband selection"
-msgstr ""
+msgstr "<b>Shift</b>: uzklikšķiniet, lai manītu atlasi, velciet laso atlasei"
 
 #: ../src/select-context.cpp:875
 msgid ""
@@ -12272,15 +12298,17 @@ msgstr "Izveidot bitkarti"
 
 #: ../src/selection-chemistry.cpp:3526
 msgid "Select <b>object(s)</b> to create clippath or mask from."
-msgstr ""
+msgstr "Atlasiet <b>objektu(s)</b> izgriešanas ceļa vai maskas izveidošanai."
 
 #: ../src/selection-chemistry.cpp:3529
 msgid "Select mask object and <b>object(s)</b> to apply clippath or mask to."
 msgstr ""
+"Atlasiet maskas objektu un <b>objektu(s)</b>izgriešanas ceļa vai maskas "
+"pielietošanai."
 
 #: ../src/selection-chemistry.cpp:3710
 msgid "Set clipping path"
-msgstr ""
+msgstr "Iestatiet izgriešanas ceļu"
 
 #: ../src/selection-chemistry.cpp:3712
 msgid "Set mask"
@@ -12289,10 +12317,11 @@ msgstr "Iestatīt masku"
 #: ../src/selection-chemistry.cpp:3727
 msgid "Select <b>object(s)</b> to remove clippath or mask from."
 msgstr ""
+"Atlasiet <b>objektu(s)</b>, kuram(-iem) noņemt  izgriešanas ceļu vai masku."
 
 #: ../src/selection-chemistry.cpp:3838
 msgid "Release clipping path"
-msgstr ""
+msgstr "Atbrīvot izgriešanas ceļu"
 
 #: ../src/selection-chemistry.cpp:3840
 msgid "Release mask"
@@ -12663,12 +12692,12 @@ msgstr ""
 #: ../src/sp-guide.cpp:475
 #, c-format
 msgid "vertical, at %s"
-msgstr ""
+msgstr "vertikāli, pie %s"
 
 #: ../src/sp-guide.cpp:478
 #, c-format
 msgid "horizontal, at %s"
-msgstr ""
+msgstr "horizontāli, pie %s"
 
 #: ../src/sp-guide.cpp:483
 #, c-format
@@ -12704,7 +12733,7 @@ msgstr "Objekts"
 #: ../src/sp-item.cpp:990
 #, c-format
 msgid "%s; <i>clipped</i>"
-msgstr ""
+msgstr "%s; <i>izgriezts</i>"
 
 #: ../src/sp-item.cpp:995
 #, c-format
@@ -12895,7 +12924,7 @@ msgstr "Dalīšana"
 
 #: ../src/splivarot.cpp:108
 msgid "Cut path"
-msgstr ""
+msgstr "Griezt ceļu"
 
 #: ../src/splivarot.cpp:123
 msgid "Select <b>at least 2 paths</b> to perform a boolean operation."
@@ -12906,9 +12935,12 @@ msgid "Select <b>at least 1 path</b> to perform a boolean union."
 msgstr "Atlasiet <b>vismaz 1 ceļu</b>, lai veiktu Bula apvienošanu."
 
 #: ../src/splivarot.cpp:133
+#, fuzzy
 msgid ""
 "Select <b>exactly 2 paths</b> to perform difference, division, or path cut."
 msgstr ""
+"Atlasiet <b>tieši 2 ceļus</b>, lai veiktu difference, dalīšanu vai ceļa "
+"griešanu. "
 
 #: ../src/splivarot.cpp:149 ../src/splivarot.cpp:164
 msgid ""
@@ -13082,6 +13114,8 @@ msgstr ""
 #: ../src/text-chemistry.cpp:115
 msgid "The flowed text(s) must be <b>visible</b> in order to be put on a path."
 msgstr ""
+"Lai novietotu uz ceļa, teksta aizpildījumam(-iem) jābūt <b>redzamam (-iem)</"
+"b>."
 
 #: ../src/text-chemistry.cpp:183 ../src/verbs.cpp:2442
 msgid "Put text on path"
@@ -13134,6 +13168,7 @@ msgstr "Atlasiet pārvēršamo <b>teksta aizpildījumu</b>."
 #: ../src/text-chemistry.cpp:497
 msgid "The flowed text(s) must be <b>visible</b> in order to be converted."
 msgstr ""
+"Lai pārvērstu, teksta aizpildījumam(-iem) jābūt <b>redzamam (-iem)</b>."
 
 #: ../src/text-chemistry.cpp:525
 msgid "Convert flowed text to text"
@@ -13153,6 +13188,8 @@ msgstr ""
 msgid ""
 "<b>Click</b> to edit the flowed text, <b>drag</b> to select part of the text."
 msgstr ""
+"<b>Uzklikšķieniet</b>, lai labotu teksta aizpildījumu, <b>velciet</b>, lai "
+"atlasītu daļu teksta."
 
 #: ../src/text-context.cpp:476
 msgid "Create text"
@@ -13274,6 +13311,8 @@ msgid ""
 "Type or edit flowed text (%d characters%s); <b>Enter</b> to start new "
 "paragraph."
 msgstr ""
+"Ievadiet vai labojiet teksta aizpildījumu (%d zīmes%s); <b>Enter</b> - lai "
+"sāktu jaunu rindkopu."
 
 #: ../src/text-context.cpp:1627
 #, c-format
@@ -13287,6 +13326,8 @@ msgid ""
 "<b>Click</b> to select or create text, <b>drag</b> to create flowed text; "
 "then type."
 msgstr ""
+"<b>Uzklikšķiniet</b>, lai atlasītu vai izveidotu tekstu, <b>velciet</b>, lai "
+"izveidotu teksta aizpildījumu un tad rakstiet."
 
 #: ../src/text-context.cpp:1737
 msgid "Type text"
@@ -13321,6 +13362,9 @@ msgid ""
 "<b>Drag</b> to create a 3D box. <b>Drag controls</b> to resize in "
 "perspective. <b>Click</b> to select (with <b>Ctrl+Alt</b> for single faces)."
 msgstr ""
+"<b>Velciet</b>, lai izveidotu 3D paralēlskaldni. Pieskaņojiet perspektīvu, "
+"<b>pārvietojot vadīklas</b>. <b>Uzklikšķiniet</b>, lai atlasītu (ar <b>Ctrl"
+"+Alt</b> - atsevišķu plakņu atlasei)."
 
 #: ../src/tools-switch.cpp:165
 msgid ""
@@ -13360,6 +13404,9 @@ msgid ""
 "append to selected path. <b>Ctrl+click</b> to create single dots (straight "
 "line modes only)."
 msgstr ""
+"<b>Uzklikšķiniet</b> vai <b>uzklikšķiniet un velciet</b>, lai sāktu ceļu; ar "
+"<b>Shift</b> - lai papildinātu atlasīto ceļu. <b>Ctrl+click</b>, lai "
+"izveidotu atsevišķus punktus (tikai taišņu režīmā)."
 
 #: ../src/tools-switch.cpp:195
 msgid ""
@@ -13375,12 +13422,16 @@ msgid ""
 "<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, "
 "<b>drag handles</b> to adjust gradients."
 msgstr ""
+"<b>Velciet</b> vai <b>dubultklikšķiniet</b>, lai atlasītajiem objektiem "
+"izveidotu krāsu pāreju, <b>velciet turus</b> krāsu pāreju pieskaņošanai."
 
 #: ../src/tools-switch.cpp:213
 msgid ""
 "<b>Drag</b> or <b>double click</b> to create a mesh on selected objects, "
 "<b>drag handles</b> to adjust meshes."
 msgstr ""
+"<b>Velciet</b> vai <b>dubultklikšķiniet</b>, lai atlasītajiem objektiem "
+"izveidotu režģtīklu,<b>velciet turus</b> režģtīkla pieskaņošanai."
 
 #: ../src/tools-switch.cpp:220
 msgid ""
@@ -13517,7 +13568,7 @@ msgstr ""
 #: ../src/tweak-context.cpp:231
 #, c-format
 msgid "%s. Drag or click to <b>roughen paths</b>."
-msgstr ""
+msgstr "%s. Velciet vai uzklikšķiniet, lai <b>raupjotu ceļus</b>."
 
 #: ../src/tweak-context.cpp:235
 #, c-format
@@ -13579,7 +13630,7 @@ msgstr ""
 
 #: ../src/tweak-context.cpp:1279
 msgid "Roughen path tweak"
-msgstr "Ceļa nelīdzena padarīšanas pieskaņošana"
+msgstr "Ceļa raupjošanas pieskaņošana"
 
 #: ../src/tweak-context.cpp:1283
 msgid "Color paint tweak"
@@ -13609,7 +13660,7 @@ msgstr "Atlasiet <b>objektu(s)</b>, kuriem pielietot stilu no starpliktuves."
 
 #: ../src/ui/clipboard.cpp:440 ../src/ui/clipboard.cpp:457
 msgid "No style on the clipboard."
-msgstr "Stils nav atrodams starpliktuvē."
+msgstr "Starpliktuvē nav neviena stila."
 
 #: ../src/ui/clipboard.cpp:482
 msgid "Select <b>object(s)</b> to paste size to."
@@ -13626,7 +13677,7 @@ msgstr ""
 #. no_effect:
 #: ../src/ui/clipboard.cpp:567
 msgid "No effect on the clipboard."
-msgstr "Efekts nav atrodams starpliktuvē."
+msgstr "Starpliktuvē nav neviena efekta."
 
 #: ../src/ui/clipboard.cpp:586 ../src/ui/clipboard.cpp:614
 msgid "Clipboard does not contain a path."
@@ -13688,7 +13739,7 @@ msgstr "Izkārtot"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:464
 msgid "Minimum horizontal gap (in px units) between bounding boxes"
-msgstr ""
+msgstr "Minimālais horizontālais atstatums (px vienībās) starp robežrāmjiem"
 
 #. TRANSLATORS: "H:" stands for horizontal gap
 #: ../src/ui/dialog/align-and-distribute.cpp:466
@@ -13698,7 +13749,7 @@ msgstr "_H"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:474
 msgid "Minimum vertical gap (in px units) between bounding boxes"
-msgstr ""
+msgstr "Minimālais vertikālais atstatums (px vienībās) starp robežrāmjiem"
 
 #. TRANSLATORS: Vertical gap
 #: ../src/ui/dialog/align-and-distribute.cpp:476
@@ -13807,7 +13858,7 @@ msgstr "Sakārtot objektu augšējās malas gar enkura apakšējo malu"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:953
 msgid "Align baseline anchors of texts horizontally"
-msgstr ""
+msgstr "Līdzināt teksta bāzes līnijas enkurus horizontāli"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:956
 msgid "Align baselines of texts"
@@ -13847,7 +13898,7 @@ msgstr "Izkliedēt apakšējās malas vienādos attālumos"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:990
 msgid "Distribute baseline anchors of texts horizontally"
-msgstr ""
+msgstr "Izklīdināt teksta bāzes līnijas enkurus horizontāli"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:993
 msgid "Distribute baselines of texts vertically"
@@ -13856,7 +13907,7 @@ msgstr "Izkliedēt tekstu bāzes līnijas vertikāli"
 #: ../src/ui/dialog/align-and-distribute.cpp:999
 #: ../src/widgets/connector-toolbar.cpp:389
 msgid "Nicely arrange selected connector network"
-msgstr ""
+msgstr "Glīti sakārtot atlasīto savienotāju tīklu"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:1002
 msgid "Exchange positions of selected objects - selection order"
@@ -13883,6 +13934,7 @@ msgid ""
 "Move objects as little as possible so that their bounding boxes do not "
 "overlap"
 msgstr ""
+"Pārvietot objektus cik maz vien iespējams, lai to robežrāmji nepārklātos"
 
 #: ../src/ui/dialog/align-and-distribute.cpp:1029
 msgid "Align selected nodes to a common horizontal line"
@@ -14007,7 +14059,7 @@ msgstr "Licence"
 #: ../src/ui/dialog/document-metadata.cpp:126
 #: ../src/ui/dialog/document-properties.cpp:763
 msgid "<b>Dublin Core Entities</b>"
-msgstr ""
+msgstr "<b>Dublin Core</b> elementi"
 
 #: ../src/ui/dialog/document-metadata.cpp:168
 #: ../src/ui/dialog/document-properties.cpp:799
@@ -14048,6 +14100,8 @@ msgid ""
 "Color of the page background. Note: transparency setting ignored while "
 "editing but used when exporting to bitmap."
 msgstr ""
+"Lapas fona krāsa. Piezīme: caurspīdīguma iestatījums labošanas laikā netiek "
+"ņemts vērā, taču tiek izmantots eksportējot bitkarti."
 
 #: ../src/ui/dialog/document-properties.cpp:107
 msgid "Border _color:"
@@ -14183,11 +14237,11 @@ msgstr ""
 #. ---------------------------------------------------------------
 #: ../src/ui/dialog/document-properties.cpp:131
 msgid "Snap to clip paths"
-msgstr ""
+msgstr "Piesaistīt izgriešanas ceļiem"
 
 #: ../src/ui/dialog/document-properties.cpp:131
 msgid "When snapping to paths, then also try snapping to clip paths"
-msgstr ""
+msgstr "Piesaistot ceļiem, censties piesaistīt arī izgriešanas ceļiem"
 
 #: ../src/ui/dialog/document-properties.cpp:132
 msgid "Snap to mask paths"
@@ -14536,35 +14590,35 @@ msgstr "Noteikt pēc paplašinājuma"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1496
 msgid "Left edge of source"
-msgstr ""
+msgstr "Avota kreisā mala"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1497
 msgid "Top edge of source"
-msgstr ""
+msgstr "Avota augšmala"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1498
 msgid "Right edge of source"
-msgstr ""
+msgstr "Avota labā mala"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1499
 msgid "Bottom edge of source"
-msgstr ""
+msgstr "Avota apakšmala"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1500
 msgid "Source width"
-msgstr ""
+msgstr "Avota platums"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1501
 msgid "Source height"
-msgstr ""
+msgstr "Avota augstums"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1502
 msgid "Destination width"
-msgstr ""
+msgstr "Mērķa platums"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1503
 msgid "Destination height"
-msgstr ""
+msgstr "Mērķa augstums"
 
 #: ../src/ui/dialog/filedialogimpl-gtkmm.cpp:1504
 msgid "Resolution (dots per inch)"
@@ -14631,6 +14685,11 @@ msgid ""
 "component from the input is passed to the output. The last column does not "
 "depend on input colors, so can be used to adjust a constant component value."
 msgstr ""
+"Šī matrica nosaka krāsu telpas lineāro pārveidojumu. Katra rinda ietekmē "
+"vienu no krāsas komponentiem. Katra sleja nosaka krāsas daudzumu, kas no "
+"sākotnējā objekta pāries uz rezultātu. Pēdējā sleja nav atkarīga un "
+"sākotnējām krāsām un ir izmantojama konstanto komponentu vērtību "
+"pieskaņošanai."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:597
 msgid "Image File"
@@ -14709,7 +14768,7 @@ msgstr "Atstarošanas pakāpe"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:986
 msgid "Exponent value controlling the focus for the light source"
-msgstr ""
+msgstr "Gaismas avota fokusu kontrolējošais eksponenciālais lielums"
 
 #. TODO: here I have used 100 degrees as default value. But spec says that if not specified, no limiting cone is applied. So, there should be a way for the user to set a "no limiting cone" option.
 #: ../src/ui/dialog/filter-effects-dialog.cpp:988
@@ -14772,15 +14831,15 @@ msgstr "Savienojumi"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:1682
 msgid "Remove filter primitive"
-msgstr ""
+msgstr "Aizvākt filtra primitīvu"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2242
 msgid "Remove merge node"
-msgstr ""
+msgstr "Aizvākt apvienošanas mezglu"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2362
 msgid "Reorder filter primitive"
-msgstr ""
+msgstr "Pārkārtot filtra primitīvu"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2414
 msgid "Add Effect:"
@@ -14837,6 +14896,9 @@ msgid ""
 "convenience shortcuts to allow commonly used color operations to be "
 "performed without specifying a complete matrix."
 msgstr ""
+"Norāda uz matricu darbības veidu. Atslēgvārds 'matrica' nozīmē, ka tiek "
+"izmantota pilna, 5x4 vērtību matrica. Citi atslēgvārdi kalpo par saīsnēm, "
+"kas ļauj  veikt biežāk lietotās darbības ar krāsām nenorādot pilnu matricu."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2524
 msgid "Value(s):"
@@ -14882,11 +14944,11 @@ msgstr "Izmērs:"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2546
 msgid "width of the convolve matrix"
-msgstr ""
+msgstr "konvolūcijas matricas platums"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2546
 msgid "height of the convolve matrix"
-msgstr ""
+msgstr "konvolūcijas matricas augstums"
 
 #. default x:
 #. default y:
@@ -14900,12 +14962,16 @@ msgid ""
 "X coordinate of the target point in the convolve matrix. The convolution is "
 "applied to pixels around this point."
 msgstr ""
+"Mērķa punkta X koordināte konvolūcijas matricā. Konvolūcija tiks izpildīta "
+"pikseļiem ap šo punktu."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2547
 msgid ""
 "Y coordinate of the target point in the convolve matrix. The convolution is "
 "applied to pixels around this point."
 msgstr ""
+"Mērķa punkta Y koordināte konvolūcijas matricā. Konvolūcija tiks izpildīta "
+"pikseļiem ap šo punktu."
 
 #. TRANSLATORS: for info on "Kernel", see http://en.wikipedia.org/wiki/Kernel_(matrix)
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2549
@@ -14921,6 +14987,12 @@ msgid ""
 "the matrix diagonal) while a matrix filled with a constant non-zero value "
 "would lead to a common blur effect."
 msgstr ""
+"Šī matrica apraksta konvolūcijas darbību, kas tiek pielietota attēlam ar "
+"nolūku noskaidrot rezultātā iegūtā pikseļa krāsa. Dažādi vērtību izkārtojumi "
+"šajā matricā rada atšķirīgus vizuālos efektus. Vienības matrica rezultātā "
+"radīs kustības izplūduma efektu (paralēli matricas diagonālei), turpretī ar "
+"konstantām, par nulli lielākām vērtībām aizpildīta matrica rezultātā radīs "
+"vienkārša izplūduma efektu."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2551
 msgid "Divisor:"
@@ -14936,7 +15008,7 @@ msgstr ""
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2552
 msgid "Bias:"
-msgstr "Nosliece:"
+msgstr "Nobīde:"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2552
 msgid ""
@@ -14948,7 +15020,7 @@ msgstr ""
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2553
 msgid "Edge Mode:"
-msgstr ""
+msgstr "Malu režīms:"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2553
 msgid ""
@@ -14963,7 +15035,7 @@ msgstr "Saglabāt alfa"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2554
 msgid "If set, the alpha channel won't be altered by this filter primitive."
-msgstr ""
+msgstr "Ja iestatīts, šī filtra primitīvs nemainīs alfa kanālu."
 
 #. default: white
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2557
@@ -15025,7 +15097,7 @@ msgstr "Krāsas komponents, kas nosaka pārvietojumu Y virzienā"
 #. default: black
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2569
 msgid "Flood Color:"
-msgstr ""
+msgstr "Pludināšanas krāsa:"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2569
 msgid "The whole filter region will be filled with this color."
@@ -15084,10 +15156,11 @@ msgid ""
 "Indicates whether the filter primitive should perform a noise or turbulence "
 "function."
 msgstr ""
+"Atspoguļo, vai filtra primitīvam jāveic trokšņa vai nekārtības funkcija."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2603
 msgid "Base Frequency:"
-msgstr ""
+msgstr "Pamata biežums:"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2604
 msgid "Octaves:"
@@ -15103,13 +15176,18 @@ msgstr "Sākuma skaitlis pseidogadījuma skaitļu ģeneratoram."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2617
 msgid "Add filter primitive"
-msgstr ""
+msgstr "Pievienot filtra primitīvu"
 
+# http://www.w3.org/TR/SVG/intro.html#TermFilterPrimitiveElement
+# A filter primitive element is one that can be used as a child of a ‘filter’ element to specify a node in the filter graph.
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2634
+#, fuzzy
 msgid ""
 "The <b>feBlend</b> filter primitive provides 4 image blending modes: screen, "
 "multiply, darken and lighten."
 msgstr ""
+"<b>feBlend</b> filtra primitīvs nodrošina 4 attēlu sajaukšanas veidus: "
+"screen, pavairot, padarīt tumšāku un padarīt gaišāku."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2638
 msgid ""
@@ -15117,6 +15195,9 @@ msgid ""
 "color of each rendered pixel. This allows for effects like turning object to "
 "grayscale, modifying color saturation and changing color hue."
 msgstr ""
+"<b>feColorMatrix</b> filtra primitīvs pielieto matricas pārveidojumu katra "
+"renderētā pikseļa krāsai. Tas padara iespējamus tādus efektus, kā pārvēršanu "
+"par pelēktoņu attēlu, krāsu piesātinājuma un nokrāsas maiņu."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2642
 msgid ""
@@ -15134,6 +15215,8 @@ msgid ""
 "between the corresponding pixel values of the images."
 msgstr ""
 
+# http://www.w3.org/TR/SVG/intro.html#TermFilterPrimitiveElement
+# A filter primitive element is one that can be used as a child of a ‘filter’ element to specify a node in the filter graph.
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2650
 msgid ""
 "The <b>feConvolveMatrix</b> lets you specify a Convolution to be applied on "
@@ -15142,6 +15225,11 @@ msgid ""
 "be created using this filter primitive, the special gaussian blur primitive "
 "is faster and resolution-independent."
 msgstr ""
+"<b>feConvolveMatrix</b> ļauj norādīt attēlam pielietojamo konvolūciju. "
+"Efekti, kurus iegūst ar konvolūcijas matricas palīdzību, ir izpludināšana, "
+"saasināšana, ciļņošana un malas noteikšana. Ņemiet vērā, ka lai arī Gausa "
+"izpludināšana ar šo filtra primitīvu arī ir iespējama, īpašais Gausa "
+"izpludināšanas primitīvs ir ātrāks un nav atkarīgs no izšķirtspējas."
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2654
 msgid ""
@@ -15224,11 +15312,11 @@ msgstr ""
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2713
 msgid "Duplicate filter primitive"
-msgstr ""
+msgstr "Kopēt filtra primitīvu"
 
 #: ../src/ui/dialog/filter-effects-dialog.cpp:2766
 msgid "Set filter primitive attribute"
-msgstr ""
+msgstr "Iestatīt filtra primitīva atribūtu"
 
 #: ../src/ui/dialog/find.cpp:67
 msgid "F_ind:"
@@ -15505,7 +15593,7 @@ msgstr "Gurmuku"
 
 #: ../src/ui/dialog/glyphs.cpp:71
 msgid "Han"
-msgstr ""
+msgstr "Hanu"
 
 #: ../src/ui/dialog/glyphs.cpp:72
 msgid "Hangul"
@@ -15665,7 +15753,7 @@ msgstr "Glagoļica"
 
 #: ../src/ui/dialog/glyphs.cpp:111 ../src/ui/dialog/glyphs.cpp:237
 msgid "Tifinagh"
-msgstr ""
+msgstr "Tifinagu"
 
 #: ../src/ui/dialog/glyphs.cpp:112 ../src/ui/dialog/glyphs.cpp:266
 msgid "Syloti Nagri"
@@ -15677,7 +15765,7 @@ msgstr "Senpersiešu"
 
 #: ../src/ui/dialog/glyphs.cpp:114
 msgid "Kharoshthi"
-msgstr ""
+msgstr "Karošti"
 
 #: ../src/ui/dialog/glyphs.cpp:115
 msgid "unassigned"
@@ -15737,7 +15825,7 @@ msgstr "Vai"
 
 #: ../src/ui/dialog/glyphs.cpp:129
 msgid "Carian"
-msgstr ""
+msgstr "Kariešu"
 
 #: ../src/ui/dialog/glyphs.cpp:130
 msgid "Lycian"
@@ -15981,7 +16069,7 @@ msgstr "Hangulas savietojams ar džamo"
 
 #: ../src/ui/dialog/glyphs.cpp:249
 msgid "Kanbun"
-msgstr ""
+msgstr "Kanbūnu"
 
 #: ../src/ui/dialog/glyphs.cpp:250
 msgid "Bopomofo Extended"
@@ -16157,7 +16245,7 @@ msgstr "Pievienot tekstu"
 
 #: ../src/ui/dialog/guides.cpp:47
 msgid "Rela_tive change"
-msgstr ""
+msgstr "Rela_tīvās izmaiņas"
 
 #: ../src/ui/dialog/guides.cpp:47
 msgid "Move and/or rotate the guide relative to current settings"
@@ -16240,7 +16328,7 @@ msgstr "Ieslēgt krāsu pāreju labošanu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:189
 msgid "Whether selected objects display gradient editing controls"
-msgstr ""
+msgstr "Vai atlasītie objekti rāda krāsu pārejas labošanas vadīklas"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:194
 msgid "Conversion to guides uses edges instead of bounding box"
@@ -16263,6 +16351,8 @@ msgstr "reiz pašreizējā vilkuma platums"
 #: ../src/ui/dialog/inkscape-preferences.cpp:203
 msgid "Size of dots created with Ctrl+click (relative to current stroke width)"
 msgstr ""
+"Ar Ctrl+klikšķis izveidoto punktu lielums (attiecībā pret pašreizējo vilkuma "
+"platumu)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:218
 msgid "<b>No objects selected</b> to take the style from."
@@ -16297,6 +16387,8 @@ msgid ""
 "Each tool may store its own style to apply to the newly created objects. Use "
 "the button below to set it."
 msgstr ""
+"Katrs rīks var saglabāt savu īpašu stilu, ko pielietot jaunizveidotajiem "
+"objektiem. Izmantojiet zemāk esošo pogu, lai to iestatītu."
 
 #. style swatch
 #: ../src/ui/dialog/inkscape-preferences.cpp:277
@@ -16325,7 +16417,7 @@ msgstr "Redzams robežrāmis"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:300
 msgid "This bounding box includes stroke width, markers, filter margins, etc."
-msgstr ""
+msgstr "Robežrāmis ietver vilkuma platumu, marķierus, filtru malas utt."
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:301
 msgid "Geometric bounding box"
@@ -16333,7 +16425,7 @@ msgstr "Ģeometrisks robežrāmis"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:303
 msgid "This bounding box includes only the bare path"
-msgstr ""
+msgstr "Robežrāmis ietver tikai un vienīgi ceļu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:305
 msgid "Conversion to guides"
@@ -16361,7 +16453,7 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:313
 msgid "Average all sketches"
-msgstr ""
+msgstr "Vienādot visas skices"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:314
 msgid "Width is in absolute units"
@@ -16390,7 +16482,7 @@ msgstr "Objekti"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:327
 msgid "Show the actual objects when moving or transforming"
-msgstr ""
+msgstr "Pārvietojot vai pārveidojot rādīt aktuālos objektus"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:328
 msgid "Box outline"
@@ -16398,7 +16490,7 @@ msgstr "Rāmja līnijas biezums"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:330
 msgid "Show only a box outline of the objects when moving or transforming"
-msgstr ""
+msgstr "Pārvietojot vai pārveidojot rādīt tikai objektu robežrāmjus"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:331
 msgid "Per-object selection cue"
@@ -16423,7 +16515,7 @@ msgstr "Paralēlskaldnis"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:340
 msgid "Each selected object displays its bounding box"
-msgstr ""
+msgstr "Katras atlasītais objekts parāda savu robežrāmi"
 
 #. Node
 #: ../src/ui/dialog/inkscape-preferences.cpp:343
@@ -16476,13 +16568,15 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:355
 msgid "Show path direction on outlines"
-msgstr ""
+msgstr "Rādīt ceļa virzienu uz aprisēm"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:356
 msgid ""
 "Visualize the direction of selected paths by drawing small arrows in the "
 "middle of each outline segment"
 msgstr ""
+"Rādīt atlasīto ceļu virzienus attēlojot nelielas bultiņas katra aprišu posma "
+"vidū"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:357
 msgid "Show temporary path outline"
@@ -16517,11 +16611,11 @@ msgstr "Labošanas uzstādījumi"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:364
 msgid "Show transform handles for single nodes"
-msgstr ""
+msgstr "Rādīt pārveidošanas turus atsevišķiem mezgliem"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:365
 msgid "Show transform handles even when only a single node is selected"
-msgstr ""
+msgstr "Rādīt pārveidošanas turus pat ja ir atlasīts tikai viens mezgls"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:366
 msgid "Deleting nodes preserves shape"
@@ -16564,6 +16658,8 @@ msgid ""
 "considered for calculating lengths. Only lengths between actual curve "
 "intersections will be displayed."
 msgstr ""
+"Bīdmēra sākuma un beigu punkti netiek ņemti vērā, aprēķinot garumu. Tiks "
+"parādīti tikai faktiskie attālumi starp līkņu krustpunktiem."
 
 #. Shapes
 #: ../src/ui/dialog/inkscape-preferences.cpp:387
@@ -16579,6 +16675,8 @@ msgid ""
 "If on, the sketch result will be the normal average of all sketches made, "
 "instead of averaging the old result with the new sketch"
 msgstr ""
+"Ja ieslēgts, skices rezultāts būs vienkāršs vidējais no visām skicēm, nevis "
+"vidējais starp veco rezultātu un jauno skici"
 
 #. Pen
 #: ../src/ui/dialog/inkscape-preferences.cpp:424
@@ -16596,12 +16694,17 @@ msgid ""
 "If on, pen width is in absolute units (px) independent of zoom; otherwise "
 "pen width depends on zoom so that it looks the same at any zoom"
 msgstr ""
+"Ja ieslēgts, spalvas platums ir absolūtās vienībās (px), neatkarīgi no "
+"tālummaiņas; pretējā gadījumā spalvas platums ir atkarīgs no tāllummaiņas, "
+"nodrošinot vienādu izskatu visos palielinājumos"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:436
 msgid ""
 "If on, each newly created object will be selected (deselecting previous "
 "selection)"
 msgstr ""
+"Ja ieslēgts, tiks atlasīts katrs jaunizveidotais objekts (atceļot "
+"iepriekšējo atlasi)"
 
 #. Text
 #: ../src/ui/dialog/inkscape-preferences.cpp:439 ../src/verbs.cpp:2618
@@ -16611,12 +16714,14 @@ msgstr "Teksts"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:444
 msgid "Show font samples in the drop-down list"
-msgstr ""
+msgstr "Rādīt fontu paraugus izkrītošajā sarakstā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:445
 msgid ""
 "Show font samples alongside font names in the drop-down list in Text bar"
 msgstr ""
+"Rādīt fontu paraugus blakus fontu nosaukumiem teksta rīkjoslas izkrītošajā "
+"sarakstā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:447
 msgid "Show font substitution warning dialog"
@@ -16627,6 +16732,8 @@ msgid ""
 "Show font substitution warning dialog when requested fonts are not available "
 "on the system"
 msgstr ""
+"Rādīt brīdinājumu par fontu aizvietošanu, ja nepieciešamie fonti nav "
+"atrodami sistēmā"
 
 #. , _("Ex square"), _("Percent")
 #. , SP_CSS_UNIT_EX, SP_CSS_UNIT_PERCENT
@@ -16641,16 +16748,20 @@ msgstr "Teksta izmēra vienības tips:"
 #: ../src/ui/dialog/inkscape-preferences.cpp:457
 msgid "Set the type of unit used in the text toolbar and text dialogs"
 msgstr ""
+"Iestatiet izmēra vienības tipu izmantošanai teksta rīkjoslā un teksta "
+"dialoglodziņos"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:458
 msgid "Always output text size in pixels (px)"
-msgstr ""
+msgstr "Vienmēr izvadīt teksta izmēru pikseļos (px)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:459
 msgid ""
 "Always convert the text size units above into pixels (px) before saving to "
 "file"
 msgstr ""
+"Vienmēr pirms saglabāšanas failā pārvērst augstāk norādītās teksta izmēra "
+"vienības pikseļos (px)"
 
 #. Spray
 #: ../src/ui/dialog/inkscape-preferences.cpp:464
@@ -16684,6 +16795,10 @@ msgid ""
 "uncheck to allow sharing of gradient definitions so that editing one object "
 "may affect other objects using the same gradient"
 msgstr ""
+"Ja ieslēgts, koplietotās krāsu pārejas mainot tiek automātiski sazarotas; "
+"izslēdziet, lai atļautu krāsu pāreju koplietošanu tādā veidā, ka labojot "
+"vienu objektu vienlaicīgi tiek ietekmēti arī citi, kas izmanto to pašu krāsu "
+"pāreju."
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:483
 msgid "Use legacy Gradient Editor"
@@ -16694,6 +16809,9 @@ msgid ""
 "When on, the Gradient Edit button in the Fill & Stroke dialog will show the "
 "legacy Gradient Editor dialog, when off the Gradient Tool will be used"
 msgstr ""
+"Ja ieslēgts, poga Labot krāsu pāreju dialoglodziņā Aizpildījums & Vilkums "
+"atvērs Krāsu pārejas redaktora dialoglodziņu, ja izslēgts - tiks izmantots "
+"Krāsu pāreju rīks"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:488
 msgid "Linear gradient _angle:"
@@ -16703,6 +16821,8 @@ msgstr "Lineārās krāsu pārej_as leņķis:"
 msgid ""
 "Default angle of new linear gradients in degrees (clockwise from horizontal)"
 msgstr ""
+"Noklusētais jaunu krāsu pāreju leņķis grādos (pulksteņrādītāja virzienā pret "
+"horizontāli)"
 
 #. Dropper
 #: ../src/ui/dialog/inkscape-preferences.cpp:493
@@ -16716,7 +16836,7 @@ msgstr "Savienotājs"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:501
 msgid "If on, connector attachment points will not be shown for text objects"
-msgstr ""
+msgstr "Ja ieslēgts, teksta objektiem netiks rādīts savienotāja kontaktpunkts"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:511
 msgid "Interface"
@@ -17044,13 +17164,15 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:577
 msgid "Work-around color sliders not drawing"
-msgstr ""
+msgstr "Risinājums problēmai ar neredzamiem krāsu slīdņiem"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:579
 msgid ""
 "When on, will attempt to work around bugs in certain GTK themes drawing "
 "color sliders"
 msgstr ""
+"Ja ieslēgts, mēģina atrisināt problēmas ar krāsu slīdņu attēlošanu noteiktās "
+"GTK+ tēmās"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:584
 msgid "Clear list"
@@ -17078,6 +17200,9 @@ msgid ""
 "real length. This information is used when zooming to 1:1, 1:2, etc., to "
 "display objects in their true sizes"
 msgstr ""
+"Pieskaņojiet slīdni tikmēr, līdz lineāls uz ekrāna atbilst patiesajam "
+"garumam. Šī informācija tiek izmantota tālummainot attiecībās 1:1, 1:2 utt., "
+"lai attēlotu objektus to patiesajos izmēros."
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:595
 msgid "Enable dynamic relayout for incomplete sections"
@@ -17092,13 +17217,15 @@ msgstr ""
 #. show infobox
 #: ../src/ui/dialog/inkscape-preferences.cpp:600
 msgid "Show filter primitives infobox"
-msgstr ""
+msgstr "Rādīt filtru primitīvu informācijas rāmi"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:602
 msgid ""
 "Show icons and descriptions for the filter primitives available at the "
 "filter effects dialog"
 msgstr ""
+"Rādīt pieejamās filtru primitīvu ikonas un aprakstus filtru efektu "
+"veidošanas dialoglodziņā"
 
 #. Windows
 #: ../src/ui/dialog/inkscape-preferences.cpp:605
@@ -17141,7 +17268,7 @@ msgstr "Dialogi ir paslēpti uzdevumu joslā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:620
 msgid "Save and restore documents viewport"
-msgstr ""
+msgstr "Saglabāt un atjaunot dokumenta skatvietu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:621
 msgid "Zoom when window is resized"
@@ -17161,7 +17288,7 @@ msgstr "Saglabā loga ģeometriju (izmēru un novietojumu)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:629
 msgid "Let the window manager determine placement of all windows"
-msgstr ""
+msgstr "Atļaut logu pārvaldniekam noteikt visu logu izvietojumu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:631
 msgid ""
@@ -17225,11 +17352,11 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:667
 msgid "Dialog Transparency"
-msgstr "Dialogu caurspēdīgums"
+msgstr "Dialoglodziņu caurspīdīgums"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:669
 msgid "_Opacity when focused:"
-msgstr "Necaurspīdība fokusetam"
+msgstr "Necaurspīdība fokusētam"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:671
 msgid "Opacity when _unfocused:"
@@ -17237,7 +17364,7 @@ msgstr "Necaurspīdība ārpus fokusa"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:673
 msgid "_Time of opacity change animation:"
-msgstr ""
+msgstr "Laiks necaurspīdīguma pārmaiņas animācijai:"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:676
 msgid "Miscellaneous"
@@ -17245,7 +17372,7 @@ msgstr "Dažādi"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:679
 msgid "Whether dialog windows are to be hidden in the window manager taskbar"
-msgstr ""
+msgstr "Vai dialoglodziņi ir paslēpjami logu pārvaldnieka rīkjoslā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:682
 msgid ""
@@ -17450,12 +17577,14 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:829
 msgid "Switch tool based on tablet device (requires restart)"
-msgstr ""
+msgstr "Pārslēgt rīku atkarībā no planšetes iekārtas (nepieciešams restarts)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:831
 msgid ""
 "Change tool as different devices are used on the tablet (pen, eraser, mouse)"
 msgstr ""
+"Mainīt rīku, uz planšetes izmantojot dažādas ierīces (spalva, dzēšgumija, "
+"pele)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:832
 msgid "Input devices"
@@ -17480,21 +17609,23 @@ msgstr "XML formatēšana"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:840
 msgid "Inline attributes"
-msgstr ""
+msgstr "Iekļautie atribūti"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:841
 msgid "Put attributes on the same line as the element tag"
-msgstr ""
+msgstr "Novietot atribūtus vienā rindā ar elementa tagu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:844
 msgid "_Indent, spaces:"
-msgstr ""
+msgstr "Atkāpes, tukšum_i:"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:844
 msgid ""
 "The number of spaces to use for indenting nested elements; set to 0 for no "
 "indentation"
 msgstr ""
+"Tukšu vietu skaits atkāpēm, veidojot iegultus elementus; ievadiet 0, lai "
+"atkāpes neveidotu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:846
 msgid "Path data"
@@ -17506,7 +17637,7 @@ msgstr "Atļaut relatīvās koordinātes"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:849
 msgid "If set, relative coordinates may be used in path data"
-msgstr ""
+msgstr "Ja ieslēgts, ceļu datos var tikt izmantotas relatīvās koordinātes"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:851
 msgid "Force repeat commands"
@@ -17539,6 +17670,8 @@ msgid ""
 "The smallest number written to SVG is 10 to the power of this exponent; "
 "anything smaller is written as zero"
 msgstr ""
+"Mazākais SVG ierakstītais skaitlis ir 10 norādītajā pakāpē; jebkas, mazāks "
+"par šo tiks ierakstīts kā nulle"
 
 #. Code to add controls for attribute checking options
 #. Add incorrect style properties options
@@ -17679,15 +17812,15 @@ msgstr "Ekrāna profils:"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:927
 msgid "Retrieve profile from display"
-msgstr ""
+msgstr "Iegūt profilu no ekrāna"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:930
 msgid "Retrieve profiles from those attached to displays via XICC"
-msgstr ""
+msgstr "Iegūt profilus no ekrāniem pievienotajiem izmantojot  XICC"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:932
 msgid "Retrieve profiles from those attached to displays"
-msgstr ""
+msgstr "Iegūt profilus no ekrāniem pievienotajiem"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:937
 msgid "Display rendering intent:"
@@ -17794,6 +17927,8 @@ msgid ""
 "The directory where autosaves will be written. This should be an absolute "
 "path (starts with / on UNIX or a drive letter such as C: on Windows). "
 msgstr ""
+"Mape, kurā tiks saglabātas automātiskās kopijas. Tam ir jābūt absolūtam "
+"ceļam (sākas ar / UNIX vai diska burtu, piemēram, C:, uz Windows)."
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1047
 msgid "_Interval (in minutes):"
@@ -17879,11 +18014,11 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1088
 msgid "Color stock markers the same color as object"
-msgstr ""
+msgstr "Krāsot standarta marķierus objekta krāsā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1089
 msgid "Color custom markers the same color as object"
-msgstr ""
+msgstr "Krāsot pielāgotos marķierus objekta krāsā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1090
 #: ../src/ui/dialog/inkscape-preferences.cpp:1300
@@ -18094,6 +18229,8 @@ msgid ""
 "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn "
 "autoscroll off)"
 msgstr ""
+"Cik ātri audekls ritināsies, ja tiks vilkts pāri audekla malai (0, lai "
+"izslēgtu automātisko ritināšanu)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1163
 #: ../src/ui/dialog/tracedialog.cpp:521 ../src/ui/dialog/tracedialog.cpp:720
@@ -18105,6 +18242,9 @@ msgid ""
 "How far (in screen pixels) you need to be from the canvas edge to trigger "
 "autoscroll; positive is outside the canvas, negative is within the canvas"
 msgstr ""
+"Cik tālu (ekrāna pikseļos) ir jāatrodas no audekla malas, lai ieslēgtos "
+"automātiskā ritināšanās; pozitīvs skaitlis - ārpus audekla malām, negatīvs - "
+"iekšpus"
 
 #.
 #. _scroll_space.init ( _("Left mouse button pans when Space is pressed"), "/options/spacepans/value", false);
@@ -18134,7 +18274,7 @@ msgstr "Ieslēgt piesaistes rādītāju"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1178
 msgid "After snapping, a symbol is drawn at the point that has snapped"
-msgstr ""
+msgstr "Pēc piesaistes, piesaistes punktā tiek attēlots simbols"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1181
 msgid "_Delay (in ms):"
@@ -18146,15 +18286,18 @@ msgid ""
 "additional fraction of a second. This additional delay is specified here. "
 "When set to zero or to a very small number, snapping will be immediate."
 msgstr ""
+"Atlikt piesaisti, kamēr pele pārvietojas un nogaidīt vēl mirkli. Šīs papildu "
+"noilgums jānorāda šeit. Ja norādīta nulle vai ļoti mazs skaitlis, piesaiste "
+"notiks acumirklīgi."
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1184
 msgid "Only snap the node closest to the pointer"
-msgstr ""
+msgstr "Piesaistīt tikai vistuvāk kursoram esošajam mezglam"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1186
 msgid ""
 "Only try to snap the node that is initially closest to the mouse pointer"
-msgstr ""
+msgstr "Piesaistīt tikai sākotnēji vistuvāk peles kursoram esošajam mezglam"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1189
 msgid "_Weight factor:"
@@ -18166,6 +18309,9 @@ msgid ""
 "closest transformation (when set to 0), or prefer the node that was "
 "initially the closest to the pointer (when set to 1)"
 msgstr ""
+"Ja ir atrasti vairāki piesaistes risinājumi, Inkscape var dot priekšroku "
+"tuvākajam pārveidojumam (ja norādīta 0) vai arī izmantot mezglu, kas "
+"sākotnēji atradās vistuvāk peles kursoram (ja norādīts 1)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1192
 msgid "Snap the mouse pointer when dragging a constrained knot"
@@ -18215,7 +18361,7 @@ msgstr ""
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1210
 msgid "Compass-like display of angles"
-msgstr ""
+msgstr "Leņķu kompasveidīgs attēlojums"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1212
 msgid ""
@@ -18223,6 +18369,9 @@ msgid ""
 "clockwise; otherwise with 0 at east, -180 to 180 range, positive "
 "counterclockwise"
 msgstr ""
+"Ja ieslēgts, leņķi tiek rādīti ar 0 ziemeļos, 0 to 360 diapazonā, pozitīvi - "
+"pulksteņrādītāja virzienā; pretējā gadījumā - 0 - austrumos, -180 to 180 "
+"diapazons, pozitīvi 0 pretēji pulksteņrādītāja virzienam"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1218
 msgid "_Rotation snaps every:"
@@ -18237,16 +18386,20 @@ msgid ""
 "Rotating with Ctrl pressed snaps every that much degrees; also, pressing "
 "[ or ] rotates by this amount"
 msgstr ""
+"Griešana ar nospiestu Ctrl piesaistīta norādītajiem grādiem (solim);  "
+"[ vai ] nospiešana tāpat pagriež par norādīto lielumu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1220
 msgid "Relative snapping of guideline angles"
-msgstr ""
+msgstr "Relatīvā palīglīniju leņķu piesaiste"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1222
 msgid ""
 "When on, the snap angles when rotating a guideline will be relative to the "
 "original angle"
 msgstr ""
+"Ja ieslēgts, griežot palīglīniju piesaistes leņķi būs relatīvi pret "
+"sākotnējo leņķi"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1224
 msgid "_Zoom in/out by:"
@@ -18371,7 +18524,7 @@ msgstr "Negrupēt izgrieztos/maskētos objektus"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1273
 msgid "Enclose every clipped/masked object in its own group"
-msgstr "Iekļaut ikvienu izgriezto/maskēto objektu atsevišķā grupā"
+msgstr "Ievietot ikvienu izgriezto/maskēto objektu atsevišķā grupā"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1274
 msgid "Put all clipped/masked objects into one group"
@@ -18383,11 +18536,11 @@ msgstr "Pielietot griešanas ceļu/masku katram objektam"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1280
 msgid "Apply clippath/mask to groups containing single object"
-msgstr "Pielietot griešanas ceļu/masku grupām, kas satur tikai vienu objektu"
+msgstr "Pielietot izgriešanas ceļu/masku grupām, kas satur tikai vienu objektu"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1283
 msgid "Apply clippath/mask to group containing all objects"
-msgstr "Pielietot griešanas ceļu/masku grupai, kas satur visus objektus"
+msgstr "Pielietot izgriešanas ceļu/masku grupai, kas satur visus objektus"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1285
 msgid "After releasing"
@@ -18403,7 +18556,7 @@ msgstr "Atgrupēt grupas, kas izveidojušas iestatot griešanas ceļu/masku"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1291
 msgid "Clippaths and masks"
-msgstr "Griešanas ceļi un maskas"
+msgstr "Izgriešanas ceļi un maskas"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1294
 msgid "Stroke Style Markers"
@@ -18523,7 +18676,7 @@ msgstr "Filtru efektu kvalitāte attēlošanai uz ekrāna"
 #: ../src/ui/dialog/inkscape-preferences.cpp:1365
 #: ../src/ui/dialog/print.cpp:224
 msgid "Rendering"
-msgstr "Renderē"
+msgstr "Renderēšana"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1371
 msgid "2x2"
@@ -18735,6 +18888,8 @@ msgid ""
 "Factor by which the event clock is skewed from the actual time (0.9766 on "
 "some systems)"
 msgstr ""
+"Lielums, par kuru notikumu pulkstenis ir nobīdīts attiecībā pret patieso "
+"laiku (0,9766 dažās sistēmās)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:1814
 msgid "Pre-render named icons"
@@ -18926,7 +19081,7 @@ msgstr "Y slīpums"
 #: ../src/ui/dialog/input.cpp:1530
 #: ../src/widgets/sp-color-wheel-selector.cpp:59
 msgid "Wheel"
-msgstr "Rats"
+msgstr "Ritenis"
 
 #: ../src/ui/dialog/layer-properties.cpp:55
 msgid "Layer name:"
@@ -19703,7 +19858,7 @@ msgstr "Vektorizēt pēc norādītā spilgtuma līmeņa"
 
 #: ../src/ui/dialog/tracedialog.cpp:518
 msgid "Brightness cutoff for black/white"
-msgstr ""
+msgstr "Spilgtuma slieksnis melnbaltajam"
 
 #: ../src/ui/dialog/tracedialog.cpp:528
 msgid "Single scan: creates a path"
@@ -19721,7 +19876,7 @@ msgstr "Vektorizēt ar optimālu robežu noteikšanu pēc J. Canny algoritma"
 
 #: ../src/ui/dialog/tracedialog.cpp:555
 msgid "Brightness cutoff for adjacent pixels (determines edge thickness)"
-msgstr ""
+msgstr "Spilgtuma slieksnis blakus esošajiem pikseļiem (nosaka malas biezumu)"
 
 #: ../src/ui/dialog/tracedialog.cpp:558
 msgid "T_hreshold:"
@@ -19877,7 +20032,7 @@ msgstr ""
 
 #: ../src/ui/dialog/tracedialog.cpp:738
 msgid "To_lerance:"
-msgstr ""
+msgstr "Pie_laide:"
 
 #. ## end option page
 #: ../src/ui/dialog/tracedialog.cpp:752
@@ -20023,7 +20178,7 @@ msgstr "Pārveidošanas matricas elements F"
 
 #: ../src/ui/dialog/transformation.cpp:96
 msgid "Rela_tive move"
-msgstr ""
+msgstr "Rela_tīvais pārvietojums"
 
 #: ../src/ui/dialog/transformation.cpp:96
 msgid ""
@@ -20060,6 +20215,8 @@ msgid ""
 "Edit the current transform= matrix; otherwise, post-multiply transform= by "
 "this matrix"
 msgstr ""
+"Labojiet pašreizējo transform= matricu; pretējā gadījumā - vēlāk reiziniet "
+"transform= ar šo matricu"
 
 #: ../src/ui/dialog/transformation.cpp:112
 msgid "_Scale"
@@ -20079,7 +20236,7 @@ msgstr "Matri_ca"
 
 #: ../src/ui/dialog/transformation.cpp:145
 msgid "Reset the values on the current tab to defaults"
-msgstr ""
+msgstr "Atiestatīt vērtības pašreizējā šķirklī uz noklusētajām"
 
 #: ../src/ui/dialog/transformation.cpp:152
 msgid "Apply transformation to selection"
@@ -20112,7 +20269,7 @@ msgstr "Pievienot mezglu"
 #: ../src/ui/tool/curve-drag-point.cpp:167
 msgctxt "Path segment tip"
 msgid "<b>Shift</b>: click to toggle segment selection"
-msgstr ""
+msgstr "<b>Shift</b>: uzklikšķiniet, lai mainītu posma atlasi"
 
 #: ../src/ui/tool/curve-drag-point.cpp:171
 msgctxt "Path segment tip"
@@ -20366,7 +20523,7 @@ msgstr "<b>Shift</b>: pagriezt abus turus par vienādu leņķi"
 #, c-format
 msgctxt "Path handle tip"
 msgid "<b>Auto node handle</b>: drag to convert to smooth node (%s)"
-msgstr ""
+msgstr "<b>Auto mezgla turis</b>: velciet, lai pārvērstu par gludo mezglu (%s)"
 
 #: ../src/ui/tool/node.cpp:481
 #, c-format
@@ -20824,7 +20981,7 @@ msgstr ""
 
 #: ../src/ui/widget/rendering-options.cpp:31
 msgid "Backend"
-msgstr ""
+msgstr "Aizmugure"
 
 #: ../src/ui/widget/rendering-options.cpp:32
 msgid "Vector"
@@ -21142,6 +21299,9 @@ msgid ""
 "b> to adjust lightness, with <b>Shift</b> to adjust saturation, without "
 "modifiers to adjust hue"
 msgstr ""
+"Pieskaņo <b>alpha</b>: bija %.3g, tagad <b>%.3g</b> (starpība %.3g); ar "
+"<b>Ctrl</b> pieskaņo gaišumu, ar <b>Shift</b> - piesātinājumu, bez "
+"papildpogām - toni"
 
 #: ../src/ui/widget/selected-style.cpp:1333
 msgid "Adjust saturation"
@@ -21154,6 +21314,8 @@ msgid ""
 "<b>Ctrl</b> to adjust lightness, with <b>Alt</b> to adjust alpha, without "
 "modifiers to adjust hue"
 msgstr ""
+"Pieskaņo <b>piesātinājumu</b>: bija %.3g, tagad <b>%.3g</b> (starpība %.3g); "
+"ar <b>Ctrl</b> pieskaņo gaišumu, ar <b>Alt</b> - alfa, bez papildpogām - toni"
 
 #: ../src/ui/widget/selected-style.cpp:1339
 msgid "Adjust lightness"
@@ -21166,6 +21328,9 @@ msgid ""
 "<b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, without "
 "modifiers to adjust hue"
 msgstr ""
+"Pieskaņo <b>gaišumu</b>: bija %.3g, tagad <b>%.3g</b> (starpība %.3g); ar "
+"<b>Shift</b> pieskaņo piesātinājumu, ar <b>Alt</b> - alfa, bez papildpogām - "
+"toni"
 
 #: ../src/ui/widget/selected-style.cpp:1345
 msgid "Adjust hue"
@@ -21178,6 +21343,9 @@ msgid ""
 "b> to adjust saturation, with <b>Alt</b> to adjust alpha, with <b>Ctrl</b> "
 "to adjust lightness"
 msgstr ""
+"Pieskaņo <b>toni</b>: bija %.3g, tagad <b>%.3g</b> (starpība %.3g); ar "
+"<b>Shift</b> pieskaņo piesātinājumu, ar <b>Alt</b> - alfa, ar <b>Ctrl</b> "
+"gaišumu"
 
 #: ../src/ui/widget/selected-style.cpp:1467
 #: ../src/ui/widget/selected-style.cpp:1481
@@ -21188,6 +21356,7 @@ msgstr "Pielāgot vilkuma platumu"
 #, c-format
 msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)"
 msgstr ""
+"Pieskaņo <b>vilkuma platumu</b>: bija %.3g, tagad <b>%.3g</b> (starpība %.3g)"
 
 #. TRANSLATORS: "Link" means to _link_ two sliders together
 #: ../src/ui/widget/spin-slider.cpp:148
@@ -21545,6 +21714,8 @@ msgid ""
 "Remove unused definitions (such as gradients or clipping paths) from the &lt;"
 "defs&gt; of the document"
 msgstr ""
+"Aizvākt neizmantotos iestatījumus (piemēram, krāsu pārejas vai izgriešanas "
+"ceļus) no dokumenta &lt;defs&gt;"
 
 #: ../src/verbs.cpp:2320
 msgid "_Import..."
@@ -21617,7 +21788,7 @@ msgstr "Griez_t"
 
 #: ../src/verbs.cpp:2341
 msgid "Cut selection to clipboard"
-msgstr "Izgriezt izvēlēto uz starpliktuvi"
+msgstr "Izgriezt atlasīto uz starpliktuvi"
 
 #: ../src/verbs.cpp:2342
 msgid "_Copy"
@@ -21625,7 +21796,7 @@ msgstr "_Kopēt"
 
 #: ../src/verbs.cpp:2343
 msgid "Copy selection to clipboard"
-msgstr "Kopēt izvēlēto uz starpliktuvi"
+msgstr "Kopēt atlasīto uz starpliktuvi"
 
 #: ../src/verbs.cpp:2344
 msgid "_Paste"
@@ -21702,7 +21873,7 @@ msgstr "Ielīmēt vietā"
 
 #: ../src/verbs.cpp:2361
 msgid "Paste objects from clipboard to the original location"
-msgstr "Ielīmēta objektus no starpliktuves to sākotnējā atrašanās vietā"
+msgstr "Ielīmēt objektus no starpliktuves to sākotnējā atrašanās vietā"
 
 #: ../src/verbs.cpp:2362
 msgid "Paste Path _Effect"
@@ -21810,6 +21981,7 @@ msgid ""
 "Convert selected objects to a collection of guidelines aligned with their "
 "edges"
 msgstr ""
+"Pārveidot atlasītos objektus par gar objektu malām izkārtotu palīglīniju kopu"
 
 #: ../src/verbs.cpp:2386
 msgid "Objects to Patter_n"
@@ -22068,6 +22240,8 @@ msgid ""
 "Create exclusive OR of selected paths (those parts that belong to only one "
 "path)"
 msgstr ""
+"No atlasītajiem ceļiem izveidot izslēdzošo VAI (tās daļas, kas pieder tikai "
+"vienam ceļam)"
 
 #: ../src/verbs.cpp:2458
 msgid "Di_vision"
@@ -22487,14 +22661,16 @@ msgstr "Noņemt maskas no atlasītā"
 msgid ""
 "Apply clipping path to selection (using the topmost object as clipping path)"
 msgstr ""
+"Pielietot atlasītajam izgriešanas ceļu (par izgriešanas ceļu izmantojot "
+"augšpusē esošo objektu)"
 
 #: ../src/verbs.cpp:2589
 msgid "Edit clipping path"
-msgstr ""
+msgstr "Labot izgriešanas ceļu"
 
 #: ../src/verbs.cpp:2591
 msgid "Remove clipping path from selection"
-msgstr ""
+msgstr "Aizvākt izgriešanas ceļu no atlasītā"
 
 #. Tools
 #: ../src/verbs.cpp:2594
@@ -24009,6 +24185,8 @@ msgstr "Intervāls:"
 #: ../src/widgets/connector-toolbar.cpp:377
 msgid "The amount of space left around objects by auto-routing connectors"
 msgstr ""
+"Atstājamā brīvā vieta ap objektiem, izmantojot automātisko savienotāju "
+"izvietošanu"
 
 #: ../src/widgets/connector-toolbar.cpp:388
 msgid "Graph"
@@ -24020,7 +24198,7 @@ msgstr "Savienotāja garums"
 
 #: ../src/widgets/connector-toolbar.cpp:399
 msgid "Ideal length for connectors when layout is applied"
-msgstr ""
+msgstr "Ideālais savienotāju garums pēc izkārtojuma pielietošanas"
 
 #: ../src/widgets/connector-toolbar.cpp:411
 msgid "Downwards"
@@ -24028,7 +24206,7 @@ msgstr "Lejup"
 
 #: ../src/widgets/connector-toolbar.cpp:412
 msgid "Make connectors with end-markers (arrows) point downwards"
-msgstr ""
+msgstr "Izveidot savienotājus ar galu marķieriem (bultiņām) vērstiem lejup"
 
 #: ../src/widgets/connector-toolbar.cpp:428
 msgid "Do not allow overlapping shapes"
@@ -24729,11 +24907,11 @@ msgstr "Rādīt ceļa aprises (bez ceļa efektiem)"
 
 #: ../src/widgets/node-toolbar.cpp:565
 msgid "Edit clipping paths"
-msgstr ""
+msgstr "Labot izgriešanas ceļus"
 
 #: ../src/widgets/node-toolbar.cpp:566
 msgid "Show clipping path(s) of selected object(s)"
-msgstr ""
+msgstr "Rādīt atlasītā(-o) objekta(-u) izgriešanas ceļu(s)"
 
 #: ../src/widgets/node-toolbar.cpp:576
 msgid "Edit masks"
@@ -25039,35 +25217,44 @@ msgstr "Pārveidošana ar rīkjoslas palīdzību"
 
 #: ../src/widgets/select-toolbar.cpp:341
 msgid "Now <b>stroke width</b> is <b>scaled</b> when objects are scaled."
-msgstr ""
+msgstr "Tagad mērogojot objektus <b>vilkuma platums <u>tiek</u></b> mērogots."
 
 #: ../src/widgets/select-toolbar.cpp:343
 msgid "Now <b>stroke width</b> is <b>not scaled</b> when objects are scaled."
 msgstr ""
+"Tagad mērogojot objektus <b>vilkuma platums <u>netiek</u></b> mērogots."
 
 #: ../src/widgets/select-toolbar.cpp:354
 msgid ""
 "Now <b>rounded rectangle corners</b> are <b>scaled</b> when rectangles are "
 "scaled."
 msgstr ""
+"Tagad mērogojot taisnstūrus <b>noapaļotie taisnstūra stūri <u>tiek</u></b> "
+"mērogoti."
 
 #: ../src/widgets/select-toolbar.cpp:356
 msgid ""
 "Now <b>rounded rectangle corners</b> are <b>not scaled</b> when rectangles "
 "are scaled."
 msgstr ""
+"Tagad mērogojot taisnstūrus <b>noapaļotie taisnstūra stūri <u>netiek</u></b> "
+"mērogoti."
 
 #: ../src/widgets/select-toolbar.cpp:367
 msgid ""
 "Now <b>gradients</b> are <b>transformed</b> along with their objects when "
 "those are transformed (moved, scaled, rotated, or skewed)."
 msgstr ""
+"Tagad pārveidojot objektus (pārvietojot, mērogojot, griežot vai šķiebjot) "
+"<b>krāsu pārejas <u>tiek</u></b> pārveidotas līdz ar objektiem."
 
 #: ../src/widgets/select-toolbar.cpp:369
 msgid ""
 "Now <b>gradients</b> remain <b>fixed</b> when objects are transformed "
 "(moved, scaled, rotated, or skewed)."
 msgstr ""
+"Tagad pārveidojot objektus (pārvietojot, mērogojot, griežot vai šķiebjot) "
+"<b>krāsu pārejas <u>netiek</u></b> pārveidotas."
 
 #: ../src/widgets/select-toolbar.cpp:380
 msgid ""
@@ -26141,7 +26328,7 @@ msgstr "Piesaistīt robežrāmju centriem"
 
 #: ../src/widgets/toolbox.cpp:1724
 msgid "Snap nodes, paths, and handles"
-msgstr ""
+msgstr "Piesaistīt mezglus, ceļus un turus"
 
 #: ../src/widgets/toolbox.cpp:1732
 msgid "Snap to paths"
@@ -26161,7 +26348,7 @@ msgstr "Pie mezgliem"
 
 #: ../src/widgets/toolbox.cpp:1750
 msgid "Snap cusp nodes, incl. rectangle corners"
-msgstr ""
+msgstr "Piesaistīt asos mezglus, ieskaitot taisnstūru stūrus"
 
 #: ../src/widgets/toolbox.cpp:1759
 msgid "Smooth nodes"
@@ -26169,7 +26356,7 @@ msgstr "Gludi mezgli"
 
 #: ../src/widgets/toolbox.cpp:1759
 msgid "Snap smooth nodes, incl. quadrant points of ellipses"
-msgstr ""
+msgstr "Piesaistīt gludos mezglus, ieskaitot elipšu kvadrantu punktus"
 
 #: ../src/widgets/toolbox.cpp:1768
 msgid "Line Midpoints"
@@ -26335,11 +26522,11 @@ msgstr "Pievilkt ceļa daļas uz kursora pusi; ar Shift - prom no kursora"
 
 #: ../src/widgets/tweak-toolbar.cpp:245
 msgid "Roughen mode"
-msgstr ""
+msgstr "Raupjošanas režīms"
 
 #: ../src/widgets/tweak-toolbar.cpp:246
 msgid "Roughen parts of paths"
-msgstr ""
+msgstr "Raupjot ceļu daļas"
 
 #: ../src/widgets/tweak-toolbar.cpp:252
 msgid "Color paint mode"
@@ -26433,6 +26620,8 @@ msgstr ""
 #: ../src/widgets/tweak-toolbar.cpp:392
 msgid "Use the pressure of the input device to alter the force of tweak action"
 msgstr ""
+"Izmantojiet spiedienu uz ievadierīci, lai mainītu pieskaņošanas darbības "
+"spēku"
 
 #: ../share/extensions/convert2dashes.py:93
 msgid ""
@@ -26533,11 +26722,12 @@ msgstr "Nav iespējams atrast attēla datus."
 
 #: ../share/extensions/funcplot.py:48
 msgid "x-interval cannot be zero. Please modify 'Start X' or 'End X'"
-msgstr ""
+msgstr "x-intervāls nevar būt nulle. Lūdzu, mainiet 'Sākuma X' vai 'Beigu X'"
 
 #: ../share/extensions/funcplot.py:60
 msgid "y-interval cannot be zero. Please modify 'Y top' or 'Y bottom'"
 msgstr ""
+"y-intervāls nevar būt nulle. Lūdzu, mainiet 'Augšējais Y' vai 'Apakšējais Y'"
 
 #: ../share/extensions/funcplot.py:315
 msgid "Please select a rectangle"
@@ -26778,6 +26968,8 @@ msgid ""
 "Orientation points have not been defined! A default set of orientation "
 "points has been automatically added."
 msgstr ""
+"Orientācijas punkti nav noteikti! Automātiski pievienota noklusēto "
+"orientācijas punktu kopa."
 
 #: ../share/extensions/gcodetools.py:6672
 msgid ""
@@ -26814,6 +27006,14 @@ msgid ""
 "Technical details:\n"
 "%s"
 msgstr ""
+"Modulim inkex.py un līdz ar to arī paplašinājumam ir nepieciešams "
+"fantastiskais libxml2 bibliotēkas ietvars. lūdzu, lejupielādējiet un "
+"uzstādiet jaunāko tā versiju no  http://cheeseshop.python.org/pypi/lxml/, "
+"vai arī uzstādiet to ar pakotņu vadības rīka palīdzību, piemēram, ar "
+"komandu: sudo apt-get install python-lxml\n"
+"\n"
+"Tehniskā informācija:\n"
+"%s"
 
 #: ../share/extensions/inkex.py:277
 #, python-format
@@ -26877,13 +27077,15 @@ msgstr "Neizdevās atrast Inkscape komandu.\n"
 
 #: ../share/extensions/jessyInk_masterSlide.py:56
 msgid "Layer not found. Removed current master slide selection.\n"
-msgstr ""
+msgstr "Slānis nav atrasts. Aizvākta pašreizējā galvenā slaida izvēle.\n"
 
 #: ../share/extensions/jessyInk_masterSlide.py:58
 msgid ""
 "More than one layer with this name found. Removed current master slide "
 "selection.\n"
 msgstr ""
+"Ar šādu nosaukumu atrasts vairāk nekā viens slānis. Aizvākta pašreizējā "
+"galvenā slaida izvēle.\n"
 
 #: ../share/extensions/jessyInk_summary.py:69
 msgid "JessyInk script version {0} installed."
@@ -26999,6 +27201,8 @@ msgid ""
 "Could not obtain the selected layer for inclusion of the video element.\n"
 "\n"
 msgstr ""
+"Nevar atvērt izvēlēto slāni video element ievietošanai.\n"
+"\n"
 
 #: ../share/extensions/jessyInk_view.py:75
 msgid "More than one object selected. Please select only one object.\n"
@@ -27702,7 +27906,7 @@ msgstr "Kopējie objekti"
 
 #: ../share/extensions/draw_from_triangle.inx.h:3
 msgid "Circumcircle"
-msgstr ""
+msgstr "Apvilktā riņķa līnija"
 
 #: ../share/extensions/draw_from_triangle.inx.h:4
 msgid "Circumcentre"
@@ -27710,7 +27914,7 @@ msgstr ""
 
 #: ../share/extensions/draw_from_triangle.inx.h:5
 msgid "Incircle"
-msgstr ""
+msgstr "Ievilktā riņķa līnija"
 
 #: ../share/extensions/draw_from_triangle.inx.h:6
 msgid "Incentre"
@@ -27738,7 +27942,7 @@ msgstr "Ekscentriskais trīsstūris"
 
 #: ../share/extensions/draw_from_triangle.inx.h:12
 msgid "Orthocentre"
-msgstr ""
+msgstr "Ortocentrs"
 
 #: ../share/extensions/draw_from_triangle.inx.h:13
 msgid "Orthic Triangle"
@@ -27746,7 +27950,7 @@ msgstr ""
 
 #: ../share/extensions/draw_from_triangle.inx.h:14
 msgid "Altitudes"
-msgstr ""
+msgstr "Augstumi"
 
 #: ../share/extensions/draw_from_triangle.inx.h:15
 msgid "Angle Bisectors"
@@ -27754,7 +27958,7 @@ msgstr "Leņķa bisektrises"
 
 #: ../share/extensions/draw_from_triangle.inx.h:16
 msgid "Centroid"
-msgstr ""
+msgstr "Centroīdi"
 
 #: ../share/extensions/draw_from_triangle.inx.h:17
 msgid "Nine-Point Centre"
@@ -27786,11 +27990,11 @@ msgstr "Nāgela punkts"
 
 #: ../share/extensions/draw_from_triangle.inx.h:24
 msgid "Custom Points and Options"
-msgstr ""
+msgstr "Pielāgotie punkti un iespējas"
 
 #: ../share/extensions/draw_from_triangle.inx.h:25
 msgid "Custom Point Specified By:"
-msgstr ""
+msgstr "Pielāgotais punkts norādīts ar:"
 
 #: ../share/extensions/draw_from_triangle.inx.h:26
 msgid "Point At:"
@@ -27810,12 +28014,14 @@ msgid "Radius (px):"
 msgstr "Rādiuss (px):"
 
 #: ../share/extensions/draw_from_triangle.inx.h:30
+#, fuzzy
 msgid "Draw Isogonal Conjugate"
-msgstr ""
+msgstr "Zīmēt izogonālo..."
 
 #: ../share/extensions/draw_from_triangle.inx.h:31
+#, fuzzy
 msgid "Draw Isotomic Conjugate"
-msgstr ""
+msgstr "Zīmēt izotomisko ..."
 
 #: ../share/extensions/draw_from_triangle.inx.h:32
 msgid "Report this triangle's properties"
@@ -28205,6 +28411,7 @@ msgid "Use"
 msgstr "Lietot"
 
 #: ../share/extensions/funcplot.inx.h:13
+#, fuzzy
 msgid ""
 "Select a rectangle before calling the extension,\n"
 "it will determine X and Y scales. If you wish to fill the area, then add x-"
@@ -28216,6 +28423,15 @@ msgid ""
 "   Isotropic scaling is disabled.\n"
 "   First derivative is always determined numerically."
 msgstr ""
+"Pirms paplašinājuma izsaukšanas izvēlieties taisnstūri,\n"
+"tas noteiks X un Y izmērus. Ja vēlaties aizpildīt laukumu, pievienojiet x-"
+"ass galapunktus.\n"
+"\n"
+"Ar polārajām koordinātēm:\n"
+"   Start and end X values define the angle range in radians.\n"
+"   X scale is set so that left and right edges of rectangle are at +/-1.\n"
+"   Izotropiskā mērogošana ir atslēgta.\n"
+"   Pirmais atvasinājums vienmēr tiek noteikts skaitliski."
 
 #: ../share/extensions/funcplot.inx.h:21
 #: ../share/extensions/param_curves.inx.h:16
@@ -28377,7 +28593,7 @@ msgstr "Apgabala platums"
 
 #: ../share/extensions/gcodetools_area.inx.h:4
 msgid "Area tool overlap (0..0.9):"
-msgstr ""
+msgstr "Laukuma rīka pārklāšanās (0..0.9):"
 
 #: ../share/extensions/gcodetools_area.inx.h:5
 msgid ""
@@ -28756,6 +28972,13 @@ msgid ""
 "sphere..(radius r)...........................: math.sqrt(max(0,r**2-w**2)) "
 "ellipse.(minor axis r, major 4r).....: math.sqrt(max(0,r**2-w**2))*4"
 msgstr ""
+"Šī funkcija izveido ceļu burtu vai objektu ar asiem leņķiem gravēšanai. "
+"Griezēja dziļums kā rādiusa funkcija ir rīka noteikta. Dziļums var būt "
+"jebkura Python izteiksme. Piemēram: konuss....(45 "
+"grādi)......................: w konusam....(augstums/diametru 10/3)..: "
+"10*w/3 lode..(rādiuss r)...........................: math.sqrt(max(0,r**2-"
+"w**2)) elipse.(otrā ass r, galvenā ass 4r).....: math.sqrt(max(0,r**2-w**2))"
+"*4"
 
 #: ../share/extensions/gcodetools_graffiti.inx.h:1
 msgid "Graffiti"
@@ -28837,6 +29060,15 @@ msgid ""
 "the group or by Ctrl+Click. Now press apply to create control points "
 "(independent set for each layer)."
 msgstr ""
+"Orientācijas punkti tiek izmantoti ceļa pārveidojumu aprēķināšanai (nobīde, "
+"mērogs, spoguļattēls, pagrieziens XY plaknē). Tikai 3 punktu režīmā: "
+"nenovietojiet visus 3 punktus uz taisnes (tā vietā izmantojiet 2 punktu "
+"režīmu). Jūs varat mainīt Z virsmu, Z dziļuma lielumus vēlāk, izmantojot "
+"teksta rīku (trešā koordināte). Ja pašreizējā līmenī nav orientācijas "
+"punktu, tie tiek ņemti no augstākā slāņa. Neatgrupējiet orientācijas "
+"punktus! Jūs varat atlasīt to, izmantojot dubultklikšķi vai atverot grupu ar "
+"Ctrl+klikšķi. Tagad nospiediet Pielietot, lai izveidotu kontolpunktus "
+"(neatkarīgu kopu katrā slānī)."
 
 #: ../share/extensions/gcodetools_lathe.inx.h:1
 msgid "Lathe"
@@ -28993,6 +29225,10 @@ msgid ""
 "active layer is used. If there is no tool inside the current layer it is "
 "taken from the upper layer. Press Apply to create new tool."
 msgstr ""
+"Izvēlētais rīks aizpilda piemērotas noklusētās vērtības. Tās iespējams vēlāk "
+"mainīt ar Teksta rīka palīdzību. Tiek izmantots augšējais (pēc z-ass) rīks "
+"aktīvajā slānī. Ja pašreizējā slānī nav neviena rīka, tas tiek iegūts no "
+"augstākā slāņa. Nospiediet Pielietot, lai izveidotu jaunu rīku."
 
 #: ../share/extensions/generate_voronoi.inx.h:1
 msgid "Voronoi Pattern"
@@ -29016,6 +29252,13 @@ msgid ""
 "join of the pattern at the edges. Use a negative border to reduce the size "
 "of the pattern and get an empty border."
 msgstr ""
+"Izveidot nejaušu Voronoja šūnu faktūru. Faktūra būs pieejama Aizpildījuma un "
+"vilkuma dialoglodziņā. Jums ir jāizvēlas kāds objekts vai grupa.\n"
+"\n"
+"Ja apmale ir 0, faktūra tiks pārtraukta pie malām Izmantojiet pozitīvu "
+"apmales lielumu, vēlams, lielāku par šūnas izmēru, lai panāktu gludu "
+"faktūras elementu savienojumu pie malām. Izmantojiet negatīvu apmales "
+"lielumu, lai samazinātu faktūras elementu lielumu un iegūtu tukšu apmali."
 
 #: ../share/extensions/gimp_xcf.inx.h:1
 msgid "GIMP XCF"
@@ -29922,6 +30165,8 @@ msgid ""
 "This extension allows you to change the master slide JessyInk uses. Please "
 "see code.google.com/p/jessyink for more details."
 msgstr ""
+"Šis paplašinājums ļauj mainīt JessyInk izmantoto galveno slaidu. Plašākai "
+"informācijai skat. code.google.com/p/jessyink."
 
 #: ../share/extensions/jessyInk_mouseHandler.inx.h:1
 msgid "Mouse handler"
@@ -29999,7 +30244,7 @@ msgstr "Aizvākt efektus"
 
 #: ../share/extensions/jessyInk_uninstall.inx.h:5
 msgid "Remove master slide assignment"
-msgstr ""
+msgstr "Aizvākt galvenā slaida pazīmi"
 
 #: ../share/extensions/jessyInk_uninstall.inx.h:6
 msgid "Remove transitions"
@@ -30397,6 +30642,18 @@ msgid ""
 "Bezier curves. If a circle is used, the area may be too high by as much as "
 "0.03%."
 msgstr ""
+"Šis efekts mēra atlasīto ceļu garumu vai laukumu izvēlētajās vienībās un "
+"pievieno to kā teksta objektu.\n"
+"            \n"
+"  * Attēlošanas formāts var būt vai nu Teksts-gar-ceļu vai arī atsevišķi "
+"stāvošs norādītā leņķī novietots teksts.\n"
+"  * Zīmīgo ciparu skaitu vada izmantojot lauku Precizitāte.\n"
+"  * Lauks Nobīde kontrolē attālumu starp tekstu un ceļu.\n"
+"  * Mērogs ir izmantojams mērogotu attēlu mērīšanai.  Piemēram, ja 1 cm "
+"zīmējumā atbilst 2,5 m dabā, jānorāda mēroga vērtība 250.\n"
+"  * Aprēķinot laukumu, rezultātam daudzstūru un Bezjē līkņu gadījumā būtu "
+"jābūt precīzam. Ja ir izmantots riņķis, laukums var būt palielināts pat par "
+"0.03%."
 
 #: ../share/extensions/motion.inx.h:1
 msgid "Motion"
@@ -30539,6 +30796,9 @@ msgid ""
 "pattern is the topmost object in the selection (groups of paths/shapes/"
 "clones... allowed)."
 msgstr ""
+"Šis efekts izliec faktūras elementu gar norādīto \"skeleta\" ceļu. Faktūras "
+"elements ir augšējais no atlasītajiem. Ceļu/figūru/klonu utt. grupas ir "
+"atļautas."
 
 #: ../share/extensions/pathscatter.inx.h:3
 msgid "Follow path orientation"
@@ -30586,6 +30846,9 @@ msgid ""
 "pattern must be the topmost object in the selection. Groups of paths, "
 "shapes, clones are allowed."
 msgstr ""
+"Šis efekts izkliedē faktūras elementus gar norādīto \"skeleta\" ceļu. "
+"Faktūras elements ir augšējais no atlasītajiem. Ceļu/figūru/klonu utt. "
+"grupas ir atļautas."
 
 #: ../share/extensions/perfectboundcover.inx.h:1
 msgid "Perfect-Bound Cover Template"
@@ -30668,6 +30931,8 @@ msgid ""
 "Snap all paths in selection to pixels. Snaps borders to half-points and "
 "fills to full points."
 msgstr ""
+"Piesaistīt visus ceļus atlasītajā pie pikseļiem. Piesaista malas pie "
+"puspunktiem un aizpildījumu - pilnajiem punktiem."
 
 #: ../share/extensions/plt_input.inx.h:1
 msgid "AutoCAD Plot Input"
@@ -30975,6 +31240,8 @@ msgid ""
 "This effect randomly shifts the nodes (and optionally node handles) of the "
 "selected path."
 msgstr ""
+"Šis efekts nobīda par nejaušiem lielumiem atlasītā ceļa mezglus (un, pēc "
+"nepieciešamības - arī mezglu turus)."
 
 #: ../share/extensions/render_alphabetsoup.inx.h:1
 msgid "Alphabet Soup"
@@ -31908,6 +32175,8 @@ msgid ""
 "Select a set of objects. Their centroids will be used as the sites of the "
 "Voronoi diagram. Text objects are not handled."
 msgstr ""
+"Atlasiet objektu kopu. To centroīdi tiks izmantoti par Voronoja diagrammu "
+"vietām. Teksta objekti nav atbalstīti."
 
 #: ../share/extensions/webslicer_create_group.inx.h:1
 msgid "Set a layout group"
diff --git a/share/extensions/pathalongpath.inx b/share/extensions/pathalongpath.inx
index b555b9445..49b443c42 100644
--- a/share/extensions/pathalongpath.inx
+++ b/share/extensions/pathalongpath.inx
@@ -24,7 +24,7 @@
         <param name="duplicate" type="boolean" _gui-text="Duplicate the pattern before deformation">true</param>
         </page>
         <page name="Help" _gui-text="Help">
-            <_param name="title" type="description">This effect bends a pattern object along arbitrary "skeleton" paths. The pattern is the topmost object in the selection (groups of paths/shapes/clones... allowed).</_param>
+            <_param name="title" type="description">This effect scatters or bends a pattern along arbitrary "skeleton" paths. The pattern is the topmost object in the selection. Groups of paths, shapes or clones are allowed.</_param>
         </page>
     </param>
     <effect>
diff --git a/share/keys/default.xml b/share/keys/default.xml
index dfc1d7687..f9a6f0d44 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -291,7 +291,7 @@ override) the bindings in the main default.xml.
   <bind action="ViewColorModeGrayscale" />
 
 <!-- Edit -->
-
+  
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
   <bind key="Z" modifiers="Ctrl" action="EditUndo" />
   <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
@@ -307,12 +307,15 @@ override) the bindings in the main default.xml.
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
   <bind key="X" modifiers="Ctrl" action="EditCut" />
-
+  <bind key="Delete" modifiers="Shift" action="EditCut"/>
+  
   <bind key="c" modifiers="Ctrl" action="EditCopy" display="true" />
   <bind key="C" modifiers="Ctrl" action="EditCopy" />
+  <bind key="Insert" modifiers="Ctrl" action="EditCopy"/>
 
   <bind key="v" modifiers="Ctrl" action="EditPaste" display="true" />
   <bind key="V" modifiers="Ctrl" action="EditPaste" />
+  <bind key="Insert" modifiers="Shift" action="EditPaste"/>
 
   <bind key="v" modifiers="Ctrl,Shift" action="EditPasteStyle" display="true" />
   <bind key="V" modifiers="Ctrl,Shift" action="EditPasteStyle" />
diff --git a/share/keys/inkscape.xml b/share/keys/inkscape.xml
index dfc1d7687..f9a6f0d44 100644
--- a/share/keys/inkscape.xml
+++ b/share/keys/inkscape.xml
@@ -291,7 +291,7 @@ override) the bindings in the main default.xml.
   <bind action="ViewColorModeGrayscale" />
 
 <!-- Edit -->
-
+  
   <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
   <bind key="Z" modifiers="Ctrl" action="EditUndo" />
   <bind key="y" modifiers="Ctrl,Shift" action="EditUndo" />
@@ -307,12 +307,15 @@ override) the bindings in the main default.xml.
 
   <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
   <bind key="X" modifiers="Ctrl" action="EditCut" />
-
+  <bind key="Delete" modifiers="Shift" action="EditCut"/>
+  
   <bind key="c" modifiers="Ctrl" action="EditCopy" display="true" />
   <bind key="C" modifiers="Ctrl" action="EditCopy" />
+  <bind key="Insert" modifiers="Ctrl" action="EditCopy"/>
 
   <bind key="v" modifiers="Ctrl" action="EditPaste" display="true" />
   <bind key="V" modifiers="Ctrl" action="EditPaste" />
+  <bind key="Insert" modifiers="Shift" action="EditPaste"/>
 
   <bind key="v" modifiers="Ctrl,Shift" action="EditPasteStyle" display="true" />
   <bind key="V" modifiers="Ctrl,Shift" action="EditPasteStyle" />
diff --git a/src/Makefile.am b/src/Makefile.am
index 65baec21b..a899c7b35 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,7 @@ noinst_LIBRARIES =	\
 all_libs =			\
 	$(noinst_LIBRARIES)	\
 	$(INKSCAPE_LIBS)	\
+	$(EXIF_LIBS)            \
 	$(GNOME_VFS_LIBS)	\
 	$(XFT_LIBS)		\
 	$(FREETYPE_LIBS)	\
@@ -66,6 +67,7 @@ EXTRA_DIST =
 
 INCLUDES =	\
 	$(PERL_CFLAGS) $(PYTHON_CFLAGS)	\
+	$(EXIF_CFLAGS) \
 	$(FREETYPE_CFLAGS)	\
 	$(GNOME_PRINT_CFLAGS)	\
 	$(GNOME_VFS_CFLAGS)	\
diff --git a/src/device-manager.cpp b/src/device-manager.cpp
index a9394a5f6..a07231805 100644
--- a/src/device-manager.cpp
+++ b/src/device-manager.cpp
@@ -14,6 +14,7 @@
 #include "device-manager.h"
 #include "preferences.h"
 #include <gtk/gtk.h>
+#include <glibmm/regex.h>
 
 #define noDEBUG_VERBOSE 1
 
diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index b5634f42f..fa4fdd740 100644
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -36,6 +36,7 @@ set(extension_SRC
 	internal/cairo-render-context.cpp
 	internal/cairo-renderer.cpp
 	internal/cairo-renderer-pdf-out.cpp
+	internal/cdr-input.cpp
 	internal/emf-win32-inout.cpp
 	internal/emf-win32-print.cpp
 	internal/gdkpixbuf-input.cpp
@@ -100,6 +101,7 @@ set(extension_SRC
 	internal/cairo-render-context.h
 	internal/cairo-renderer-pdf-out.h
 	internal/cairo-renderer.h
+	internal/cdr-input.h
 	internal/clear-n_.h
 	internal/emf-win32-inout.h
 	internal/emf-win32-print.h
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp
index 4af778e04..fa46569e2 100644
--- a/src/extension/implementation/script.cpp
+++ b/src/extension/implementation/script.cpp
@@ -23,6 +23,8 @@
 #include <gtkmm/main.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/textview.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
 #include <unistd.h>
 
 #include <errno.h>
diff --git a/src/extension/implementation/script.h b/src/extension/implementation/script.h
index f52683623..270c361af 100644
--- a/src/extension/implementation/script.h
+++ b/src/extension/implementation/script.h
@@ -15,6 +15,9 @@
 
 #include "implementation.h"
 #include <gtkmm/enums.h>
+#include <glibmm/main.h>
+#include <glibmm/spawn.h>
+#include <glibmm/fileutils.h>
 
 namespace Inkscape {
 namespace XML {
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index a9ca5c456..56cc6d1af 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -22,6 +22,7 @@
 
 #include <interface.h>
 #include <unistd.h>
+#include <glibmm/miscutils.h>
 
 #include "system.h"
 #include "preferences.h"
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp
index fd146926f..320472347 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/ink-comboboxentry-action.cpp
@@ -303,11 +303,18 @@ ink_comboboxentry_action_class_init (Ink_ComboBoxEntry_ActionClass *klass)
 static void ink_comboboxentry_action_init (Ink_ComboBoxEntry_Action *action)
 {
   action->active = -1;
-  action->text = NULL;
+  action->text = strdup("");
   action->entry_completion = NULL;
   action->indicator = NULL;
   action->popup = false;
+  action->info = NULL;
+  action->info_cb = NULL;
+  action->info_cb_id = 0;
+  action->info_cb_blocked = false;
   action->warning = NULL;
+  action->warning_cb = NULL;
+  action->warning_cb_id = 0;
+  action->warning_cb_blocked = false;
   action->altx_name = NULL;
   action->focusWidget = NULL;
 }
@@ -370,7 +377,8 @@ GtkWidget* create_tool_item( GtkAction* action )
 
     ink_comboboxentry_action->combobox = GTK_COMBO_BOX (comboBoxEntry);
 
-    gtk_combo_box_set_active( GTK_COMBO_BOX( comboBoxEntry ), ink_comboboxentry_action->active );
+    //gtk_combo_box_set_active( GTK_COMBO_BOX( comboBoxEntry ), ink_comboboxentry_action->active );
+    gtk_combo_box_set_active( GTK_COMBO_BOX( comboBoxEntry ), 0 );
 
     g_signal_connect( G_OBJECT(comboBoxEntry), "changed", G_CALLBACK(combo_box_changed_cb), action );
 
@@ -432,7 +440,6 @@ GtkWidget* create_tool_item( GtkAction* action )
       // Add signal for GtkEntry to check if finished typing.
       g_signal_connect( G_OBJECT(child), "activate", G_CALLBACK(entry_activate_cb), action );
       g_signal_connect( G_OBJECT(child), "key-press-event", G_CALLBACK(keypress_cb), action );
-
     }
 
     gtk_activatable_set_related_action( GTK_ACTIVATABLE (item), GTK_ACTION( action ) );
@@ -476,66 +483,141 @@ gchar* ink_comboboxentry_action_get_active_text( Ink_ComboBoxEntry_Action* actio
   return text;
 }
 
-gboolean ink_comboboxentry_action_set_active_text( Ink_ComboBoxEntry_Action* ink_comboboxentry_action, const gchar* text ) {
+/*
+ * For the font-family list we need to handle two cases:
+ *   Text is in list store:
+ *     In this case we use row number as the font-family list can have duplicate
+ *     entries, one in the document font part and one in the system font part. In
+ *     order that scrolling through the list works properly we must distinguish
+ *     between the two.
+ *   Text is not in the list store (i.e. default font-family is not on system):
+ *     In this case we have a row number of -1, and the text must be set by hand.
+ */
+gboolean ink_comboboxentry_action_set_active_text( Ink_ComboBoxEntry_Action* action, const gchar* text, int row ) {
 
-  g_free( ink_comboboxentry_action->text );
-  ink_comboboxentry_action->text = g_strdup( text );
+  if( strcmp( action->text, text ) != 0 ) { 
+    g_free( action->text );
+    action->text = g_strdup( text );
+  }
 
   // Get active row or -1 if none
-  ink_comboboxentry_action->active = get_active_row_from_text( ink_comboboxentry_action, ink_comboboxentry_action->text );
+  if( row < 0 ) {
+    row = get_active_row_from_text( action, action->text );
+  }
+  action->active = row;
 
   // Set active row, check that combobox has been created.
-  if( ink_comboboxentry_action->combobox ) {
-    gtk_combo_box_set_active( GTK_COMBO_BOX( ink_comboboxentry_action->combobox ), ink_comboboxentry_action->active );
+  if( action->combobox ) {
+    gtk_combo_box_set_active( GTK_COMBO_BOX( action->combobox ), action->active );
   }
 
   // Fiddle with entry
-  if( ink_comboboxentry_action->entry ) {
+  if( action->entry ) {
 
     // Explicitly set text in GtkEntry box (won't be set if text not in list).
-    gtk_entry_set_text( ink_comboboxentry_action->entry, text );
+    gtk_entry_set_text( action->entry, text );
 
     // Show or hide warning  -- this might be better moved to text-toolbox.cpp
-    bool clear = true;
+    if( action->info_cb_id != 0 &&
+	!action->info_cb_blocked ) {
+      g_signal_handler_block (G_OBJECT(action->entry),
+			      action->info_cb_id );
+      action->info_cb_blocked = true;
+    }
+    if( action->warning_cb_id != 0 &&
+	!action->warning_cb_blocked ) {
+      g_signal_handler_block (G_OBJECT(action->entry),
+			      action->warning_cb_id );
+      action->warning_cb_blocked = true;
+    }
 
-    if( ink_comboboxentry_action->warning != NULL ) {
-      Glib::ustring missing = check_comma_separated_text( ink_comboboxentry_action );
+    bool set = false;
+    if( action->warning != NULL ) {
+      Glib::ustring missing = check_comma_separated_text( action );
       if( !missing.empty() ) {
 
-	  GtkStockItem item;
-	  gboolean isStock = gtk_stock_lookup( GTK_STOCK_DIALOG_WARNING, &item );
-	  if (isStock) {	
-	      gtk_entry_set_icon_from_stock( ink_comboboxentry_action->entry,
+	GtkStockItem item;
+	gboolean isStock = gtk_stock_lookup( GTK_STOCK_DIALOG_WARNING, &item );
+	if (isStock) {	
+	  gtk_entry_set_icon_from_stock( action->entry,
+					 GTK_ENTRY_ICON_SECONDARY,
+					 GTK_STOCK_DIALOG_WARNING );
+	} else {
+	  gtk_entry_set_icon_from_icon_name( action->entry,
 					     GTK_ENTRY_ICON_SECONDARY,
 					     GTK_STOCK_DIALOG_WARNING );
-	  } else {
-	      gtk_entry_set_icon_from_icon_name( ink_comboboxentry_action->entry,
-						 GTK_ENTRY_ICON_SECONDARY,
-						 GTK_STOCK_DIALOG_WARNING );
+	}
+	// Can't add tooltip until icon set
+	Glib::ustring warning = action->warning;
+	warning += ": ";
+	warning += missing;
+	gtk_entry_set_icon_tooltip_text( action->entry,
+					 GTK_ENTRY_ICON_SECONDARY,
+					 warning.c_str() );
+
+	if( action->warning_cb ) {
+
+	  // Add callback if we haven't already
+	  if( action->warning_cb_id == 0 ) {
+	    action->warning_cb_id =
+	      g_signal_connect( G_OBJECT(action->entry),
+				"icon-press",
+				G_CALLBACK(action->warning_cb),
+				action);
 	  }
-	  // Can't add tooltip until icon set
-	  Glib::ustring warning = ink_comboboxentry_action->warning;
-	  warning += ": ";
-	  warning += missing;
-	  gtk_entry_set_icon_tooltip_text( ink_comboboxentry_action->entry,
-					   GTK_ENTRY_ICON_SECONDARY,
-					   warning.c_str() );
-	  clear = false;
+	  // Unblock signal
+	  if( action->warning_cb_blocked ) {
+	    g_signal_handler_unblock (G_OBJECT(action->entry),
+				      action->warning_cb_id );
+	    action->warning_cb_blocked = false;
+	  }
+	}
+	set = true;
       }
     }
  
-   if( clear ) {
-      gtk_entry_set_icon_from_icon_name( GTK_ENTRY(ink_comboboxentry_action->entry),
+    if( !set && action->info != NULL ) {
+      gtk_entry_set_icon_from_icon_name( GTK_ENTRY(action->entry),
+					 GTK_ENTRY_ICON_SECONDARY,
+					 GTK_STOCK_SELECT_ALL );
+      gtk_entry_set_icon_from_stock( GTK_ENTRY(action->entry),
+				     GTK_ENTRY_ICON_SECONDARY,
+				     GTK_STOCK_SELECT_ALL );
+      gtk_entry_set_icon_tooltip_text( action->entry,
+				       GTK_ENTRY_ICON_SECONDARY,
+				       action->info );
+
+      if( action->info_cb ) {
+	// Add callback if we haven't already
+	if( action->info_cb_id == 0 ) {
+	  action->info_cb_id =
+	    g_signal_connect( G_OBJECT(action->entry),
+			      "icon-press",
+			      G_CALLBACK(action->info_cb),
+			      action);
+	}
+	// Unblock signal
+	if( action->info_cb_blocked ) {
+	  g_signal_handler_unblock (G_OBJECT(action->entry),
+				    action->info_cb_id );
+	  action->info_cb_blocked = false;
+	}
+      }
+      set = true;
+    }
+
+    if( !set ) {
+      gtk_entry_set_icon_from_icon_name( GTK_ENTRY(action->entry),
 					 GTK_ENTRY_ICON_SECONDARY,
 					 NULL );
-      gtk_entry_set_icon_from_stock( GTK_ENTRY(ink_comboboxentry_action->entry),
+      gtk_entry_set_icon_from_stock( GTK_ENTRY(action->entry),
 				     GTK_ENTRY_ICON_SECONDARY,
 				     NULL );
     }
   }
 
   // Return if active text in list
-  gboolean found = ( ink_comboboxentry_action->active != -1 );
+  gboolean found = ( action->active != -1 );
   return found;
 }
 
@@ -611,6 +693,24 @@ void     ink_comboboxentry_action_set_tooltip( Ink_ComboBoxEntry_Action* action,
 
 }
 
+void     ink_comboboxentry_action_set_info( Ink_ComboBoxEntry_Action* action, const gchar* info ) {
+
+  g_free( action->info );
+  action->info = g_strdup( info );
+
+  // Widget may not have been created....
+  if( action->entry ) {
+    gtk_entry_set_icon_tooltip_text( GTK_ENTRY(action->entry),
+                                     GTK_ENTRY_ICON_SECONDARY,
+                                     action->info );
+  }
+}
+
+void     ink_comboboxentry_action_set_info_cb( Ink_ComboBoxEntry_Action* action, gpointer info_cb ) {
+
+  action->info_cb = info_cb;
+}
+
 void     ink_comboboxentry_action_set_warning( Ink_ComboBoxEntry_Action* action, const gchar* warning ) {
 
   g_free( action->warning );
@@ -624,6 +724,11 @@ void     ink_comboboxentry_action_set_warning( Ink_ComboBoxEntry_Action* action,
   }
 }
 
+void     ink_comboboxentry_action_set_warning_cb( Ink_ComboBoxEntry_Action* action, gpointer warning_cb ) {
+
+  action->warning_cb = warning_cb;
+}
+
 void     ink_comboboxentry_action_set_altx_name( Ink_ComboBoxEntry_Action* action, const gchar* altx_name ) {
 
   g_free( action->altx_name );
@@ -728,22 +833,27 @@ static void combo_box_changed_cb( GtkComboBox* widget, gpointer data ) {
   // We only react here if an item is selected.
 
   // Get action
-  Ink_ComboBoxEntry_Action *act = INK_COMBOBOXENTRY_ACTION( data );
+  Ink_ComboBoxEntry_Action *action = INK_COMBOBOXENTRY_ACTION( data );
 
   // Check if item selected:
   gint newActive = gtk_combo_box_get_active(widget);
-  if( newActive >= 0 ) {
+  if( newActive >= 0 && newActive != action->active ) {
 
-    if( newActive != act->active ) {
-      act->active = newActive;
-      g_free( act->text );
-      GtkWidget *entry = gtk_bin_get_child (GTK_BIN (widget));
-      act->text = g_strdup (gtk_entry_get_text (GTK_ENTRY (entry)));
+    action->active = newActive;
 
-      // Now let the world know
-      g_signal_emit( G_OBJECT(act), signals[CHANGED], 0 );
+    GtkTreeIter iter;
+    if( gtk_combo_box_get_active_iter( GTK_COMBO_BOX( action->combobox ), &iter ) ) {
 
+      gchar* text = 0;
+      gtk_tree_model_get( action->model, &iter, 0, &text, -1 );
+      gtk_entry_set_text( action->entry, text );
+
+      g_free( action->text );
+      action->text = text;
     }
+
+    // Now let the world know
+    g_signal_emit( G_OBJECT(action), signals[CHANGED], 0 );
   }
 }
 
@@ -752,29 +862,29 @@ static void entry_activate_cb( GtkEntry* widget, gpointer data ) {
   // Get text from entry box.. check if it matches a menu entry.
 
   // Get action
-  Ink_ComboBoxEntry_Action *ink_comboboxentry_action = INK_COMBOBOXENTRY_ACTION( data );
+  Ink_ComboBoxEntry_Action *action = INK_COMBOBOXENTRY_ACTION( data );
 
   // Get text
-  g_free( ink_comboboxentry_action->text );
-  ink_comboboxentry_action->text = g_strdup( gtk_entry_get_text( widget ) );
+  g_free( action->text );
+  action->text = g_strdup( gtk_entry_get_text( widget ) );
 
   // Get row
-  ink_comboboxentry_action->active =
-    get_active_row_from_text( ink_comboboxentry_action, ink_comboboxentry_action->text );
+  action->active =
+    get_active_row_from_text( action, action->text );
 
   // Set active row
-  gtk_combo_box_set_active( GTK_COMBO_BOX( ink_comboboxentry_action->combobox), ink_comboboxentry_action->active );
+  gtk_combo_box_set_active( GTK_COMBO_BOX( action->combobox), action->active );
 
   // Now let the world know
-  g_signal_emit( G_OBJECT(ink_comboboxentry_action), signals[CHANGED], 0 );
+  g_signal_emit( G_OBJECT(action), signals[CHANGED], 0 );
 
 }
 
 static gboolean match_selected_cb( GtkEntryCompletion* /*widget*/, GtkTreeModel* model, GtkTreeIter* iter, gpointer data )
 {
   // Get action
-  Ink_ComboBoxEntry_Action *ink_comboboxentry_action = INK_COMBOBOXENTRY_ACTION( data );
-  GtkEntry *entry = ink_comboboxentry_action->entry;
+  Ink_ComboBoxEntry_Action *action = INK_COMBOBOXENTRY_ACTION( data );
+  GtkEntry *entry = action->entry;
 
   if( entry) {
     gchar *family = 0;
@@ -784,18 +894,18 @@ static gboolean match_selected_cb( GtkEntryCompletion* /*widget*/, GtkTreeModel*
     gtk_entry_set_text (GTK_ENTRY (entry), family );
 
     // Set text in GtkAction
-    g_free( ink_comboboxentry_action->text );
-    ink_comboboxentry_action->text = family;
+    g_free( action->text );
+    action->text = family;
 
     // Get row
-    ink_comboboxentry_action->active =
-      get_active_row_from_text( ink_comboboxentry_action, ink_comboboxentry_action->text );
+    action->active =
+      get_active_row_from_text( action, action->text );
 
     // Set active row
-    gtk_combo_box_set_active( GTK_COMBO_BOX( ink_comboboxentry_action->combobox), ink_comboboxentry_action->active );
+    gtk_combo_box_set_active( GTK_COMBO_BOX( action->combobox), action->active );
 
     // Now let the world know
-    g_signal_emit( G_OBJECT(ink_comboboxentry_action), signals[CHANGED], 0 );
+    g_signal_emit( G_OBJECT(action), signals[CHANGED], 0 );
 
     return true;
   }
diff --git a/src/ink-comboboxentry-action.h b/src/ink-comboboxentry-action.h
index f0dc0ee7e..a66f0790e 100644
--- a/src/ink-comboboxentry-action.h
+++ b/src/ink-comboboxentry-action.h
@@ -58,7 +58,14 @@ struct _Ink_ComboBoxEntry_Action {
   gint                entry_width;// Width of GtkEntry in characters.
   gint                extra_width;// Extra Width of GtkComboBox.. to widen drop-down list in list mode.
   gboolean            popup;      // Do we pop-up an entry-completion dialog?
-  gchar              *warning;    // Text for warning that entry isn't in list.
+  gchar              *info;       // Text for tooltip info about entry.
+  gpointer            info_cb;    // Callback for clicking info icon.
+  gint                info_cb_id;
+  gboolean            info_cb_blocked;
+  gchar              *warning;    // Text for tooltip warning that entry isn't in list.
+  gpointer            warning_cb; // Callback for clicking warning icon.
+  gint                warning_cb_id;
+  gboolean            warning_cb_blocked;
   gchar              *altx_name;  // Target for Alt-X keyboard shortcut.
   GtkWidget          *focusWidget;
 };
@@ -84,7 +91,7 @@ GtkTreeModel     *ink_comboboxentry_action_get_model( Ink_ComboBoxEntry_Action*
 GtkComboBox      *ink_comboboxentry_action_get_comboboxentry( Ink_ComboBoxEntry_Action* action );
 
 gchar*   ink_comboboxentry_action_get_active_text( Ink_ComboBoxEntry_Action* action );
-gboolean ink_comboboxentry_action_set_active_text( Ink_ComboBoxEntry_Action* action, const gchar* text );
+gboolean ink_comboboxentry_action_set_active_text( Ink_ComboBoxEntry_Action* action, const gchar* text, int row=-1 );
 
 void     ink_comboboxentry_action_set_entry_width( Ink_ComboBoxEntry_Action* action, gint entry_width );
 void     ink_comboboxentry_action_set_extra_width( Ink_ComboBoxEntry_Action* action, gint extra_width );
@@ -92,8 +99,11 @@ void     ink_comboboxentry_action_set_extra_width( Ink_ComboBoxEntry_Action* act
 void     ink_comboboxentry_action_popup_enable(  Ink_ComboBoxEntry_Action* action );
 void     ink_comboboxentry_action_popup_disable( Ink_ComboBoxEntry_Action* action );
 
-void     ink_comboboxentry_action_set_warning( Ink_ComboBoxEntry_Action* action, const gchar* warning );
-void     ink_comboboxentry_action_set_tooltip( Ink_ComboBoxEntry_Action* action, const gchar* tooltip );
+void     ink_comboboxentry_action_set_info(      Ink_ComboBoxEntry_Action* action, const gchar* info );
+void     ink_comboboxentry_action_set_info_cb(   Ink_ComboBoxEntry_Action* action, gpointer info_cb );
+void     ink_comboboxentry_action_set_warning(   Ink_ComboBoxEntry_Action* action, const gchar* warning_cb );
+void     ink_comboboxentry_action_set_warning_cb(Ink_ComboBoxEntry_Action* action, gpointer warning );
+void     ink_comboboxentry_action_set_tooltip(   Ink_ComboBoxEntry_Action* action, const gchar* tooltip );
 
 void     ink_comboboxentry_action_set_altx_name( Ink_ComboBoxEntry_Action* action, const gchar* altx_name );
 
diff --git a/src/inkscape.cpp b/src/inkscape.cpp
index fc823f8b7..449220357 100644
--- a/src/inkscape.cpp
+++ b/src/inkscape.cpp
@@ -37,6 +37,8 @@
 #include <glib/gstdio.h>
 #include <glib.h>
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
+#include <glibmm/convert.h>
 #include <gtkmm/messagedialog.h>
 #include <gtk/gtk.h>
 #include <signal.h>
diff --git a/src/interface.cpp b/src/interface.cpp
index 823119953..284368bff 100644
--- a/src/interface.cpp
+++ b/src/interface.cpp
@@ -458,47 +458,21 @@ static GtkWidget *sp_ui_menu_append_item_from_verb(GtkMenu *menu, Inkscape::Verb
         item = gtk_separator_menu_item_new();
 
     } else {
-        unsigned int shortcut;
 
         action = verb->get_action(view);
         if (!action) return NULL;
 
-        shortcut = sp_shortcut_get_primary(verb);
-        if (shortcut!=GDK_KEY_VoidSymbol) {
-            gchar* c = sp_shortcut_get_label(shortcut);
-#if GTK_CHECK_VERSION(3,0,0)
-            GtkWidget *const hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 16);
-            gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-            GtkWidget *const hb = gtk_hbox_new(FALSE, 16);
-#endif
-            GtkWidget *const name_lbl = gtk_label_new("");
-            gtk_label_set_markup_with_mnemonic(GTK_LABEL(name_lbl), action->name);
-            gtk_misc_set_alignment(reinterpret_cast<GtkMisc *>(name_lbl), 0.0, 0.5);
-            gtk_box_pack_start(reinterpret_cast<GtkBox *>(hb), name_lbl, TRUE, TRUE, 0);
-            GtkWidget *const accel_lbl = gtk_label_new(c);
-            gtk_misc_set_alignment(reinterpret_cast<GtkMisc *>(accel_lbl), 1.0, 0.5);
-            gtk_box_pack_end(reinterpret_cast<GtkBox *>(hb), accel_lbl, FALSE, FALSE, 0);
-            gtk_widget_show_all(hb);
-            if (radio) {
-                item = gtk_radio_menu_item_new (group);
-            } else {
-                item = gtk_image_menu_item_new();
-            }
-            gtk_container_add(reinterpret_cast<GtkContainer *>(item), hb);
-            g_free(c);
+        if (radio) {
+            item = gtk_radio_menu_item_new_with_mnemonic(group, action->name);
         } else {
-            if (radio) {
-                item = gtk_radio_menu_item_new (group);
-            } else {
-                item = gtk_image_menu_item_new ();
-            }
-            GtkWidget *const name_lbl = gtk_label_new("");
-            gtk_label_set_markup_with_mnemonic(GTK_LABEL(name_lbl), action->name);
-            gtk_misc_set_alignment(reinterpret_cast<GtkMisc *>(name_lbl), 0.0, 0.5);
-            gtk_container_add(reinterpret_cast<GtkContainer *>(item), name_lbl);
+            item = gtk_image_menu_item_new_with_mnemonic(action->name);
         }
 
+        GtkAccelGroup *accel_group =  sp_shortcut_get_accel_group();
+        gtk_menu_set_accel_group(menu, accel_group);
+
+        sp_shortcut_add_accelerator(item, sp_shortcut_get_primary(verb));
+
         action->signal_set_sensitive.connect(
             sigc::bind<0>(
                 sigc::ptr_fun(&gtk_widget_set_sensitive),
@@ -698,45 +672,16 @@ sp_ui_menu_append_check_item_from_verb(GtkMenu *menu, Inkscape::UI::View::View *
 {
     unsigned int shortcut = (verb) ? sp_shortcut_get_primary(verb) : 0;
     SPAction *action = (verb) ? verb->get_action(view) : 0;
-    GtkWidget *item = gtk_check_menu_item_new();
-
-
-    if (verb && shortcut!=GDK_KEY_VoidSymbol) {
-        gchar* c = sp_shortcut_get_label(shortcut);
-
-#if GTK_CHECK_VERSION(3,0,0)
-        GtkWidget *hb = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 16);
-        gtk_box_set_homogeneous(GTK_BOX(hb), FALSE);
-#else
-        GtkWidget *hb = gtk_hbox_new(FALSE, 16);
-#endif
+    GtkWidget *item = gtk_check_menu_item_new_with_mnemonic(action ? action->name : label);
 
-        {
-            GtkWidget *l = gtk_label_new_with_mnemonic(action ? action->name : label);
-            gtk_misc_set_alignment((GtkMisc *) l, 0.0, 0.5);
-            gtk_box_pack_start((GtkBox *) hb, l, TRUE, TRUE, 0);
-        }
-
-        {
-            GtkWidget *l = gtk_label_new(c);
-            gtk_misc_set_alignment((GtkMisc *) l, 1.0, 0.5);
-            gtk_box_pack_end((GtkBox *) hb, l, FALSE, FALSE, 0);
-        }
-
-        gtk_widget_show_all(hb);
-
-        gtk_container_add((GtkContainer *) item, hb);
-        g_free(c);
-    } else {
-        GtkWidget *l = gtk_label_new_with_mnemonic(action ? action->name : label);
-        gtk_misc_set_alignment((GtkMisc *) l, 0.0, 0.5);
-        gtk_container_add((GtkContainer *) item, l);
-    }
 #if 0
     if (!action->sensitive) {
         gtk_widget_set_sensitive(item, FALSE);
     }
 #endif
+
+    sp_shortcut_add_accelerator(item, shortcut);
+
     gtk_widget_show(item);
 
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -1726,40 +1671,13 @@ void ContextMenu::AppendItemFromVerb(Inkscape::Verb *verb)//, SPDesktop *view)//
         append(*item);
     } else {
         action = verb->get_action(view);
-        if (!action)
-        {
+        if (!action) {
             return;
         }
         
-        Gtk::ImageMenuItem *item = NULL;
-        unsigned int shortcut = sp_shortcut_get_primary(verb);
-        if (shortcut!=GDK_KEY_VoidSymbol) {
-            gchar* c = sp_shortcut_get_label(shortcut);
-            Gtk::HBox *const hb = manage(new Gtk::HBox (FALSE, 16));
-            Gtk::Label *const name_lbl = manage(new Gtk::Label(action->name, true));
-            name_lbl->set_alignment(0.0, 0.5);
-            hb->pack_start(*name_lbl, TRUE, TRUE, 0);
-            Gtk::Label *const accel_lbl = manage(new Gtk::Label(c));
-            accel_lbl->set_alignment(1.0, 0.5);
-            hb->pack_end(*accel_lbl, FALSE, FALSE, 0);
-            hb->show_all();
-            // if (radio) {
-                // item = gtk_radio_menu_item_new (group);
-            // } else {
-                item = new Gtk::ImageMenuItem();
-            // }
-            item->add(*hb);
-            g_free(c);
-        } else {
-            // if (radio) {
-                // item = gtk_radio_menu_item_new (group);
-            // } else {
-                item = manage(new Gtk::ImageMenuItem());
-            // }
-            Gtk::Label *const name_lbl = manage(new Gtk::Label(action->name, true));
-            name_lbl->set_alignment(0.0, 0.5);
-            item->add(*name_lbl);
-        }
+        Gtk::ImageMenuItem *item = manage(new Gtk::ImageMenuItem(action->name, true));
+
+        sp_shortcut_add_accelerator(GTK_WIDGET(item->gobj()), sp_shortcut_get_primary(verb));
 
         action->signal_set_sensitive.connect(sigc::mem_fun(*this, &ContextMenu::set_sensitive));
         action->signal_set_name.connect(sigc::mem_fun(*item, &ContextMenu::set_name));
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index 04859185c..5e67c5991 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -10,15 +10,19 @@
 #include <glibmm.h>
 #include <gtkmm/treemodel.h>
 #include <gtkmm/liststore.h>
-
 #include "font-lister.h"
 #include "FontFactory.h"
 
+#include "desktop.h"
+#include "desktop-style.h"
+#include "document.h"
+#include "inkscape.h"
+#include "preferences.h"
 #include "sp-object.h"
 #include "sp-root.h"
-#include "document.h"
 #include "xml/repr.h"
-#include "preferences.h"
+
+//#define DEBUG_FONT
 
 namespace Inkscape
 {
@@ -29,7 +33,7 @@ namespace Inkscape
 
         FamilyToStylesMap familyStyleMap;
         font_factory::Default()->GetUIFamiliesAndStyles(&familyStyleMap);
-       
+
         // Grab the family names into a list and then sort them
         std::list<Glib::ustring> familyList;
         for (FamilyToStylesMap::iterator iter = familyStyleMap.begin();
@@ -47,7 +51,8 @@ namespace Inkscape
             
             if (!familyName.empty()) {
                 Gtk::TreeModel::iterator treeModelIter = font_list_store->append();
-                (*treeModelIter)[FontList.font] = reinterpret_cast<const char*>(g_strdup(familyName.c_str()));
+                //(*treeModelIter)[FontList.family] = reinterpret_cast<const char*>(g_strdup(familyName.c_str()));
+                (*treeModelIter)[FontList.family] = familyName;
                 
                 // Now go through the styles
                 GList *styles = NULL;
@@ -62,7 +67,22 @@ namespace Inkscape
                 (*treeModelIter)[FontList.onSystem] = true;
             }
         }
+	current_family_row = 0;
+	current_family = "sans-serif";
+	current_style = "Normal";
+	current_fontspec = "sans-serif";  // Empty style -> Normal
+	current_fontspec_system = "Sans";
+
+	/* Create default styles for use when font-family is unknown on system. */
+	default_styles = g_list_append( NULL,           g_strdup("Normal") );
+	default_styles = g_list_append( default_styles, g_strdup("Italic") );
+	default_styles = g_list_append( default_styles, g_strdup("Bold") );
+	default_styles = g_list_append( default_styles, g_strdup("Bold Italic") );
+
 	font_list_store->thaw_notify();
+
+        style_list_store       = Gtk::ListStore::create (FontStyleList);
+        style_list_store_trial = Gtk::ListStore::create (FontStyleList);
     }
 
     // Example of how to use "foreach_iter"
@@ -70,7 +90,7 @@ namespace Inkscape
     // FontLister::print_document_font( const Gtk::TreeModel::iterator &iter ) {
     //   Gtk::TreeModel::Row row = *iter;
     //   if( !row[FontList.onSystem] ) {
-    // 	   std::cout << " Not on system: " << row[FontList.font] << std::endl;
+    // 	   std::cout << " Not on system: " << row[FontList.family] << std::endl;
     // 	   return false;
     //   }
     //   return true;
@@ -87,28 +107,31 @@ namespace Inkscape
 
       font_list_store->freeze_notify();
 
+      /* Find if current row is in document or system part of list */
+      gboolean row_is_system = false;
+      if( current_family_row > -1 ) {
+	Gtk::TreePath path;
+	path.push_back( current_family_row );
+	Gtk::TreeModel::iterator iter = font_list_store->get_iter( path );
+	if( iter ) {
+	  row_is_system = (*iter)[FontList.onSystem];
+	  // std::cout << "  In:  row: " << current_family_row << "  " << (*iter)[FontList.family] << std::endl;
+	}
+      }
+
       /* Clear all old document font-family entries */
       Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" );
       while( iter != font_list_store->children().end() ) {
 	Gtk::TreeModel::Row row = *iter;
 	if( !row[FontList.onSystem] ) {
-	  // std::cout << " Not on system: " << row[FontList.font] << std::endl;
+	  // std::cout << " Not on system: " << row[FontList.family] << std::endl;
 	  iter = font_list_store->erase( iter );
 	} else {
-	  // std::cout << " First on system: " << row[FontList.font] << std::endl;
+	  // std::cout << " First on system: " << row[FontList.family] << std::endl;
 	  break;
 	}
       }
 
-      /* Create default styles for use when font-family is unknown on system. */
-      static GList *default_styles = NULL;
-      if( default_styles == NULL ) {
-        default_styles = g_list_append( default_styles, g_strdup("Normal") );
-        default_styles = g_list_append( default_styles, g_strdup("Italic") );
-        default_styles = g_list_append( default_styles, g_strdup("Bold") );
-        default_styles = g_list_append( default_styles, g_strdup("Bold Italic") );
-      }
-
       /* Get "font-family"s used in document. */
       std::list<Glib::ustring> fontfamilies;
       update_font_list_recursive( r, &fontfamilies );
@@ -120,7 +143,7 @@ namespace Inkscape
       /* Insert separator */
       if( !fontfamilies.empty() ) {
 	Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend();
-	(*treeModelIter)[FontList.font] = "#";
+	(*treeModelIter)[FontList.family] = "#";
 	(*treeModelIter)[FontList.onSystem] = false;
       }
 
@@ -137,7 +160,7 @@ namespace Inkscape
 	  Gtk::TreeModel::iterator iter2 = font_list_store->get_iter( "0" );
 	  while( iter2 != font_list_store->children().end() ) {
 	    Gtk::TreeModel::Row row = *iter2;
-	    if( row[FontList.onSystem] && tokens[0].compare( row[FontList.font] ) == 0 ) {
+	    if( row[FontList.onSystem] && tokens[0].compare( row[FontList.family] ) == 0 ) {
 	      styles = row[FontList.styles];
 	      break;
 	    }
@@ -146,11 +169,37 @@ namespace Inkscape
 	}
 
 	Gtk::TreeModel::iterator treeModelIter = font_list_store->prepend();
-	(*treeModelIter)[FontList.font] = reinterpret_cast<const char*>(g_strdup((*i).c_str()));
+	(*treeModelIter)[FontList.family] = reinterpret_cast<const char*>(g_strdup((*i).c_str()));
 	(*treeModelIter)[FontList.styles] = styles;
 	(*treeModelIter)[FontList.onSystem] = false;
       }
 
+      /* Now we do a song and dance to find the correct row as the row corresponding
+       * to the current_family may have changed. We can't simply search for the
+       * family name in the list since it can occur twice, once in the document
+       * font family part and once in the system font family part. Above we determined
+       * which part it is in.
+       */
+      if( current_family_row > -1 ) {
+	int start = 0;
+	if( row_is_system ) start = fontfamilies.size();
+	int length = font_list_store->children().size();
+	for( int i = 0; i < length; ++i ) {
+	  int row = i + start;
+	  if( row >= length ) row -= length;
+	  Gtk::TreePath path;
+	  path.push_back( row );
+	  Gtk::TreeModel::iterator iter = font_list_store->get_iter( path );
+	  if( iter ) {
+	    if( current_family.compare( (*iter)[FontList.family] ) == 0 ) {
+	      current_family_row = row;
+	      break;
+	    }
+	  }
+	}
+      }
+      // std::cout << "  Out: row: " << current_family_row << "  " << current_family << std::endl;
+
       font_list_store->thaw_notify();
     }
 
@@ -191,7 +240,578 @@ namespace Inkscape
       }
     }
 
-    Gtk::TreePath
+    Glib::ustring
+    FontLister::canonize_fontspec( Glib::ustring fontspec ) {
+
+      // Pass fontspec to and back from Pango to get a the fontspec in
+      // canonical form.  -inkscape-font-specification relies on the
+      // Pango constructed fontspec not changing form. If it does,
+      // this is the place to fix it.
+      PangoFontDescription *descr = pango_font_description_from_string( fontspec.c_str() );
+      gchar* canonized = pango_font_description_to_string ( descr );
+      Glib::ustring Canonized = canonized;
+      g_free( canonized );
+      pango_font_description_free( descr );
+
+      // Pango canonized strings remove space after comma between family names. Put it back.
+      size_t i = 0;
+      while( (i = Canonized.find(",", i)) != std::string::npos) {
+         Canonized.replace(i, 1, ", ");
+         i += 2;
+      }
+
+      return Canonized;
+    }
+
+    Glib::ustring
+    FontLister::system_fontspec( Glib::ustring fontspec ) {
+
+      // Find what Pango thinks is the closest match.
+      Glib::ustring out = fontspec;
+
+      PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str());
+      font_instance *res = (font_factory::Default())->Face(descr);
+      if (res->pFont) {
+        PangoFontDescription *nFaceDesc = pango_font_describe(res->pFont);
+        out = sp_font_description_get_family(nFaceDesc);
+      }
+      pango_font_description_free(descr);
+
+      return out;
+    }
+
+    std::pair<Glib::ustring, Glib::ustring>
+    FontLister::ui_from_fontspec( Glib::ustring fontspec ) {
+
+      PangoFontDescription *descr = pango_font_description_from_string(fontspec.c_str());
+      const gchar* family = pango_font_description_get_family(descr);
+      Glib::ustring Family = family;
+
+      // Pango canonized strings remove space after comma between family names. Put it back.
+      size_t i = 0;
+      while( (i = Family.find(",", i)) != std::string::npos) {
+         Family.replace(i, 1, ", ");
+         i += 2;
+      }
+
+      pango_font_description_unset_fields(descr, PANGO_FONT_MASK_FAMILY);
+      gchar* style = pango_font_description_to_string( descr );
+      Glib::ustring Style = style;
+      pango_font_description_free(descr);
+      g_free( style );
+
+      return std::make_pair( Family, Style );
+    }
+
+    std::pair<Glib::ustring, Glib::ustring>
+    FontLister::selection_update () {
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister::selection_update: entrance" << std::endl;
+#endif
+      // Get fontspec from a selection, preferences, or thin air.
+      Glib::ustring fontspec;
+      SPStyle *query = sp_style_new (SP_ACTIVE_DOCUMENT);
+
+      // Directly from stored font specification.
+      int result =
+	sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONT_SPECIFICATION);
+
+      //std::cout << "  Attempting selected style" << std::endl;
+      if( result != QUERY_STYLE_NOTHING && query->text->font_specification.set ) {
+	fontspec = query->text->font_specification.value;
+	//std::cout << "   fontspec from query   :" << fontspec << ":" << std::endl;
+      }
+
+      // From style
+      if( fontspec.empty() ) {
+	//std::cout << "  Attempting desktop style" << std::endl;
+	int rfamily = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY);
+	int rstyle  = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE);
+
+	// Must have text in selection
+	if( rfamily != QUERY_STYLE_NOTHING && rstyle != QUERY_STYLE_NOTHING ) {
+	  fontspec = fontspec_from_style( query );
+	}
+	//std::cout << "   fontspec from style   :" << fontspec << ":" << std::endl;
+      }
+
+      // From preferences
+      if( fontspec.empty() ) {
+	//std::cout << "  Attempting preferences" << std::endl;
+        sp_style_read_from_prefs(query, "/tools/text");
+	fontspec = fontspec_from_style( query );
+	//std::cout << "   fontspec from prefs   :" << fontspec << ":" << std::endl;
+      }
+      sp_style_unref(query);
+
+      // From thin air
+      if( fontspec.empty() ) {
+	//std::cout << "  Attempting thin air" << std::endl;
+	fontspec = current_family + ", " + current_style;
+	//std::cout << "   fontspec from thin air   :" << fontspec << ":" << std::endl;
+      }
+  
+      // Do we really need? Removes spaces between font-families.
+      //current_fontspec = canonize_fontspec( fontspec );
+      current_fontspec = fontspec; // Ignore for now
+
+      current_fontspec_system = system_fontspec( current_fontspec );
+
+      std::pair<Glib::ustring, Glib::ustring> ui = ui_from_fontspec( current_fontspec );
+      set_font_family( ui.first );
+
+#ifdef DEBUG_FONT
+      std::cout << "   family_row:           :" << current_family_row << ":" << std::endl;
+      std::cout << "   canonized:            :" << current_fontspec << ":" << std::endl;
+      std::cout << "   system:               :" << current_fontspec_system << ":" << std::endl;
+      std::cout << "   family:               :" << current_family << ":" << std::endl;
+      std::cout << "   style:                :" << current_style << ":" << std::endl;
+      std::cout << "FontLister::selection_update: exit" << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+      return std::make_pair( current_family, current_style );
+    }
+ 
+
+    // TODO: use to determine font-selector best style
+    std::pair<Glib::ustring, Glib::ustring>
+    FontLister::new_font_family (Glib::ustring new_family, gboolean check_style ) {
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister::new_font_family: " << new_family << std::endl;
+#endif
+
+      // No need to do anything if new family is same as old family.
+      if( new_family.compare( current_family ) == 0 ) {
+#ifdef DEBUG_FONT
+	std::cout << "FontLister::new_font_family: exit: no change in family." << std::endl;
+	std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+	return std::make_pair( current_family, current_style );
+      }
+
+      // We need to do two things:
+      // 1. Update style list for new family.
+      // 2. Select best valid style match to old style.
+
+      // For finding style list, use list of first family in font-family list.
+      GList* styles = NULL;
+      Gtk::TreeModel::iterator iter = font_list_store->get_iter( "0" );
+      while( iter != font_list_store->children().end() ) {
+
+	Gtk::TreeModel::Row row = *iter;
+
+	if( new_family.compare( row[FontList.family] ) == 0 ) {
+	  styles = row[FontList.styles];
+	  break;
+	}
+	++iter;
+      }
+
+      // Newly typed in font-family may not yet be in list... use default list.
+      // TODO: if font-family is list, check if first family in list is on system
+      // and set style accordingly.
+      if( styles == NULL ) {
+	styles = default_styles;
+      }
+      
+      // Update style list.
+      // TODO: create a second "temporary" style_list_store for font_selector.
+      style_list_store->freeze_notify();
+      style_list_store->clear();
+
+      for (GList *l=styles; l; l = l->next) {
+	Gtk::TreeModel::iterator treeModelIter = style_list_store->append();
+	(*treeModelIter)[FontStyleList.styles] = (char*)l->data;
+      }
+
+      style_list_store->thaw_notify();
+	
+      // Find best match to the style from the old font-family to the
+      // styles available with the new font.
+      // TODO: Maybe check if an exact match exists before using Pango.
+      Glib::ustring best_style = current_style;
+      if( check_style ) {
+	//std::cout << "  Trying to match: " << current_fontspec << std::endl;
+	PangoFontDescription *desc_old
+	  = pango_font_description_from_string( current_fontspec.c_str() );
+	PangoFontDescription* desc_best = NULL;
+
+	for (GList *l=styles; l; l = l->next) {
+	  Glib::ustring candidate = new_family + ", " + (char*)l->data;
+	  PangoFontDescription* desc_candidate
+	    = pango_font_description_from_string( candidate.c_str() );
+	  //std::cout << "  Testing: " << pango_font_description_to_string( desc_candidate ) << std::endl;
+	  if( pango_font_description_better_match( desc_old, desc_best, desc_candidate ) ) {
+	    pango_font_description_free( desc_best );
+	    desc_best = desc_candidate;
+	    //std::cout << "  ... better: " << std::endl;
+	  } else {
+	    pango_font_description_free( desc_candidate );
+	    //std::cout << "  ... not better: " << std::endl;
+	  }
+	}
+	if( desc_best ) {
+	  pango_font_description_unset_fields( desc_best, PANGO_FONT_MASK_FAMILY );
+	  best_style = pango_font_description_to_string( desc_best );
+	}
+
+	if( desc_old  ) pango_font_description_free( desc_old  );
+	if( desc_best ) pango_font_description_free( desc_best );
+      }
+
+#ifdef DEBUG_FONT
+      std::cout << "FontLister::new_font_family: exit: " << new_family << " " << best_style << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+      return std::make_pair( new_family, best_style );
+    }
+ 
+    std::pair<Glib::ustring, Glib::ustring>
+    FontLister::set_font_family (Glib::ustring new_family, gboolean check_style) {
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister::set_font_family: " << new_family << std::endl;
+#endif
+
+      std::pair<Glib::ustring, Glib::ustring> ui = new_font_family( new_family, check_style );
+      current_family = ui.first;
+      current_style = ui.second;
+      current_fontspec = canonize_fontspec( current_family + ", " + current_style );
+      current_fontspec_system = system_fontspec( current_fontspec );
+
+#ifdef DEBUG_FONT
+      std::cout << "   family_row:           :" << current_family_row << ":" << std::endl;
+      std::cout << "   canonized:            :" << current_fontspec << ":" << std::endl;
+      std::cout << "   system:               :" << current_fontspec_system << ":" << std::endl;
+      std::cout << "   family:               :" << current_family << ":" << std::endl;
+      std::cout << "   style:                :" << current_style << ":" << std::endl;
+      std::cout << "FontLister::set_font_family: end" << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+      return ui;
+    }
+ 
+
+    std::pair<Glib::ustring, Glib::ustring>
+    FontLister::set_font_family (int row, gboolean check_style) {
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister::set_font_family( row ): " << row << std::endl;
+#endif
+
+      current_family_row = row;
+      Gtk::TreePath path;
+      path.push_back( row );
+      Glib::ustring new_family = current_family;
+      Gtk::TreeModel::iterator iter = font_list_store->get_iter( path );
+      if( iter ) {
+	new_family = (*iter)[FontList.family];
+      }
+
+      std::pair<Glib::ustring, Glib::ustring> ui = set_font_family( new_family, check_style );
+
+#ifdef DEBUG_FONT
+      std::cout << "FontLister::set_font_family( row ): end" << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+      return ui;
+    }
+
+
+    // void
+    // FontLister::new_font_style (Glib::ustring new_style) {
+    //   // Is this needed? What do we do?
+    // }
+
+    void
+    FontLister::set_font_style (Glib::ustring new_style) {
+
+      // TODO: Validate input using Pango. If Pango doesn't recognize a style it will
+      // attach the "invalid" style to the font-family.
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister:set_font_style: " << new_style << std::endl;
+#endif
+
+      current_style = new_style;
+      current_fontspec = canonize_fontspec( current_family + ", " + current_style );
+      current_fontspec_system = system_fontspec( current_fontspec );
+
+#ifdef DEBUG_FONT
+      std::cout << "   canonized:            :" << current_fontspec << ":" << std::endl;
+      std::cout << "   system:               :" << current_fontspec_system << ":" << std::endl;
+      std::cout << "   family:                " << current_family << std::endl;
+      std::cout << "   style:                 " << current_style << std::endl;
+      std::cout << "FontLister::set_font_style: end" << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+    }
+
+    // For use by font-selector where we already know that the style is valid
+    void
+    FontLister::set_font (Glib::ustring new_family, Glib::ustring new_style) {
+
+#ifdef DEBUG_FONT
+      std::cout << "FonLister::set_font: " << new_family << " " << new_style << std::endl;
+#endif
+      set_font_family( new_family, false );
+      set_font_style( new_style );
+    }
+
+    // We do this ourselves as we can't rely on FontFactory.
+    void
+    FontLister::set_css( SPCSSAttr *css ) {
+
+      //std::cout << "FontLister:set_css: " << std::endl;
+
+      sp_repr_css_set_property (css, "-inkscape-font-specification", current_fontspec.c_str() );
+      sp_repr_css_set_property (css, "font-family", current_family.c_str() ); //Canonized w/ spaces
+
+      PangoFontDescription *desc = pango_font_description_from_string( current_fontspec.c_str() );
+      PangoWeight weight = pango_font_description_get_weight( desc );
+      switch ( weight ) {
+      case PANGO_WEIGHT_THIN:
+	sp_repr_css_set_property (css, "font-weight", "100" );
+	break;
+      case PANGO_WEIGHT_ULTRALIGHT:
+	sp_repr_css_set_property (css, "font-weight", "200" );
+	break;
+      case PANGO_WEIGHT_LIGHT:
+	sp_repr_css_set_property (css, "font-weight", "300" );
+	break;
+      case PANGO_WEIGHT_BOOK:
+	sp_repr_css_set_property (css, "font-weight", "380" );
+	break;
+      case PANGO_WEIGHT_NORMAL:
+	sp_repr_css_set_property (css, "font-weight", "normal" );
+	break;
+      case PANGO_WEIGHT_MEDIUM:
+	sp_repr_css_set_property (css, "font-weight", "500" );
+	break;
+      case PANGO_WEIGHT_SEMIBOLD:
+	sp_repr_css_set_property (css, "font-weight", "600" );
+	break;
+      case PANGO_WEIGHT_BOLD:
+	sp_repr_css_set_property (css, "font-weight", "bold" );
+	break;
+      case PANGO_WEIGHT_ULTRABOLD:
+	sp_repr_css_set_property (css, "font-weight", "800" );
+	break;
+      case PANGO_WEIGHT_HEAVY:
+	sp_repr_css_set_property (css, "font-weight", "900" );
+	break;
+      case PANGO_WEIGHT_ULTRAHEAVY:
+	sp_repr_css_set_property (css, "font-weight", "1000" );
+	break;
+      }
+
+      PangoStyle style = pango_font_description_get_style( desc );
+      switch ( style ) {
+      case PANGO_STYLE_NORMAL:
+	sp_repr_css_set_property (css, "font-style", "normal" );
+	break;
+      case PANGO_STYLE_OBLIQUE:
+	sp_repr_css_set_property (css, "font-style", "oblique" );
+	break;
+      case PANGO_STYLE_ITALIC:
+	sp_repr_css_set_property (css, "font-style", "italic" );
+	break;
+      }
+
+      PangoStretch stretch = pango_font_description_get_stretch( desc );
+      switch ( stretch ) {
+      case PANGO_STRETCH_ULTRA_CONDENSED:
+	sp_repr_css_set_property (css, "font-stretch", "ultra-condensed" );
+	break;
+      case PANGO_STRETCH_EXTRA_CONDENSED:
+	sp_repr_css_set_property (css, "font-stretch", "extra-condensed" );
+	break;
+      case PANGO_STRETCH_CONDENSED:
+	sp_repr_css_set_property (css, "font-stretch", "condensed" );
+	break;
+      case PANGO_STRETCH_SEMI_CONDENSED:
+	sp_repr_css_set_property (css, "font-stretch", "semi-condensed" );
+	break;
+      case PANGO_STRETCH_NORMAL:
+	sp_repr_css_set_property (css, "font-stretch", "normal" );
+	break;
+      case PANGO_STRETCH_SEMI_EXPANDED:
+	sp_repr_css_set_property (css, "font-stretch", "semi-expanded" );
+	break;
+      case PANGO_STRETCH_EXPANDED:
+	sp_repr_css_set_property (css, "font-stretch", "expanded" );
+	break;
+      case PANGO_STRETCH_EXTRA_EXPANDED:
+	sp_repr_css_set_property (css, "font-stretch", "extra-expanded" );
+	break;
+      case PANGO_STRETCH_ULTRA_EXPANDED:
+	sp_repr_css_set_property (css, "font-stretch", "ultra-expanded" );
+	break;
+      }
+	
+      PangoVariant variant = pango_font_description_get_variant( desc );
+      switch ( variant ) {
+      case PANGO_VARIANT_NORMAL:
+	sp_repr_css_set_property (css, "font-variant", "normal" );
+	break;
+      case PANGO_VARIANT_SMALL_CAPS:
+	sp_repr_css_set_property (css, "font-variant", "small-caps" );
+	break;
+      }
+    }
+
+    // We do this ourselves as we can't rely on FontFactory.
+    Glib::ustring
+    FontLister::fontspec_from_style (SPStyle* style) {
+
+      //std::cout << "FontLister:fontspec_from_style: " << std::endl;
+
+      Glib::ustring fontspec;
+      if (style) {
+
+	//  First try to use the font specification if it is set
+        if (style->text->font_specification.set
+            && style->text->font_specification.value
+            && *style->text->font_specification.value) {
+
+	  fontspec = style->text->font_specification.value;
+
+        } else {
+
+	  fontspec = style->text->font_family.value;
+	  fontspec += ",";
+
+	  switch (style->font_weight.computed) {
+
+	  case SP_CSS_FONT_WEIGHT_100:
+	    fontspec += " 100";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_200:
+		fontspec += " 200";
+		break;
+
+	  case SP_CSS_FONT_WEIGHT_300:
+	    fontspec += " 300";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_400:
+	  case SP_CSS_FONT_WEIGHT_NORMAL:
+	    //fontspec += " normal";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_500:
+	    fontspec += " 500";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_600:
+	    fontspec += " 600";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_700:
+	  case SP_CSS_FONT_WEIGHT_BOLD:
+	    fontspec += " bold";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_800:
+	    fontspec += " 800";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_900:
+	    fontspec += " 900";
+	    break;
+
+	  case SP_CSS_FONT_WEIGHT_LIGHTER:
+	  case SP_CSS_FONT_WEIGHT_BOLDER:
+	  default:
+	    g_warning("Unrecognized font_weight.computed value");
+	    break;
+	  }
+
+	  switch (style->font_style.computed) {
+	  case SP_CSS_FONT_STYLE_ITALIC:
+	    fontspec += " italic";
+	    break;
+
+	  case SP_CSS_FONT_STYLE_OBLIQUE:
+	    fontspec += " oblique";
+	    break;
+
+	  case SP_CSS_FONT_STYLE_NORMAL:
+	  default:
+	    //fontspec += " normal";
+	    break;
+	  }
+
+	  switch (style->font_stretch.computed) {
+
+	  case SP_CSS_FONT_STRETCH_ULTRA_CONDENSED:
+	    fontspec += " extra_condensed";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_EXTRA_CONDENSED:
+	    fontspec += " extra_condensed";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_CONDENSED:
+	  case SP_CSS_FONT_STRETCH_NARROWER:
+	    fontspec += " condensed";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_SEMI_CONDENSED:
+	    fontspec += " semi_condensed";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_NORMAL:
+	    //fontspec += " normal";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_SEMI_EXPANDED:
+	    fontspec += " semi_expanded";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_EXPANDED:
+	  case SP_CSS_FONT_STRETCH_WIDER:
+	    fontspec += " expanded";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_EXTRA_EXPANDED:
+	    fontspec += " extra_expanded";
+	    break;
+
+	  case SP_CSS_FONT_STRETCH_ULTRA_EXPANDED:
+	    fontspec += " ultra_expanded";
+	    break;
+
+	  default:
+	    //fontspec += " normal";
+	    break;
+	  }
+
+	  switch (style->font_variant.computed) {
+
+	  case SP_CSS_FONT_VARIANT_SMALL_CAPS:
+	    fontspec += "small-caps";
+	    break;
+
+	  default:
+	    //fontspec += "normal";
+	    break;
+	  }
+	}
+      }
+      return canonize_fontspec( fontspec );
+    }
+
+
+    Gtk::TreeModel::Row
     FontLister::get_row_for_font (Glib::ustring family)
     {
       Gtk::TreePath path;
@@ -201,8 +821,8 @@ namespace Inkscape
 
 	Gtk::TreeModel::Row row = *iter;
 
-	if( family.compare( row[FontList.font] ) == 0 ) {
-	  return font_list_store->get_path( iter );
+	if( family.compare( row[FontList.family] ) == 0 ) {
+	  return row;
 	}
 
 	++iter;
@@ -211,6 +831,65 @@ namespace Inkscape
       throw FAMILY_NOT_FOUND;
     }
 
+    Gtk::TreePath
+    FontLister::get_path_for_font (Glib::ustring family)
+    {
+      return font_list_store->get_path( get_row_for_font ( family ) );
+    }
+
+    /* Returns style string */
+    // TODO: Remove or turn into function to be used by new_font_family.
+    Glib::ustring
+    FontLister::get_best_style_match (Glib::ustring family, Glib::ustring target_style) {
+
+#ifdef DEBUG_FONT
+      std::cout << "\n!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" << std::endl;
+      std::cout << "FontLister::get_best_style_match: " << family << " : " << target_style << std::endl;
+#endif
+
+      Glib::ustring font_string = family + " " + target_style;
+
+      Gtk::TreeModel::Row row;
+      try {
+	row = get_row_for_font( family );
+      } catch (...) {
+	//std::cout << "  ERROR: can't find family: " << family << std::endl;
+	return (target_style);
+      }
+
+      PangoFontDescription* target = pango_font_description_from_string( font_string.c_str() );
+      PangoFontDescription* best = NULL;
+
+      //std::cout << "  Target: " << pango_font_description_to_string( target ) << std::endl;
+
+      GList* styles = row[FontList.styles];
+      for (GList *l=styles; l; l = l->next) {
+	Glib::ustring font_string_test = family + " " + (char*)l->data;
+	PangoFontDescription* candidate = pango_font_description_from_string( font_string_test.c_str() );
+	// std::cout << "  Testing: " << pango_font_description_to_string( candidate ) << std::endl;
+	if( pango_font_description_better_match( target, best, candidate ) ) {
+	    best = candidate;
+	}
+      }
+
+      Glib::ustring best_style;
+      if( best ) {
+	//std::cout << "  Best:   " << pango_font_description_to_string( best ) << std::endl;
+	pango_font_description_unset_fields( best, PANGO_FONT_MASK_FAMILY );
+	best_style = pango_font_description_to_string( best );
+      } else {
+	//std::cout << "  Failed: " << family << std::endl;
+	best_style =  target_style;
+      }
+
+#ifdef DEBUG_FONT
+      std::cout << "  Returning: " << best_style << std::endl;
+      std::cout << "FontLister::get_best_style_match: exit" << std::endl;
+      std::cout << "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n" << std::endl;
+#endif
+      return best_style;
+    }
+
     FontLister::~FontLister ()
     {
     };
@@ -220,6 +899,18 @@ namespace Inkscape
     {
         return font_list_store;
     }
+
+    const Glib::RefPtr<Gtk::ListStore>
+    FontLister::get_style_list () const
+    {
+        return style_list_store;
+    }
+
+    const Glib::RefPtr<Gtk::ListStore>
+    FontLister::get_style_list_trial () const
+    {
+        return style_list_store_trial;
+    }
 }
 
 // Helper functions
diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h
index 751350407..aaa996247 100644
--- a/src/libnrtype/font-lister.h
+++ b/src/libnrtype/font-lister.h
@@ -25,12 +25,35 @@
 
 class SPObject;
 class SPDocument;
+class SPCSSAttr;
+struct SPStyle;
 
 namespace Inkscape
 {
                 /**
                  *  This class enumerates fonts using libnrtype into reusable data stores and
-                 *  allows for random access to the font list
+                 *  allows for random access to the font-family list and the font-style list.
+                 *  Setting the font-family updates the font-style list. "Style" in this case
+                 *  refers to everything but family and size (e.g. italic/oblique, weight).
+                 *
+                 *  This class handles font-family lists and fonts that are not on the system,
+                 *  where there is not an entry in the fontInstanceMap.
+                 *
+                 *  This class uses the idea of "font_spec". This is a plain text string as used by
+                 *  Pango. It is similar to the CSS font shorthand except that font-family comes
+                 *  first and in this class the font-size is not used.
+                 *
+                 *  This class uses the FontFactory class to get a list of system fonts
+                 *  and to find best matches via Pango. The Pango interface is only setup
+                 *  to deal with fonts that are on the system so care must be taken. For
+                 *  example, best matches should only be done with the first font-family
+                 *  in a font-family list. If the first font-family is not on the system
+                 *  then a generic font-family should be used (sans-serif -> Sans).
+                 *
+                 *  This class is used by the UI interface (text-toolbar, font-select, etc.).
+                 *
+                 *  "Font" includes family and style. It should not be used when one
+                 *  means font-family.
                  */
                 class FontLister
                 {
@@ -38,13 +61,14 @@ namespace Inkscape
 
                         enum Exceptions
                         {
-                            FAMILY_NOT_FOUND
+                            FAMILY_NOT_FOUND,
+                            STYLE_NOT_FOUND
                         };
 
 
                         virtual ~FontLister ();
 
-                        /** GtkTreeModelColumnRecord for the font list Gtk::ListStore
+                        /** GtkTreeModelColumnRecord for the font-family list Gtk::ListStore
                          */
                         class FontListClass
                             : public Gtk::TreeModelColumnRecord
@@ -52,10 +76,9 @@ namespace Inkscape
                             public:
                                 /** Column containing the family name
                                  */
-                                Gtk::TreeModelColumn<Glib::ustring> font; 
+                                Gtk::TreeModelColumn<Glib::ustring> family; 
 
-                                /** Column containing an std::vector<std::string> with style names
-                                 * for the corresponding family 
+                                /** Column containing the styles for each family name.
                                  */
                                 Gtk::TreeModelColumn<GList*> styles;
 
@@ -65,7 +88,7 @@ namespace Inkscape
 
                                 FontListClass ()
                                 {
-                                    add (font);
+                                    add (family);
                                     add (styles);
                                     add (onSystem);
                                 }
@@ -73,7 +96,24 @@ namespace Inkscape
 
                         FontListClass FontList;
 
-                        /** Returns the ListStore with the font names
+                        class FontStyleListClass
+                            : public Gtk::TreeModelColumnRecord
+                        {
+                            public:
+                                /** Column containing the styles
+                                 */
+                                Gtk::TreeModelColumn<Glib::ustring> styles; 
+
+                                FontStyleListClass ()
+                                {
+                                    add (styles);
+                                }
+                        };
+
+                        FontStyleListClass FontStyleList;
+                        FontStyleListClass FontStyleListTrial;
+
+                        /** Returns the ListStore with the family names
                          *
                          * The return is const and the function is declared as const.
                          * The ListStore is ready to be used after class instantiation
@@ -82,6 +122,18 @@ namespace Inkscape
                         const Glib::RefPtr<Gtk::ListStore>
                         get_font_list () const;
 
+                        /** Returns the ListStore with the styles
+                         *
+                         */
+                        const Glib::RefPtr<Gtk::ListStore>
+                        get_style_list () const;
+
+                        /** Returns the ListStore with the styles - trial
+                         *
+                         */
+                        const Glib::RefPtr<Gtk::ListStore>
+                        get_style_list_trial () const;
+
                         /** Updates font list to include fonts in document
                          *
                          */
@@ -96,13 +148,136 @@ namespace Inkscape
                         static Inkscape::FontLister*
                         get_instance ()
                         {
-                            static Inkscape::FontLister* instance = new Inkscape::FontLister();
+                            static Inkscape::FontLister* instance = new Inkscape::FontLister(); 
                             return instance;
                         }
 
-                        Gtk::TreePath
+                        /** Takes a hand written font spec and returns a Pango generated one in
+                         *  standard form.
+                         */
+                        Glib::ustring canonize_fontspec( Glib::ustring fontspec );
+
+                        /** Find closest system font to given font.
+                         */
+                        Glib::ustring system_fontspec( Glib::ustring fontspec );
+
+                        /** Gets font-family and style from fontspec.
+                         *  font-family and style returned.
+                         */
+                        std::pair<Glib::ustring, Glib::ustring>
+                        ui_from_fontspec (Glib::ustring fontspec);
+
+                        /** Sets font-family and style after a selection change.
+                         *  New font-family and style returned.
+                         */
+                        std::pair<Glib::ustring, Glib::ustring>
+                        selection_update ();
+
+                        /** Changes font-family, updating style list and attempting to find
+                         *  closest style to current_style style (if check_style is true).
+                         *  New font-family and style returned.
+                         *  Does NOT update current_family and current_style.
+                         *  (For potential use in font-selector which doesn't update until
+                         *  "Apply" button clicked.)
+                         */
+                        std::pair<Glib::ustring, Glib::ustring>
+                        new_font_family (Glib::ustring family, gboolean check_style = true);
+
+                        /** Sets font-family, updating style list and attempting
+                         *  to find closest style to old current_style.
+                         *  New font-family and style returned.
+                         *  Updates current_family and current_style.
+                         *  Calls new_font_family().
+                         *  (For use in text-toolbar where update is immediate.)
+                         */
+                        std::pair<Glib::ustring, Glib::ustring>
+                        set_font_family (Glib::ustring family, gboolean check_style = true);
+
+                        /** Sets font-family from row in list store.
+                         *  The row can be used to determine if we are in the
+                         *  document or system part of the font-family list.
+                         *  This is needed to handle scrolling through the
+                         *  font-family list correctly.
+                         *  Calls set_font_family().
+                         */
+                        std::pair<Glib::ustring, Glib::ustring>
+                        set_font_family (int row, gboolean check_style = true);
+
+                        Glib::ustring
+                        get_font_family ()
+                        {
+                            return current_family;
+                        }
+
+                        int
+                        get_font_family_row ()
+                        {
+                            return current_family_row;
+                        }
+
+                        /* Not Used */
+                        void
+                        new_font_style (Glib::ustring style);
+
+                        /** Sets style. Does not validate style for family.
+                         */
+                        void
+                        set_font_style (Glib::ustring style);
+
+                        Glib::ustring
+                        get_font_style ()
+                        {
+                            return current_style;
+                        }
+
+                        /** Sets both family and style. Does not attempt to find
+                         *  best match for style (assume that style is already valid
+                         *  for family).
+                         */
+                        void
+                        set_font (Glib::ustring family, Glib::ustring style);
+
+                        /** Sets both family and style. Does not attempt to find
+                         *  best match for style (assume that style is already valid
+                         *  for family).
+                         */
+                        void
+                        new_font (Glib::ustring family, Glib::ustring style);
+
+                        std::pair<Glib::ustring, Glib::ustring>
+                        get_try_font () {
+                            return ( std::make_pair( try_family, try_style ) );
+                        }
+
+                        Glib::ustring
+                        fontspec_from_style (SPStyle* style); 
+
+                        /** Fill css using current_fontspec.
+                         */
+                        void
+                        set_css( SPCSSAttr *css );
+
+                        Gtk::TreeModel::Row
                         get_row_for_font (Glib::ustring family);
 
+                        Gtk::TreePath
+                        get_path_for_font (Glib::ustring family);
+
+                        Gtk::TreeModel::Row
+                        get_row_for_style (Glib::ustring style);
+
+                        Gtk::TreePath
+                        get_path_for_style (Glib::ustring style);
+
+                        std::pair<Gtk::TreePath, Gtk::TreePath>
+                        get_paths (Glib::ustring family, Glib::ustring style);
+
+                        /** Return best style match for new font given style for old font.
+                         */
+                        Glib::ustring
+                        get_best_style_match (Glib::ustring family, Glib::ustring style);
+
+                        /* Not Used */
                         const NRNameList
                         get_name_list () const
                         {
@@ -116,7 +291,31 @@ namespace Inkscape
                         NRNameList families;
 
                         Glib::RefPtr<Gtk::ListStore> font_list_store;
+                        Glib::RefPtr<Gtk::ListStore> style_list_store;
+                        Glib::RefPtr<Gtk::ListStore> style_list_store_trial;
 
+                        /** Info for currently selected font (what is shown in the UI).
+                         *  May include font-family lists and fonts not on system.
+                         */
+                        int current_family_row;
+                        Glib::ustring current_family;
+                        Glib::ustring current_style;
+                        Glib::ustring current_fontspec;
+
+                        /** fontspec of system font closest to current_fontspec.
+                         *  (What the system will use to display current_fontspec.)
+                         */
+                        Glib::ustring current_fontspec_system;
+
+                        /** Info for proposed font (what is shown in the font-selection UI).
+                         *  May include font-family lists and fonts not on system.
+                         */
+                        Glib::ustring try_family;
+                        Glib::ustring try_style;
+
+                        /** If a font-family is not on system, this list of styles is used.
+                         */
+                        GList *default_styles;
                 };
 }
 
@@ -125,7 +324,7 @@ namespace Inkscape
 static gboolean font_lister_separator_func(GtkTreeModel *model, GtkTreeIter *iter, gpointer /*data*/)
 {
   gchar* text = 0;
-  gtk_tree_model_get(model, iter, 0, &text, -1 ); // Column 0: FontList.font
+  gtk_tree_model_get(model, iter, 0, &text, -1 ); // Column 0: FontList.family
   return (text && strcmp(text,"#") == 0);
 }
 
diff --git a/src/livarot/PathCutting.cpp b/src/livarot/PathCutting.cpp
index 9e6226ccc..848d8daa8 100644
--- a/src/livarot/PathCutting.cpp
+++ b/src/livarot/PathCutting.cpp
@@ -1126,6 +1126,8 @@ void Path::ConvertPositionsToForced(int nbPos, cut_position *poss)
       }
     }
   }
+  if (descr_cmd[0]->getType() == descr_moveto)
+    descr_flags |= descr_doing_subpath;         // see LP Bug 166302
 
   qsort(poss, nbPos, sizeof(cut_position), CmpPosition);
 
diff --git a/src/live_effects/lpe-bspline.cpp b/src/live_effects/lpe-bspline.cpp
index d046ad683..ed4791155 100644
--- a/src/live_effects/lpe-bspline.cpp
+++ b/src/live_effects/lpe-bspline.cpp
@@ -52,12 +52,6 @@ LPEBSpline::doEffect(SPCurve * curve)
         //los puntos clave para los manejadores. 
         //Esto hace que la curva BSpline no pierda su condición aunque se trasladen
         //dichos manejadores
-        SPCurve * in = new SPCurve();
-        in->moveto(curve_it1->initialPoint());
-        in->lineto(curve_it1->finalPoint());
-        SPCurve * out = new SPCurve();
-        out->moveto(curve_it2->initialPoint());
-        out->lineto(curve_it2->finalPoint());
         SPCurve *nCurve = new SPCurve();
         Geom::Point startNode(0,0);
         Geom::Point previousNode(0,0);
@@ -67,6 +61,9 @@ LPEBSpline::doEffect(SPCurve * curve)
         Geom::Point nextPointAt1(0,0);
         Geom::Point nextPointAt2(0,0);
         Geom::Point nextPointAt3(0,0);
+        Geom::D2< Geom::SBasis > SBasisIn;
+        Geom::D2< Geom::SBasis > SBasisOut;
+        Geom::D2< Geom::SBasis > SBasisHelper;
         Geom::CubicBezier const *cubic = NULL;
         //Si la curva está cerrada calculamos el punto donde
         //deveria estar el nodo BSpline de cierre/inicio de la curva
@@ -78,13 +75,12 @@ LPEBSpline::doEffect(SPCurve * curve)
             if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
                 curve_endit = path_it->end_open();
             }
-            SPCurve * end = new SPCurve();
-            end->moveto(curve_endit->initialPoint());
-            end->lineto(curve_endit->finalPoint());
-            Geom::D2< Geom::SBasis > SBasisIn = in->first_segment()->toSBasis();
-            Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
-            end->reset();
-            delete end;
+
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
+            SBasisIn = in->first_segment()->toSBasis();
+
             SPCurve *lineHelper = new SPCurve();
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
             if(cubic){
@@ -92,13 +88,23 @@ LPEBSpline::doEffect(SPCurve * curve)
             }else{
                 lineHelper->moveto(in->first_segment()->initialPoint());
             }
+            in->reset();
+            delete in;
+
+            SPCurve * end = new SPCurve();
+            end->moveto(curve_endit->initialPoint());
+            end->lineto(curve_endit->finalPoint());
+            Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
+            //Geom::BezierCurve const *bezier = dynamic_cast<Geom::BezierCurve const*>(&*curve_endit);
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_endit);
             if(cubic){
                 lineHelper->lineto(SBasisEnd.valueAt(Geom::nearest_point((*cubic)[2],*end->first_segment())));
             }else{
                 lineHelper->lineto(end->first_segment()->finalPoint());
             }
-            Geom::D2< Geom::SBasis > SBasisHelper = lineHelper->first_segment()->toSBasis();
+            end->reset();
+            delete end;
+            SBasisHelper = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
             //Guardamos el principio de la curva
@@ -107,7 +113,12 @@ LPEBSpline::doEffect(SPCurve * curve)
             node = startNode;
         }else{
             //Guardamos el principio de la curva
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
             startNode = in->first_segment()->initialPoint();
+            in->reset();
+            delete in;
             //Definimos el punto de inicio original de la curva resultante
             node = startNode;
         }
@@ -116,20 +127,28 @@ LPEBSpline::doEffect(SPCurve * curve)
         {
             //previousPointAt3 = pointAt3;
             //Calculamos los puntos que dividirían en tres segmentos iguales el path recto de entrada y de salida
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
             if(cubic){
-                Geom::D2< Geom::SBasis > SBasisIn = in->first_segment()->toSBasis();
+                SBasisIn = in->first_segment()->toSBasis();
                 pointAt1 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[1],*in->first_segment()));
                 pointAt2 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[2],*in->first_segment()));
             }else{
                 pointAt1 = in->first_segment()->initialPoint();
                 pointAt2 = in->first_segment()->finalPoint();
             }
+            in->reset();
+            delete in;
             //Y hacemos lo propio con el path de salida
             //nextPointAt0 = curveOut.valueAt(0);
+            SPCurve * out = new SPCurve();
+            out->moveto(curve_it2->initialPoint());
+            out->lineto(curve_it2->finalPoint());
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it2);
             if(cubic){
-                Geom::D2< Geom::SBasis > SBasisOut = out->first_segment()->toSBasis();
+                SBasisOut = out->first_segment()->toSBasis();
                 nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1],*out->first_segment()));
                 nextPointAt2 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[2],*out->first_segment()));;
                 nextPointAt3 = (*cubic)[3];
@@ -138,6 +157,8 @@ LPEBSpline::doEffect(SPCurve * curve)
                 nextPointAt2 = out->first_segment()->finalPoint();
                 nextPointAt3 = out->first_segment()->finalPoint();
             }
+            out->reset();
+            delete out;
             //La curva BSpline se forma calculando el centro del segmanto de unión
             //de el punto situado en las 2/3 partes de el segmento de entrada
             //con el punto situado en la posición 1/3 del segmento de salida
@@ -146,7 +167,7 @@ LPEBSpline::doEffect(SPCurve * curve)
             SPCurve *lineHelper = new SPCurve();
             lineHelper->moveto(pointAt2);
             lineHelper->lineto(nextPointAt1);
-            Geom::D2< Geom::SBasis > SBasisHelper  = lineHelper->first_segment()->toSBasis();
+            SBasisHelper  = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
             //almacenamos el punto del anterior bucle -o el de cierre- que nos hara de principio de curva
@@ -163,18 +184,6 @@ LPEBSpline::doEffect(SPCurve * curve)
             //aumentamos los valores para el siguiente paso en el bucle
             ++curve_it1;
             ++curve_it2;
-            in->reset();
-            delete in;
-            SPCurve * in = new SPCurve();
-            in->moveto(curve_it1->initialPoint());
-            in->lineto(curve_it1->finalPoint());
-            out->reset();
-            delete out;
-            if(curve_it1 != curve_endit){
-                SPCurve * out = new SPCurve();
-                out->moveto(curve_it2->initialPoint());
-                out->lineto(curve_it2->finalPoint());
-            }
         }
         //Aberiguamos la ultima parte de la curva correspondiente al último segmento
         SPCurve *curveHelper = new SPCurve();
@@ -197,11 +206,6 @@ LPEBSpline::doEffect(SPCurve * curve)
         curve->append(nCurve,false);
         nCurve->reset();
         delete nCurve;
-        //Limpiamos
-        in->reset();
-        out->reset();
-        delete in;
-        delete out;
     }
 }
 
diff --git a/src/pen-context.cpp b/src/pen-context.cpp
index a505f8de7..0af9570c1 100644
--- a/src/pen-context.cpp
+++ b/src/pen-context.cpp
@@ -96,10 +96,15 @@ static void sp_pen_context_set_mode(SPPenContext *const pc, guint mode);
 //Esta función cambia los colores rojo,verde y azul haciendolos transparentes o no en función de si se usa spiro
 static void spiro_color(SPPenContext *const pc);
 //Guarda el valor si se ha pulsado la tecla SHIFT al continuar una curva
-static bool saShift = false;
-
-//Preparamos la curva roja para que se muestre según esté pulsada la tecla SHIFT
-static void spiro(SPPenContext *const pc, bool Shift);
+static void spiro(SPPenContext *const pc,bool shift);
+static void spiroOn(SPPenContext *const pc);
+static void spiroOff(SPPenContext *const pc);
+static void spiroStartAnchor(SPPenContext *const pc,bool shift);
+static void spiroStartAnchorOn(SPPenContext *const pc);
+static void spiroStartAnchorOff(SPPenContext *const pc);
+static void spiroMotion(SPPenContext *const pc,bool shift);
+static void spiroEndAnchorOn(SPPenContext *const pc);
+static void spiroEndAnchorOff(SPPenContext *const pc);
 //Unimos todas las curvas en juego y llamamos a la función doEffect.
 static void spiro_build(SPPenContext *const pc);
 //function spiro cloned from lpe-spiro.cpp
@@ -541,7 +546,7 @@ static gint pen_handle_button_press(SPPenContext *const pc, GdkEventButton const
                             //BSpline
                             if(anchor){
                                 if(pc->spiro){
-                                    spiro(pc,(bevent.state & GDK_SHIFT_MASK));
+                                    spiroStartAnchor(pc,(bevent.state & GDK_SHIFT_MASK));
                                 }
                                 if(pc->bspline){
                                     bsplineStartAnchor(pc,(bevent.state & GDK_SHIFT_MASK));
@@ -794,7 +799,7 @@ static gint pen_handle_motion_notify(SPPenContext *const pc, GdkEventMotion cons
     //BSpline
     if ( Geom::LInfty( event_w - pen_drag_origin_w ) > tolerance || mevent.time == 0) {
         if(pc->spiro){
-            spiro(pc,(mevent.state & GDK_SHIFT_MASK));
+            spiroMotion(pc,(mevent.state & GDK_SHIFT_MASK));
         }
         if(pc->bspline){
             bsplineMotion(pc,(mevent.state & GDK_SHIFT_MASK));
@@ -848,7 +853,7 @@ static gint pen_handle_button_release(SPPenContext *const pc, GdkEventButton con
                             //BSpline
                             if (anchor) {
                                 if(pc->spiro){
-                                    spiro(pc,(revent.state & GDK_SHIFT_MASK));
+                                    spiroStartAnchor(pc,(revent.state & GDK_SHIFT_MASK));
                                 }
                                 if(pc->bspline){
                                     bsplineStartAnchor(pc,(revent.state & GDK_SHIFT_MASK));
@@ -1546,84 +1551,259 @@ static void spiro_color(SPPenContext *const pc)
 }
 
 
-//Preparamos la curva roja para que se muestre según esté pulsada la tecla SHIFT
-static void spiro(SPPenContext *const pc, bool Shift)
+//Unimos todas las curvas en juego y llamamos a la función doEffect.
+
+static void spiro(SPPenContext *const pc, bool shift)
 {
-    if(Shift){
-        if(!pc->red_curve->is_empty()){
-            //Creamos un nodo CUSP
-            pc->npoints = 5;
-            pc->p[2] = pc->p[3];
-        }
-        //Continuamos la curva en modo CUSP
-        //Guardamos el valor de inicio en cusp para que no se redibuje como SYMM
-        if(pc->anchor_statusbar && pc->red_curve->is_empty()){
-            saShift = true;
-        }
-    }else{
-        //Symm nodo
+    if(!pc->anchor_statusbar)
+        shift?spiroOff(pc):spiroOn(pc);
+
+    spiro_build(pc);
+}
+
+static void spiroOn(SPPenContext *const pc){
+    if(!pc->red_curve->is_empty()){
         using Geom::X;
         using Geom::Y;
-        Geom::CubicBezier const * cubic;
-        if(pc->anchor_statusbar && pc->red_curve->is_empty()){
-            saShift = false;
-        }
-        if(!pc->red_curve->is_empty()){
-            //Damos valores a los puntos de la curva roja para que generen un nodo SYMM
-            pc->npoints = 5;
-            //Les damos valor
-            pc->p[3] = pc->red_curve->first_segment()->finalPoint(); 
-            pc->p[0] = pc->red_curve->first_segment()->initialPoint();        
-            pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
-            pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
-            pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1);
-            pc->p[2] = Geom::Point(pc->p[2][X]+1,pc->p[2][Y]+1);
-            pc->p[4] = pc->p[3] + (Geom::Point)( pc->p[3] - pc->p[2] );
+        pc->npoints = 5;
+        pc->p[0] = pc->red_curve->first_segment()->initialPoint();
+        pc->p[3] = pc->red_curve->first_segment()->finalPoint();
+        pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+        pc->p[2] = Geom::Point(pc->p[2][X] + 0.0625,pc->p[2][Y] + 0.0625);
+    }
+}
+
+static void spiroOff(SPPenContext *const pc)
+{
+    if(!pc->red_curve->is_empty()){
+        pc->npoints = 5;
+        pc->p[0] = pc->red_curve->first_segment()->initialPoint();
+        pc->p[3] = pc->red_curve->first_segment()->finalPoint();
+        pc->p[2] = pc->p[3];
+    }
+}
+
+static void spiroStartAnchor(SPPenContext *const pc, bool shift)
+{
+    if(pc->sa->curve->is_empty())
+        return;
+
+    if(shift)
+        bsplineStartAnchorOff(pc);
+    else
+        bsplineStartAnchorOn(pc);
+}
+
+static void spiroStartAnchorOn(SPPenContext *const pc)
+{
+    using Geom::X;
+    using Geom::Y;
+    SPCurve *tmpCurve = new SPCurve();
+    tmpCurve = pc->sa->curve->copy();
+    if(pc->sa->start)
+        tmpCurve = tmpCurve->create_reverse();
+    Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+    SPCurve *lastSeg = new SPCurve();
+    Geom::Point A = tmpCurve->last_segment()->initialPoint();
+    Geom::Point D = tmpCurve->last_segment()->finalPoint();
+    Geom::Point C = D + (1./3)*(A - D);
+    C = Geom::Point(C[X] + 0.0625,C[Y] + 0.0625);
+    if(cubic){
+        lastSeg->moveto(A);
+        lastSeg->curveto((*cubic)[1],C,D);
+    }else{
+        lastSeg->moveto(A);
+        lastSeg->curveto(A,C,D);
+    }
+    if( tmpCurve->get_segment_count() == 1){
+        tmpCurve = lastSeg;
+    }else{
+        //we eliminate the last segment
+        tmpCurve->backspace();
+        //and we add it again with the recreation
+        tmpCurve->append_continuous(lastSeg, 0.0625);
+    }
+    if (pc->sa->start) {
+        tmpCurve = tmpCurve->create_reverse();
+    }
+    pc->sa->curve->reset();
+    pc->sa->curve = tmpCurve;
+}
+
+static void spiroStartAnchorOff(SPPenContext *const pc)
+{
+    SPCurve *tmpCurve = new SPCurve();
+    tmpCurve = pc->sa->curve->copy();
+    if(pc->sa->start)
+        tmpCurve = tmpCurve->create_reverse();
+    Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+    if(cubic){
+        SPCurve *lastSeg = new SPCurve();
+        lastSeg->moveto((*cubic)[0]);
+        lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
+        if( tmpCurve->get_segment_count() == 1){
+            tmpCurve = lastSeg;
+        }else{
+            //we eliminate the last segment
+            tmpCurve->backspace();
+            //and we add it again with the recreation
+            tmpCurve->append_continuous(lastSeg, 0.0625);
+        }
+        if (pc->sa->start) {
+            tmpCurve = tmpCurve->create_reverse();
         }
+        pc->sa->curve->reset();
+        pc->sa->curve = tmpCurve;
+    }
 
-        //Continuamos la curva en modo SPIRO
-        if( saShift == false && pc->sa && !pc->sa->curve->is_empty() && !pc->ea && pc->green_curve->is_empty()){
-            cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->last_segment());
-            if (pc->sa->start) {
-                cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->create_reverse()->last_segment() );
-            }
-            if(cubic){
-                pc->p[1] = (pc->p[0] - (*cubic)[2]) + pc->p[0];
-            }
+}
+
+static void spiroMotion(SPPenContext *const pc, bool shift){
+    using Geom::X;
+    using Geom::Y;
+    SPCurve *tmpCurve = new SPCurve();
+    if(shift)
+        pc->p[2] = pc->p[3];
+    else
+        pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+        pc->p[2] = Geom::Point(pc->p[2][X] + 0.0625,pc->p[2][Y] + 0.0625);
+
+    if(pc->green_curve->is_empty() && !pc->sa){
+        pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
+    }else if(!pc->green_curve->is_empty()){
+        tmpCurve = pc->green_curve->copy();
+    }else{
+        tmpCurve = pc->sa->curve->copy();
+        if(pc->sa->start)
+            tmpCurve = tmpCurve->create_reverse();
+    }
+    if(!tmpCurve->is_empty() && !pc->red_curve->is_empty()){
+        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+        if(cubic){
+            pc->p[1] =  (*cubic)[3] + (Geom::Point)((*cubic)[3] - (*cubic)[2] );
+        }else{
+            pc->p[1] = pc->p[0];
         }
+    }
 
-        //Nos aseguramos que el primer nodo sea SYMM con el ultimo segmento de la curva verde
-        if(!pc->green_curve->is_empty()){
-            cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->last_segment());
-            if(cubic && (*cubic)[2] != (*cubic)[3]){
-                pc->p[1] = (pc->p[0] - (*cubic)[2]) + pc->p[0];
-            }
-            //Damos valor original a la variable por si se necesita de nuevo
-            saShift = false;
+    if(pc->anchor_statusbar && !pc->red_curve->is_empty()){
+        if(shift)
+            bsplineEndAnchorOff(pc);
+        else
+            bsplineEndAnchorOn(pc);
+    }
+
+    spiro_build(pc);
+}
+
+static void spiroEndAnchorOn(SPPenContext *const pc)
+{
+    using Geom::X;
+    using Geom::Y;
+    pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
+    pc->p[2] = Geom::Point(pc->p[2][X] + 0.0625,pc->p[2][Y] + 0.0625);
+    SPCurve *tmpCurve = new SPCurve();
+    SPCurve *lastSeg = new SPCurve();
+    Geom::Point C(0,0);
+    if(!pc->sa || pc->sa->curve->is_empty()){
+        tmpCurve = pc->green_curve->create_reverse();
+        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+        C = tmpCurve->last_segment()->finalPoint() + + (Geom::Point)(tmpCurve->last_segment()->finalPoint() - pc->p[2]);
+        if(cubic){
+            lastSeg->moveto((*cubic)[0]);
+            lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
+        }else{
+            lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
+            lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
         }
+        if( tmpCurve->get_segment_count() == 1){
+            tmpCurve = lastSeg;
+        }else{
+            //we eliminate the last segment
+            tmpCurve->backspace();
+            //and we add it again with the recreation
+            tmpCurve->append_continuous(lastSeg, 0.0625);
+        }
+        tmpCurve = tmpCurve->create_reverse();
+        pc->green_curve->reset();
+        pc->green_curve = tmpCurve;
+    }else{
+        tmpCurve = pc->sa->curve->copy();
+        if(!pc->sa->start)
+            tmpCurve = tmpCurve->create_reverse();
+        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+        C = tmpCurve->last_segment()->finalPoint() + + (Geom::Point)(tmpCurve->last_segment()->finalPoint() - pc->p[2]);
+        if(cubic){
+            lastSeg->moveto((*cubic)[0]);
+            lastSeg->curveto((*cubic)[1],C,(*cubic)[3]);
+        }else{
+            lastSeg->moveto(tmpCurve->last_segment()->initialPoint());
+            lastSeg->curveto(tmpCurve->last_segment()->initialPoint(),C,tmpCurve->last_segment()->finalPoint());
+        }
+        if( tmpCurve->get_segment_count() == 1){
+            tmpCurve = lastSeg;
+        }else{
+            //we eliminate the last segment
+            tmpCurve->backspace();
+            //and we add it again with the recreation
+            tmpCurve->append_continuous(lastSeg, 0.0625);
+        }
+        if (!pc->sa->start) {
+            tmpCurve = tmpCurve->create_reverse();
+        }
+        pc->sa->curve->reset();
+        pc->sa->curve = tmpCurve;
+    }
+}
 
-        //Si cerramos sobre otra curva ponemos simetrico a esta el manejador del punto de cierre
-        if(pc->anchor_statusbar && pc->sa && !Geom::are_near(pc->sa->dp, pc->red_curve->first_segment()->finalPoint())){
-            cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->last_segment() );
-            if (!pc->sa->start) {
-                cubic = dynamic_cast<Geom::CubicBezier const *>( pc->sa->curve->create_reverse()->last_segment() );
-            }
-            if(cubic){
-                pc->p[2] = (pc->p[3]-(*cubic)[2]) + pc->p[3];
+static void spiroEndAnchorOff(SPPenContext *const pc)
+{
+    pc->p[2] = pc->p[3];
+    SPCurve *tmpCurve = new SPCurve();
+    SPCurve *lastSeg = new SPCurve();
+    if(!pc->sa || pc->sa->curve->is_empty()){
+        tmpCurve = pc->green_curve->create_reverse();
+        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+        if(cubic){
+            lastSeg->moveto((*cubic)[0]);
+            lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
+            if( tmpCurve->get_segment_count() == 1){
+                tmpCurve = lastSeg;
+            }else{
+                //we eliminate the last segment
+                tmpCurve->backspace();
+                //and we add it again with the recreation
+                tmpCurve->append_continuous(lastSeg, 0.0625);
             }
+            tmpCurve = tmpCurve->create_reverse();
+            pc->green_curve->reset();
+            pc->green_curve = tmpCurve;
         }
-        //Lo mismpo pero cerrando sobre la curva inicial
-        if(pc->anchor_statusbar && pc->green_anchor && pc->green_anchor->active){
-            cubic = dynamic_cast<Geom::CubicBezier const *>( pc->green_curve->first_segment() );
-            if(cubic){
-                pc->p[2] = (pc->p[3]-(*cubic)[1]) + pc->p[3];
+    }else{
+        tmpCurve = pc->sa->curve->copy();
+        if(!pc->sa->start)
+            tmpCurve = tmpCurve->create_reverse();
+        Geom::CubicBezier const * cubic = dynamic_cast<Geom::CubicBezier const*>(&*tmpCurve->last_segment());
+        if(cubic){
+            lastSeg->moveto((*cubic)[0]);
+            lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
+            if( tmpCurve->get_segment_count() == 1){
+                tmpCurve = lastSeg;
+            }else{
+                //we eliminate the last segment
+                tmpCurve->backspace();
+                //and we add it again with the recreation
+                tmpCurve->append_continuous(lastSeg, 0.0625);
+            }
+            if (!pc->sa->start) {
+                tmpCurve = tmpCurve->create_reverse();
             }
+            pc->sa->curve->reset();
+            pc->sa->curve = tmpCurve;
         }
     }
-    spiro_build(pc);
 }
 
-
 //Unimos todas las curvas en juego y llamamos a la función doEffect.
 static void spiro_build(SPPenContext *const pc)
 {
@@ -2054,143 +2234,6 @@ static void bsplineEndAnchorOff(SPPenContext *const pc)
     }
 }
 
-/*
-//Unimos todas las curvas en juego y llamamos a la función doEffect.
-static void bspline(SPPenContext *const pc, bool Shift)
-{
-    using Geom::X;
-    using Geom::Y;
-    Geom::CubicBezier const *cubic;
-    if(Shift){
-
-        //Continuamos la curva en modo CUSP
-        //Guardamos el valor de inicio en cusp para que no se redibuje como SYMM
-        if(pc->anchor_statusbar && pc->red_curve->is_empty()){
-            SPCurve *previousCurve = new SPCurve();
-            if(pc->sa && !pc->sa->curve->is_empty()){
-                previousCurve = pc->sa->curve->copy();
-                if (pc->sa->start) {
-                    previousCurve = previousCurve->create_reverse();
-                }
-                cubic = dynamic_cast<Geom::CubicBezier const*>(&*previousCurve->last_segment());
-                if(cubic){
-                    SPCurve *lastSeg = new SPCurve();
-                    lastSeg->moveto((*cubic)[0]);
-                    lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-                    previousCurve->backspace();
-                    previousCurve->append_continuous(lastSeg, 0.0625);
-                    if (pc->sa->start) {
-                        previousCurve = previousCurve->create_reverse();
-                    }
-                    pc->sa->curve->reset();
-                    pc->sa->curve = previousCurve;
-                }
-            }
-        }
-
-        if(pc->anchor_statusbar && !pc->red_curve->is_empty()){
-            // Step B - both start and end anchored to same curve
-            if ( pc->sa && pc->ea
-                 && ( pc->sa->curve == pc->ea->curve )
-                 && ( ( pc->sa != pc->ea )
-                      || pc->sa->curve->is_closed() ) )
-            {
-                SPCurve * same = pc->sa->curve->copy();
-                if (pc->sa->start) {
-                    same = same->create_reverse();
-                }
-                cubic = dynamic_cast<Geom::CubicBezier const*>(&*same->last_segment());
-                if(cubic){
-                    SPCurve *lastSeg = new SPCurve();
-                    lastSeg->moveto((*cubic)[0]);
-                    lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-                    same->backspace();
-                    same->append_continuous(lastSeg, 0.0625);
-                    if (pc->sa->start) {
-                        same = same->create_reverse();
-                    }
-                    pc->sa->curve->reset();
-                    pc->sa->curve = same;
-                }
-            }
-            // Step A - test, whether we ended on green anchor
-            if ( pc->green_anchor && pc->green_anchor->active )  {
-                // We hit green anchor, closing Green-Blue-Red
-                SPCurve * green = pc->green_curve->copy()->create_reverse();
-                cubic = dynamic_cast<Geom::CubicBezier const*>(&*green->last_segment());
-                if(cubic){
-                    SPCurve *lastSeg = new SPCurve();
-                    lastSeg->moveto((*cubic)[0]);
-                    lastSeg->curveto((*cubic)[1],(*cubic)[3],(*cubic)[3]);
-                    green->backspace();
-                    green->append_continuous(lastSeg, 0.0625);
-                    green = green->create_reverse();
-                    pc->green_curve->reset();
-                    pc->green_curve = green;
-                }
-            }
-        }
-
-        if (!pc->red_curve->is_empty()){
-            pc->npoints = 5;
-            pc->p[0] = pc->red_curve->first_segment()->initialPoint();
-            pc->p[3] = pc->red_curve->first_segment()->finalPoint();
-            if(pc->green_curve->is_empty()){
-                pc->p[1] = pc->p[0];
-            }else{
-                cubic = dynamic_cast<Geom::CubicBezier const*>(&*pc->green_curve->last_segment());
-                if(!cubic || ((*cubic)[2] == (*cubic)[3])){
-                    pc->p[1] = pc->p[0];
-                    pc->p[2] = pc->p[3];
-                }else{
-                    pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
-                    pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1);
-                    pc->p[2] = pc->p[3];
-                }
-            
-            }
-        }
-    }else{
-        //NODO CUSP formado por nodo SMOOTH
-            //solo mobemos el manejador del nodo final de cada segmento
-            //Es suficiente para mostrar el nodo como CUSP
-            //Usamos 5 puntos
-        if(!pc->red_curve->is_empty()){
-            pc->npoints = 5;
-            pc->p[0] = pc->red_curve->first_segment()->initialPoint();
-            pc->p[3] = pc->red_curve->first_segment()->finalPoint();
-            if(pc->green_curve->is_empty()){
-                if(!pc->sa || (pc->sa && pc->p[0] != pc->p[1])){
-                    pc->p[1] = pc->p[0] + (1./3)*(pc->p[3] - pc->p[0]);
-                    pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1);
-                }
-            }else{
-                cubic = dynamic_cast<Geom::CubicBezier const*>(&*pc->green_curve->last_segment());
-                if(!cubic || ((*cubic)[2] == (*cubic)[3]))
-                    pc->p[1] = pc->p[0];
-                else{
-                    SPCurve * WPower = new SPCurve();
-                    Geom::D2< Geom::SBasis > SBasisWPower;
-                    WPower->moveto(pc->green_curve->last_segment()->finalPoint());
-                    WPower->lineto(pc->green_curve->last_segment()->initialPoint());
-                    float WP = Geom::nearest_point((*cubic)[2],*WPower->first_segment());
-                    WPower->reset();
-                    WPower->moveto(pc->red_curve->last_segment()->initialPoint());
-                    WPower->lineto(pc->red_curve->last_segment()->finalPoint());
-                    SBasisWPower = WPower->first_segment()->toSBasis();
-                    WPower->reset();
-                    pc->p[1] = SBasisWPower.valueAt(WP);
-                    pc->p[1] = Geom::Point(pc->p[1][X]+1,pc->p[1][Y]+1);
-                }
-            }
-            pc->p[2] = pc->p[3] + (1./3)*(pc->p[0] - pc->p[3]);
-            pc->p[2] = Geom::Point(pc->p[2][X]+1,pc->p[2][Y]+1);
-        }
-    }
-    bspline_build(pc);
-}
-
-/*/
 
 //preparates the curves for its trasformation into BSline curves.
 static void bspline_build(SPPenContext *const pc)
@@ -2267,12 +2310,6 @@ static void bspline_doEffect(SPCurve * curve)
         //los puntos clave para los manejadores. 
         //Esto hace que la curva BSpline no pierda su condición aunque se trasladen
         //dichos manejadores
-        SPCurve * in = new SPCurve();
-        in->moveto(curve_it1->initialPoint());
-        in->lineto(curve_it1->finalPoint());
-        SPCurve * out = new SPCurve();
-        out->moveto(curve_it2->initialPoint());
-        out->lineto(curve_it2->finalPoint());
         SPCurve *nCurve = new SPCurve();
         Geom::Point startNode(0,0);
         Geom::Point previousNode(0,0);
@@ -2282,6 +2319,9 @@ static void bspline_doEffect(SPCurve * curve)
         Geom::Point nextPointAt1(0,0);
         Geom::Point nextPointAt2(0,0);
         Geom::Point nextPointAt3(0,0);
+        Geom::D2< Geom::SBasis > SBasisIn;
+        Geom::D2< Geom::SBasis > SBasisOut;
+        Geom::D2< Geom::SBasis > SBasisHelper;
         Geom::CubicBezier const *cubic = NULL;
         //Si la curva está cerrada calculamos el punto donde
         //deveria estar el nodo BSpline de cierre/inicio de la curva
@@ -2293,13 +2333,12 @@ static void bspline_doEffect(SPCurve * curve)
             if (are_near(closingline.initialPoint(), closingline.finalPoint())) {
                 curve_endit = path_it->end_open();
             }
-            SPCurve * end = new SPCurve();
-            end->moveto(curve_endit->initialPoint());
-            end->lineto(curve_endit->finalPoint());
-            Geom::D2< Geom::SBasis > SBasisIn = in->first_segment()->toSBasis();
-            Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
-            end->reset();
-            delete end;
+
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
+            SBasisIn = in->first_segment()->toSBasis();
+
             SPCurve *lineHelper = new SPCurve();
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
             if(cubic){
@@ -2307,13 +2346,23 @@ static void bspline_doEffect(SPCurve * curve)
             }else{
                 lineHelper->moveto(in->first_segment()->initialPoint());
             }
+            in->reset();
+            delete in;
+
+            SPCurve * end = new SPCurve();
+            end->moveto(curve_endit->initialPoint());
+            end->lineto(curve_endit->finalPoint());
+            Geom::D2< Geom::SBasis > SBasisEnd = end->first_segment()->toSBasis();
+            //Geom::BezierCurve const *bezier = dynamic_cast<Geom::BezierCurve const*>(&*curve_endit);
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_endit);
             if(cubic){
                 lineHelper->lineto(SBasisEnd.valueAt(Geom::nearest_point((*cubic)[2],*end->first_segment())));
             }else{
                 lineHelper->lineto(end->first_segment()->finalPoint());
             }
-            Geom::D2< Geom::SBasis > SBasisHelper = lineHelper->first_segment()->toSBasis();
+            end->reset();
+            delete end;
+            SBasisHelper = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
             //Guardamos el principio de la curva
@@ -2322,7 +2371,12 @@ static void bspline_doEffect(SPCurve * curve)
             node = startNode;
         }else{
             //Guardamos el principio de la curva
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
             startNode = in->first_segment()->initialPoint();
+            in->reset();
+            delete in;
             //Definimos el punto de inicio original de la curva resultante
             node = startNode;
         }
@@ -2331,20 +2385,28 @@ static void bspline_doEffect(SPCurve * curve)
         {
             //previousPointAt3 = pointAt3;
             //Calculamos los puntos que dividirían en tres segmentos iguales el path recto de entrada y de salida
+            SPCurve * in = new SPCurve();
+            in->moveto(curve_it1->initialPoint());
+            in->lineto(curve_it1->finalPoint());
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it1);
             if(cubic){
-                Geom::D2< Geom::SBasis > SBasisIn = in->first_segment()->toSBasis();
+                SBasisIn = in->first_segment()->toSBasis();
                 pointAt1 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[1],*in->first_segment()));
                 pointAt2 = SBasisIn.valueAt(Geom::nearest_point((*cubic)[2],*in->first_segment()));
             }else{
                 pointAt1 = in->first_segment()->initialPoint();
                 pointAt2 = in->first_segment()->finalPoint();
             }
+            in->reset();
+            delete in;
             //Y hacemos lo propio con el path de salida
             //nextPointAt0 = curveOut.valueAt(0);
+            SPCurve * out = new SPCurve();
+            out->moveto(curve_it2->initialPoint());
+            out->lineto(curve_it2->finalPoint());
             cubic = dynamic_cast<Geom::CubicBezier const*>(&*curve_it2);
             if(cubic){
-                Geom::D2< Geom::SBasis > SBasisOut = out->first_segment()->toSBasis();
+                SBasisOut = out->first_segment()->toSBasis();
                 nextPointAt1 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[1],*out->first_segment()));
                 nextPointAt2 = SBasisOut.valueAt(Geom::nearest_point((*cubic)[2],*out->first_segment()));;
                 nextPointAt3 = (*cubic)[3];
@@ -2353,6 +2415,8 @@ static void bspline_doEffect(SPCurve * curve)
                 nextPointAt2 = out->first_segment()->finalPoint();
                 nextPointAt3 = out->first_segment()->finalPoint();
             }
+            out->reset();
+            delete out;
             //La curva BSpline se forma calculando el centro del segmanto de unión
             //de el punto situado en las 2/3 partes de el segmento de entrada
             //con el punto situado en la posición 1/3 del segmento de salida
@@ -2361,7 +2425,7 @@ static void bspline_doEffect(SPCurve * curve)
             SPCurve *lineHelper = new SPCurve();
             lineHelper->moveto(pointAt2);
             lineHelper->lineto(nextPointAt1);
-            Geom::D2< Geom::SBasis > SBasisHelper  = lineHelper->first_segment()->toSBasis();
+            SBasisHelper  = lineHelper->first_segment()->toSBasis();
             lineHelper->reset();
             delete lineHelper;
             //almacenamos el punto del anterior bucle -o el de cierre- que nos hara de principio de curva
@@ -2378,18 +2442,6 @@ static void bspline_doEffect(SPCurve * curve)
             //aumentamos los valores para el siguiente paso en el bucle
             ++curve_it1;
             ++curve_it2;
-            in->reset();
-            delete in;
-            SPCurve * in = new SPCurve();
-            in->moveto(curve_it1->initialPoint());
-            in->lineto(curve_it1->finalPoint());
-            out->reset();
-            delete out;
-            if(curve_it1 != curve_endit){
-                SPCurve * out = new SPCurve();
-                out->moveto(curve_it2->initialPoint());
-                out->lineto(curve_it2->finalPoint());
-            }
         }
         //Aberiguamos la ultima parte de la curva correspondiente al último segmento
         SPCurve *curveHelper = new SPCurve();
@@ -2412,11 +2464,6 @@ static void bspline_doEffect(SPCurve * curve)
         curve->append(nCurve,false);
         nCurve->reset();
         delete nCurve;
-        //Limpiamos
-        in->reset();
-        out->reset();
-        delete in;
-        delete out;
     }
 }
 //BSpline end
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 5af75a9a5..755269edb 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -52,10 +52,12 @@ using Inkscape::IO::Resource::SYSTEM;
 using Inkscape::IO::Resource::USER;
 using Inkscape::IO::Resource::KEYS;
 
-
 static void try_shortcuts_file(char const *filename);
 static void read_shortcuts_file(char const *filename, bool const is_user_set=false);
 
+unsigned int sp_shortcut_get_key(unsigned int const shortcut);
+GdkModifierType sp_shortcut_get_modifiers(unsigned int const shortcut);
+
 /* Returns true if action was performed */
 
 bool
@@ -430,7 +432,7 @@ void sp_shortcut_delete_from_file(char const * /*action*/, unsigned int const sh
         return;
     }
 
-    gchar *key = gdk_keyval_name (shortcut & (~SP_SHORTCUT_MODIFIER_MASK));
+    gchar *key = gdk_keyval_name (sp_shortcut_get_key(shortcut));
     std::string modifiers = sp_shortcut_to_label(shortcut & (SP_SHORTCUT_MODIFIER_MASK));
 
     if (!key) {
@@ -502,7 +504,7 @@ void sp_shortcut_add_to_file(char const *action, unsigned int const shortcut) {
         }
     }
 
-    gchar *key = gdk_keyval_name (shortcut & (~SP_SHORTCUT_MODIFIER_MASK));
+    gchar *key = gdk_keyval_name (sp_shortcut_get_key(shortcut));
     std::string modifiers = sp_shortcut_to_label(shortcut & (SP_SHORTCUT_MODIFIER_MASK));
 
     if (!key) {
@@ -639,6 +641,58 @@ sp_shortcut_unset(unsigned int const shortcut)
 
     }
 }
+
+GtkAccelGroup *
+sp_shortcut_get_accel_group()
+{
+    static GtkAccelGroup *accel_group = NULL;
+
+    if (!accel_group) {
+        accel_group = gtk_accel_group_new ();
+    }
+
+    return accel_group;
+}
+
+/**
+ * Adds a gtk accelerator to a widget
+ * Used to display the keyboard shortcuts in the main menu items
+ */
+void
+sp_shortcut_add_accelerator(GtkWidget *item, unsigned int const shortcut)
+{
+    if (shortcut == GDK_KEY_VoidSymbol) {
+        return;
+    }
+
+    unsigned int accel_key = sp_shortcut_get_key(shortcut);
+    if (accel_key > 0) {
+        gtk_widget_add_accelerator (item,
+                "activate",
+                sp_shortcut_get_accel_group(),
+                accel_key,
+                sp_shortcut_get_modifiers(shortcut),
+                GTK_ACCEL_VISIBLE);
+    }
+}
+
+
+unsigned int
+sp_shortcut_get_key(unsigned int const shortcut)
+{
+    return (shortcut & (~SP_SHORTCUT_MODIFIER_MASK));
+}
+
+GdkModifierType
+sp_shortcut_get_modifiers(unsigned int const shortcut)
+{
+    return static_cast<GdkModifierType>(
+            ((shortcut & SP_SHORTCUT_SHIFT_MASK) ? GDK_SHIFT_MASK : 0) |
+            ((shortcut & SP_SHORTCUT_CONTROL_MASK) ? GDK_CONTROL_MASK : 0) |
+            ((shortcut & SP_SHORTCUT_ALT_MASK) ? GDK_MOD1_MASK : 0)
+            );
+}
+
 /**
  * Adds a keyboard shortcut for the given verb.
  * (Removes any existing binding for the given shortcut, including appropriately
@@ -706,7 +760,6 @@ bool sp_shortcut_is_user_set(Inkscape::Verb *verb)
     return result;
 }
 
-
 gchar *sp_shortcut_get_label(unsigned int shortcut)
 {
     // The comment below was copied from the function sp_ui_shortcut_string in interface.cpp (which was subsequently removed)
@@ -721,11 +774,8 @@ gchar *sp_shortcut_get_label(unsigned int shortcut)
     gchar *result = 0;
     if (shortcut != GDK_KEY_VoidSymbol) {
         result = gtk_accelerator_get_label(
-            shortcut & (~SP_SHORTCUT_MODIFIER_MASK), static_cast<GdkModifierType>(
-                ((shortcut & SP_SHORTCUT_SHIFT_MASK) ? GDK_SHIFT_MASK : 0) |
-                ((shortcut & SP_SHORTCUT_CONTROL_MASK) ? GDK_CONTROL_MASK : 0) |
-                ((shortcut & SP_SHORTCUT_ALT_MASK) ? GDK_MOD1_MASK : 0)
-                ));
+                sp_shortcut_get_key(shortcut),
+                sp_shortcut_get_modifiers(shortcut));
     }
     return result;
 }
diff --git a/src/shortcuts.h b/src/shortcuts.h
index 118909bd3..c2a6f6cde 100644
--- a/src/shortcuts.h
+++ b/src/shortcuts.h
@@ -28,13 +28,14 @@ namespace Inkscape {
 #define SP_SHORTCUT_ALT_MASK (1 << 26)
 #define SP_SHORTCUT_MODIFIER_MASK (SP_SHORTCUT_SHIFT_MASK|SP_SHORTCUT_CONTROL_MASK|SP_SHORTCUT_ALT_MASK)
 
+
 /* Returns true if action was performed */
 bool sp_shortcut_invoke (unsigned int shortcut, Inkscape::UI::View::View *view);
 
 void sp_shortcut_init();
 Inkscape::Verb * sp_shortcut_get_verb (unsigned int shortcut);
 unsigned int sp_shortcut_get_primary (Inkscape::Verb * verb); // Returns GDK_VoidSymbol if no shortcut is found.
-char* sp_shortcut_get_label (unsigned int shortcut); // Returns the human readable form of the shortcut (or NULL), for example Shift+Ctrl+F. Free the returned string with g_free.
+gchar* sp_shortcut_get_label (unsigned int shortcut); // Returns the human readable form of the shortcut (or NULL), for example Shift+Ctrl+F. Free the returned string with g_free.
 void sp_shortcut_set(unsigned int const shortcut, Inkscape::Verb *const verb, bool const is_primary, bool const is_user_set=false);
 void sp_shortcut_unset(unsigned int const shortcut);
 void sp_shortcut_add_to_file(char const *action, unsigned int const shortcut);
@@ -48,6 +49,8 @@ void sp_shortcut_file_export();
 bool sp_shortcut_file_import();
 void sp_shortcut_file_import_do(char const *importname);
 void sp_shortcut_file_export_do(char const *exportname);
+GtkAccelGroup *sp_shortcut_get_accel_group();
+void sp_shortcut_add_accelerator(GtkWidget *item, unsigned int const shortcut);
 
 #endif
 
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index 7cbd92eeb..8ce9a012b 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -307,7 +307,10 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb
 
         originaux[1]->ConvertWithBackData(1.0);
 
-        originaux[1]->Fill(theShape, 1,false,false,false); //do not closeIfNeeded
+        if ((originaux[1]->pts.size() == 2) && originaux[1]->pts[0].isMoveTo && !originaux[1]->pts[1].isMoveTo)
+            originaux[1]->Fill(theShape, 1,false,true,false); // see LP Bug 177956
+        else
+            originaux[1]->Fill(theShape, 1,false,false,false); //do not closeIfNeeded
 
         theShapeB->ConvertToShape(theShape, fill_justDont); // fill_justDont doesn't computes winding numbers
 
diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 8fd8eb4e3..f3c3b8473 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -84,6 +84,7 @@ set(ui_SRC
 	widget/entry.cpp
 	widget/filter-effect-chooser.cpp
 	widget/frame.cpp
+	widget/gimpcolorwheel.c
 	widget/gimpspinscale.c
 	widget/imageicon.cpp
 	widget/imagetoggler.cpp
@@ -212,6 +213,7 @@ set(ui_SRC
 	widget/filter-effect-chooser.h
 	widget/frame.h
 	widget/gimpspinscale.h
+	widget/gimpcolorwheel.h
 	widget/imageicon.h
 	widget/imagetoggler.h
 	widget/labelled.h
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp
index 50f30e8f4..7dc94c92f 100644
--- a/src/ui/dialog/filter-effects-dialog.cpp
+++ b/src/ui/dialog/filter-effects-dialog.cpp
@@ -1201,7 +1201,6 @@ void FilterEffectsDialog::FilterModifier::on_change_selection()
 {
     Inkscape::Selection *selection = sp_desktop_selection (SP_ACTIVE_DESKTOP);
     update_selection(selection);
-    update_filters(); 
 }
 
 void FilterEffectsDialog::FilterModifier::on_modified_selection( guint flags )
@@ -2668,7 +2667,7 @@ void FilterEffectsDialog::update_primitive_infobox()
             break;
         case(NR_FILTER_SPECULARLIGHTING):
             _infobox_icon.set_from_icon_name("feSpecularLighting-icon", Gtk::ICON_SIZE_DIALOG);
-            _infobox_desc.set_markup(_("The feDiffuseLighting and <b>feSpecularLighting</b> filter primitives create \"embossed\" shadings.  The input's alpha channel is used to provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer."));
+            _infobox_desc.set_markup(_("The <b>feDiffuseLighting</b> and <b>feSpecularLighting</b> filter primitives create \"embossed\" shadings.  The input's alpha channel is used to provide depth information: higher opacity areas are raised toward the viewer and lower opacity areas recede away from the viewer."));
             break;
         case(NR_FILTER_TILE):
             _infobox_icon.set_from_icon_name("feTile-icon", Gtk::ICON_SIZE_DIALOG);
diff --git a/src/ui/dialog/floating-behavior.cpp b/src/ui/dialog/floating-behavior.cpp
index ba81c6d47..eab5f9d8f 100644
--- a/src/ui/dialog/floating-behavior.cpp
+++ b/src/ui/dialog/floating-behavior.cpp
@@ -12,6 +12,7 @@
 
 #include <gtkmm/dialog.h>
 #include <gtkmm/stock.h>
+#include <glibmm/main.h>
 #include <gtk/gtk.h>
 
 #include "floating-behavior.h"
diff --git a/src/ui/dialog/font-substitution.cpp b/src/ui/dialog/font-substitution.cpp
index 07e73cec8..f0112f1d8 100644
--- a/src/ui/dialog/font-substitution.cpp
+++ b/src/ui/dialog/font-substitution.cpp
@@ -37,6 +37,8 @@
 #include "libnrtype/FontFactory.h"
 #include "libnrtype/font-instance.h"
 
+#include <glibmm/regex.h>
+
 namespace Inkscape {
 namespace UI {
 namespace Dialog {
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 57f815730..c162681e7 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -18,6 +18,7 @@
 #endif
 
 #include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
 
 #include "inkscape-preferences.h"
 #include <gtkmm/main.h>
@@ -1288,7 +1289,7 @@ void InkscapePreferences::initPageBehavior()
     _page_mask.add_group_header( _("Before applying"));
     
     _mask_grouping_none.init( _("Do not group clipped/masked objects"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_NONE, true, 0);
-    _mask_grouping_separate.init( _("Enclose every clipped/masked object in its own group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_SEPARATE, false, &_mask_grouping_none);
+    _mask_grouping_separate.init( _("Put every clipped/masked object in its own group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_SEPARATE, false, &_mask_grouping_none);
     _mask_grouping_all.init( _("Put all clipped/masked objects into one group"), "/options/maskobject/grouping", PREFS_MASKOBJECT_GROUPING_ALL, false, &_mask_grouping_none);
     
     _page_mask.add_line(true, "", _mask_grouping_none, "",
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index fdc33b2a6..dd147d00f 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -20,6 +20,7 @@
 #include <gtkmm/separatormenuitem.h>
 
 #include <glibmm/i18n.h>
+#include <glibmm/main.h>
 
 #include "desktop.h"
 #include "desktop-style.h"
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 43b88e5c6..71fee342a 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -23,6 +23,7 @@
 
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
+#include <glibmm/timer.h>
 #include <gdkmm/pixbuf.h>
 
 #include "color-item.h"
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index b9cc50845..8d960ddc3 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -18,6 +18,7 @@
 
 #include <gtkmm/icontheme.h>
 #include <gtkmm/stockitem.h>
+#include <glibmm/exceptionhandler.h>
 
 namespace Inkscape {
 namespace UI {
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 9e078cabb..2a816adf4 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -775,6 +775,10 @@ static void sp_desktop_widget_dispose(GObject *object)
 {
     SPDesktopWidget *dtw = SP_DESKTOP_WIDGET (object);
 
+    if (dtw == NULL) {
+        return;
+    }
+    
     UXManager::getInstance()->delTrack(dtw);
 
     if (dtw->desktop) {
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index 013ad9e94..59fe25fa1 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -51,8 +51,6 @@ struct SPFontSelector
 
     NRNameList families;
     NRStyleList styles;
-    int familyidx;
-    int styleidx;
     gfloat fontsize;
     bool fontsize_dirty;
     font_instance *font;
@@ -246,9 +244,7 @@ static void sp_font_selector_init(SPFontSelector *fsel)
 
         gtk_widget_show_all (fsel->size);
 
-        fsel->familyidx = 0;
-        fsel->styleidx = 0;
-        fsel->fontsize = 10.0;
+        fsel->fontsize = 18.0;
         fsel->fontsize_dirty = false;
         fsel->font = NULL;
 }
@@ -290,8 +286,6 @@ static void sp_font_selector_family_select_row(GtkTreeSelection *selection,
 
     path = gtk_tree_model_get_path (model, &iter);
     gtk_tree_model_get (model, &iter, 1, &list, -1);
-    fsel->familyidx = gtk_tree_path_get_indices (path)[0];
-    fsel->styleidx = 0;
 
     store = gtk_list_store_new (1, G_TYPE_STRING);
 
@@ -318,7 +312,6 @@ static void sp_font_selector_style_select_row (GtkTreeSelection *selection,
     if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return;
 
     path = gtk_tree_model_get_path (model, &iter);
-    fsel->styleidx = gtk_tree_path_get_indices (path)[0];
 
     if (!fsel->block_emit)
     {
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index 8470e93db..7580d9602 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -24,6 +24,7 @@
 #include <gtkmm/image.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/fileutils.h>
+#include <glibmm/miscutils.h>
 #include <2geom/transforms.h>
 
 #include "path-prefix.h"
diff --git a/src/widgets/text-toolbar.cpp b/src/widgets/text-toolbar.cpp
index a01f950a6..cc6d02ea8 100644
--- a/src/widgets/text-toolbar.cpp
+++ b/src/widgets/text-toolbar.cpp
@@ -133,115 +133,7 @@ static void       sp_print_fontstyle( SPStyle *query ) {
 }
 #endif
 
-/*
- * Fill the font style combobox with the available font styles for the selected font family
- * Set the selected style to that in font
- */
-static void sp_text_fontstyle_populate(GObject *tbl, font_instance *font=NULL)
-{
-
-    Ink_ComboBoxEntry_Action* act = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) );
-    GtkTreeModel *model = ink_comboboxentry_action_get_model( act );
-    gchar *current_font = ink_comboboxentry_action_get_active_text( act );
-    if (!current_font) {
-        return;
-    }
-
-    // If font list, take only first font in list
-    gchar** tokens = g_strsplit( current_font, ",", 0 );
-    g_strstrip( tokens[0] );
-    current_font = tokens[0];
-
-    // Get an iter to the selected font from the model data
-    // We cant get it from the combo, cause it might not have been created yet
-    gboolean found = false;
-    GtkTreeIter iter;
-    gboolean valid = gtk_tree_model_get_iter_first( model, &iter );
-    while ( valid ) {
-
-      // Get text from list entry
-      gchar* text = NULL;
-      gtk_tree_model_get( model, &iter, 0, &text, -1 ); // Column 0
-
-      // Check for match
-      if ( text && (strcmp( current_font, text ) == 0) ) {
-        found = true;
-        break;
-      }
-      valid = gtk_tree_model_iter_next( model, &iter );
-    }
-
-    g_strfreev( tokens );
-
-    Ink_ComboBoxEntry_Action* fontStyleAction = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) );
-
-    gchar *current_style = ink_comboboxentry_action_get_active_text( fontStyleAction );
-
-    GtkListStore *store = GTK_LIST_STORE( ink_comboboxentry_action_get_model( fontStyleAction ) );
-    gtk_list_store_clear ( store );
-
-    // Get the list of styles from the selected font.
-    GList *list = NULL;
-
-    if (found) {
-
-        // Use precompiled list if font-family on system.
-        gtk_tree_model_get (model, &iter, 1, &list, -1);
-
-    } else {
-
-        // Use generic list if font-family not on system.
-        static GList *glist = NULL;
-        if( glist == NULL ) {
-            glist = g_list_append (glist, (void*)"Normal");
-            glist = g_list_append (glist, (void*)"Italic");
-            glist = g_list_append (glist, (void*)"Bold");
-            glist = g_list_append (glist, (void*)"Bold Italic");
-        }
-        list = glist;
-    }
-
-    for (GList *l=list; l; l = l->next)
-    {
-        gtk_list_store_append (store, &iter);
-        gtk_list_store_set (store, &iter, 0, (char*)l->data, -1);
-    }
-
-    // Select the style in the combo that best matches font
-    if (font && list) {
-
-        unsigned int index = sp_font_selector_get_best_style(font, list);
-
-        Ink_ComboBoxEntry_Action* fontStyleAction =
-            INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction" ) );
-        model = ink_comboboxentry_action_get_model( fontStyleAction );
-        GtkTreePath *path_c = gtk_tree_path_new ();
-        gtk_tree_path_append_index (path_c, index);
-        gtk_tree_model_get_iter(model, &iter, path_c);
-        gchar *name;
-        gtk_tree_model_get (model, &iter, 0, &name, -1);
-        ink_comboboxentry_action_set_active_text( fontStyleAction, name );
-
-    } else if (current_style) {
-        ink_comboboxentry_action_set_active_text( fontStyleAction, current_style );
-    }
-}
-
 // Font family
-//
-// In most cases we should just be able to set the new family name
-// but there may be cases where a font family doesn't follow the
-// standard naming pattern. To handle those cases, we do a song and
-// dance to use Pango to find the best match. To do that we start
-// with the old "fontSpec" (which is the returned string from
-// pango_font_description_to_string() with the size unset). This
-// has the form "[family-list] [style-options]" where the
-// family-list is a comma separated list of font-family names
-// (optionally terminated by a comma). An example would be
-// "DejaVu Sans, Sans Bold". Only a "fontSpec" containing a
-// single font-family will work with Pango's best match routine.
-// If we can't obtain a good "fontSpec", we then resort to blindly
-// changing the font-family.
 static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GObject *tbl )
 {
 #ifdef DEBUG_TEXT
@@ -252,156 +144,45 @@ static void sp_text_fontfamily_value_changed( Ink_ComboBoxEntry_Action *act, GOb
 
      // quit if run by the _changed callbacks
     if (g_object_get_data(G_OBJECT(tbl), "freeze")) {
-        return;
-    }
-    g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
-
-    gchar *family = ink_comboboxentry_action_get_active_text( act );
-#ifdef DEBUG_TEXT
-    std::cout << "  New family: " << family << std::endl;
-#endif
-
-    // First try to get the old font spec from the stored value
-    SPStyle *query = sp_style_new (SP_ACTIVE_DOCUMENT);
-    int result_fontspec = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONT_SPECIFICATION);
-
-    Glib::ustring fontSpec = query->text->font_specification.set ?  query->text->font_specification.value : "";
-#ifdef DEBUG_TEXT
-    std::cout << "  fontSpec from query :" << fontSpec << ":" << std::endl;
-#endif
-
-    // If that didn't work, try to get font spec from style
-    if (fontSpec.empty()) {
-
-        // Must query all to fill font-family, font-style, font-weight, font-specification
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY);
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE);
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
-
-        // Construct a new font specification if it does not yet exist
-        font_instance * fontFromStyle = font_factory::Default()->FaceFromStyle(query);
-        if( fontFromStyle ) {
-            fontSpec = font_factory::Default()->ConstructFontSpecification(fontFromStyle);
-            fontFromStyle->Unref();
-        }
-
-#ifdef DEBUG_TEXT
-        std::cout << "  fontSpec empty, try from style" << std::endl;
-        std::cout << "           from style :" << fontSpec << ":" << std::endl;
-        sp_print_font( query );
-#endif
-
-    }
-
-    // And if that didn't work use default. DO WE REALLY WANT TO DO THIS?
-    if ( fontSpec.empty() ) {
-
-        sp_style_read_from_prefs(query, "/tools/text");
-
-        // Construct a new font specification if it does not yet exist
-        font_instance * fontFromStyle = font_factory::Default()->FaceFromStyle(query);
-        if ( fontFromStyle ) {
-            fontSpec = font_factory::Default()->ConstructFontSpecification(fontFromStyle);
-            fontFromStyle->Unref();
-        }
-
 #ifdef DEBUG_TEXT
-        std::cout << "  fontSpec empty, trying from prefs" << std::endl;
-        std::cout << "           from prefs :" << fontSpec << ":" << std::endl;
-        sp_print_font( query );
+        std::cout << "sp_text_fontfamily_value_changed: frozen... return" << std::endl;
+        std::cout << "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM\n" << std::endl;
 #endif
+        return;
     }
+    g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
 
-    // Now we have a font specification, replace family.
-    Glib::ustring  newFontSpec = "";
-    SPCSSAttr *css = sp_repr_css_attr_new ();
-
-    if (!fontSpec.empty()) newFontSpec = font_factory::Default()->ReplaceFontSpecificationFamily(fontSpec, family);
-
-#ifdef DEBUG_TEXT
-    std::cout << "  New FontSpec from ReplaceFontSpecificationFamily :" << newFontSpec << ":" << std::endl;
-#endif
-
-    if (!fontSpec.empty() && !newFontSpec.empty() ) {
-
-        if (fontSpec != newFontSpec) {
-
-            font_instance *font = font_factory::Default()->FaceFromFontSpecification(newFontSpec.c_str());
-
-            if (font) {
-                sp_repr_css_set_property (css, "-inkscape-font-specification", newFontSpec.c_str());
-
-                // Set all the these just in case they were altered when finding the best
-                // match for the new family and old style...  Unnecessary?
-
-                gchar c[256];
-
-                font->Family(c, 256);
-
-                sp_repr_css_set_property (css, "font-family", c);
-
-                font->Attribute( "weight", c, 256);
-                sp_repr_css_set_property (css, "font-weight", c);
-
-                font->Attribute("style", c, 256);
-                sp_repr_css_set_property (css, "font-style", c);
-
-                font->Attribute("stretch", c, 256);
-                sp_repr_css_set_property (css, "font-stretch", c);
-
-                font->Attribute("variant", c, 256);
-                sp_repr_css_set_property (css, "font-variant", c);
-
-                font->Unref();
-
-                // Set the list of font styles
-                sp_text_fontstyle_populate(tbl);
-
-            } else {
-                g_warning(_("Failed to find font matching: %s\n"), newFontSpec.c_str());
-            }
-        }
-    } else {
-
-        // Either old font does not exist on system or ReplaceFontSpecificationFamily() failed.
-        // Blindly fall back to setting the family to text in the font-family chooser.
+    Glib::ustring new_family = ink_comboboxentry_action_get_active_text( act );
 
+    // TODO: Think about how to handle handle multiple selections. While
+    // the font-family may be the same for all, the styles might be different.
+    // See: TextEdit::onApply() for example of looping over selected items.
+    Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
 #ifdef DEBUG_TEXT
-        std::cout << "  Failed to find new font, blindly setting family: " << family << std::endl;
+    std::cout << "  Old family: " << fontlister->get_font_family() << std::endl;
+    std::cout << "  New family: " << new_family << std::endl;
+    std::cout << "  Old active: " << fontlister->get_font_family_row() << std::endl;
+    std::cout << "  New active: " << act->active << std::endl;
 #endif
-        sp_repr_css_set_property (css, "-inkscape-font-specification", family);
-        sp_repr_css_set_property (css, "font-family", family);
-    }
+    if( new_family.compare( fontlister->get_font_family() ) != 0 ) {
 
-    // If querying returned nothing, update default style.
-    if (result_fontspec == QUERY_STYLE_NOTHING)
-    {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        prefs->mergeStyle("/tools/text/style", css);
-        //sp_text_edit_dialog_default_set_insensitive (); //FIXME: Replace through a verb
-    }
-    else
-    {
-        sp_desktop_set_style (SP_ACTIVE_DESKTOP, css, true, true);
-    }
+        std::pair<Glib::ustring,Glib::ustring> ui = fontlister->set_font_family( act->active );
+        // active text set in sp_text_toolbox_selection_changed()
 
-    sp_style_unref(query);
+        SPCSSAttr *css = sp_repr_css_attr_new ();
+        fontlister->set_css( css );
 
-    g_free (family);
+        SPDesktop   *desktop    = SP_ACTIVE_DESKTOP;
+        sp_desktop_set_style (desktop, css, true, true); // Results in selection change called twice.
+        sp_repr_css_attr_unref (css);
 
-    // Save for undo
-    if (result_fontspec != QUERY_STYLE_NOTHING) {
-        DocumentUndo::done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT,
+        DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_TEXT,
                        _("Text: Change font family"));
     }
-    sp_repr_css_attr_unref (css);
 
     // unfreeze
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
 
-    // focus to canvas (not useful if you want to choose font for your text)
-    //gtk_widget_grab_focus (GTK_WIDGET((SP_ACTIVE_DESKTOP)->canvas));
-
 #ifdef DEBUG_TEXT
     std::cout << "sp_text_toolbox_fontfamily_changes: exit"  << std::endl;
     std::cout << "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" << std::endl;
@@ -473,7 +254,6 @@ static void sp_text_fontsize_value_changed( Ink_ComboBoxEntry_Action *act, GObje
 /*
  *  Font style
  */
-//static void sp_text_fontstyle_value_changed( EgeSelectOneAction *act, GObject *tbl )
 static void sp_text_fontstyle_value_changed( Ink_ComboBoxEntry_Action *act, GObject *tbl )
 {
     // quit if run by the _changed callbacks
@@ -482,95 +262,26 @@ static void sp_text_fontstyle_value_changed( Ink_ComboBoxEntry_Action *act, GObj
     }
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
 
-    // First query font-specification, this is the most complete font face description.
-    SPStyle *query = sp_style_new (SP_ACTIVE_DOCUMENT);
-    int result_fontspec = sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONT_SPECIFICATION);
+    Glib::ustring new_style = ink_comboboxentry_action_get_active_text( act );
 
-    // font_specification will not be set unless defined explicitily on a tspan.
-    // This should be fixed!
-    Glib::ustring fontSpec = query->text->font_specification.set ?  query->text->font_specification.value : "";
+    Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
 
-    if (fontSpec.empty()) {
-        // Construct a new font specification if it does not yet exist
-        // Must query font-family, font-style, font-weight, to find correct font face.
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTFAMILY);
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTSTYLE);
-        sp_desktop_query_style (SP_ACTIVE_DESKTOP, query, QUERY_STYLE_PROPERTY_FONTNUMBERS);
+    if( new_style.compare( fontlister->get_font_style() ) != 0 ) {
 
-        font_instance * fontFromStyle = font_factory::Default()->FaceFromStyle(query);
-        if ( fontFromStyle ) {
-            fontSpec = font_factory::Default()->ConstructFontSpecification(fontFromStyle);
-            fontFromStyle->Unref();
-        }
-    }
+        fontlister->set_font_style( new_style );
+        // active text set in sp_text_toolbox_seletion_changed()
 
-    SPCSSAttr   *css        = sp_repr_css_attr_new ();
+        SPCSSAttr *css = sp_repr_css_attr_new ();
+        fontlister->set_css( css );
 
-    Glib::ustring current_style = ink_comboboxentry_action_get_active_text( act );
-    Glib::ustring fontFamily = "";
+        SPDesktop   *desktop    = SP_ACTIVE_DESKTOP;
+        sp_desktop_set_style (desktop, css, true, true);
+        sp_repr_css_attr_unref (css);
 
-    if (query->text->font_family.set) {
-        fontFamily = query->text->font_family.value;
-    } else {
-        // if the font_family is not set, get it from the font family combo instead
-        Ink_ComboBoxEntry_Action* act = INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) );
-        fontFamily = ink_comboboxentry_action_get_active_text( act );
+        DocumentUndo::done(sp_desktop_document(desktop), SP_VERB_CONTEXT_TEXT,
+                           _("Text: Change font style"));
     }
 
-    font_instance *font = (font_factory::Default())->FaceFromUIStrings (fontFamily.c_str(), current_style.c_str());
-
-    if (font) {
-
-        gchar c[256];
-
-        font->Attribute( "weight", c, 256);
-        sp_repr_css_set_property (css, "font-weight", c);
-
-        font->Attribute("style", c, 256);
-        sp_repr_css_set_property (css, "font-style", c);
-
-        font->Attribute("stretch", c, 256);
-        sp_repr_css_set_property (css, "font-stretch", c);
-
-        font->Attribute("variant", c, 256);
-        sp_repr_css_set_property (css, "font-variant", c);
-
-        font->Unref();
-        font = NULL;
-
-    } else {
-
-        // Font not found on system, blindly update style
-        // Options match choices in sp_text_fontstyle_populate
-        sp_repr_css_set_property (css, "font-weight", "normal");
-        sp_repr_css_set_property (css, "font-style",  "normal" );
-        if( current_style.find("Bold") != Glib::ustring::npos ) {
-            sp_repr_css_set_property (css, "font-weight", "bold");
-        }
-        if( current_style.find("Italic") != Glib::ustring::npos ) {
-            sp_repr_css_set_property (css, "font-style", "italic");
-        }
-    }
-
-    // If querying returned nothing, update default style.
-    if (result_fontspec == QUERY_STYLE_NOTHING)
-    {
-        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        prefs->mergeStyle("/tools/text/style", css);
-    }
-
-    sp_style_unref(query);
-
-    // Do we need to update other CSS values?
-    SPDesktop   *desktop    = SP_ACTIVE_DESKTOP;
-    sp_desktop_set_style (desktop, css, true, true);
-    if (result_fontspec != QUERY_STYLE_NOTHING) {
-        DocumentUndo::done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT,
-                       _("Text: Change font style"));
-    }
-
-    sp_repr_css_attr_unref (css);
-
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
 }
 
@@ -1145,6 +856,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     if (g_object_get_data(G_OBJECT(tbl), "freeze")) {
 #ifdef DEBUG_TEXT
         std::cout << "    Frozen, returning" << std::endl;
+        std::cout << "sp_text_toolbox_selection_changed: exit " << count << std::endl;
         std::cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << std::endl;
         std::cout << std::endl;
 #endif
@@ -1152,15 +864,21 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     }
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(TRUE) );
 
-    // Update font list, but only if widget already created.
     Ink_ComboBoxEntry_Action* fontFamilyAction =
         INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) );
+    Ink_ComboBoxEntry_Action* fontStyleAction =
+        INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontStyleAction"  ) );
+
+    Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
+    fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP ));
+    fontlister->selection_update();
+
+    // Update font list, but only if widget already created.
     if( fontFamilyAction->combobox != NULL ) {
-        Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
-        fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP ));
+        ink_comboboxentry_action_set_active_text( fontFamilyAction, fontlister->get_font_family().c_str(), fontlister->get_font_family_row() );
+        ink_comboboxentry_action_set_active_text( fontStyleAction,  fontlister->get_font_style().c_str()  );
     }
 
-
     // Only flowed text can be justified, only normal text can be kerned...
     // Find out if we have flowed text now so we can use it several places
     gboolean isFlow = false;
@@ -1207,6 +925,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
             g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
 #ifdef DEBUG_TEXT
             std::cout << "    text_style_from_prefs: toolbar already set" << std:: endl;
+            std::cout << "sp_text_toolbox_selection_changed: exit " << count << std::endl;
             std::cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << std::endl;
             std::cout << std::endl;
 #endif
@@ -1225,15 +944,6 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     // If we have valid query data for text (font-family, font-specification) set toolbar accordingly.
     if (query->text)
     {
-        // Font family
-        if( query->text->font_family.value ) {
-            gchar *fontFamily = query->text->font_family.value;
-
-            Ink_ComboBoxEntry_Action* fontFamilyAction =
-                INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontFamilyAction" ) );
-            ink_comboboxentry_action_set_active_text( fontFamilyAction, fontFamily );
-        }
-
         // Size (average of text selected)
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
@@ -1247,16 +957,17 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
 
         Ink_ComboBoxEntry_Action* fontSizeAction =
             INK_COMBOBOXENTRY_ACTION( g_object_get_data( tbl, "TextFontSizeAction" ) );
+
+        // Freeze to ignore callbacks.
+        //g_object_freeze_notify( G_OBJECT( fontSizeAction->combobox ) );
         sp_text_set_sizes(GTK_LIST_STORE(ink_comboboxentry_action_get_model(fontSizeAction)), unit);
+        //g_object_thaw_notify( G_OBJECT( fontSizeAction->combobox ) );
+
         ink_comboboxentry_action_set_active_text( fontSizeAction, os.str().c_str() );
 
         Glib::ustring tooltip = Glib::ustring::format(_("Font size"), " (", sp_style_get_css_unit_string(unit), ")");
         ink_comboboxentry_action_set_tooltip ( fontSizeAction, tooltip.c_str());
 
-        // Font styles
-        font_instance *font = font_factory::Default()->FaceFromStyle(query);
-        sp_text_fontstyle_populate(tbl, font);
-
         // Superscript
         gboolean superscriptSet =
             ((result_baseline == QUERY_STYLE_SINGLE || result_baseline == QUERY_STYLE_MULTIPLE_SAME ) &&
@@ -1438,6 +1149,7 @@ static void sp_text_toolbox_selection_changed(Inkscape::Selection */*selection*/
     }
 
 #ifdef DEBUG_TEXT
+    std::cout << "sp_text_toolbox_selection_changed: exit " << count << std::endl;
     std::cout << "&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&" << std::endl;
     std::cout << std::endl;
 #endif
@@ -1457,41 +1169,47 @@ sp_text_toolbox_subselection_changed (gpointer /*tc*/, GObject *tbl)
     sp_text_toolbox_selection_changed (NULL, tbl);
 }
 
+// TODO: possibly share with font-selector by moving most code to font-lister (passing family name)
+static void sp_text_toolbox_select_cb( GtkEntry* entry, GtkEntryIconPosition /*position*/, GdkEvent /*event*/, gpointer /*data*/ ) {
 
-/* Recursively extract all "font-family" attributes from a document. */
-void
-sp_text_toolbox_get_font_list_in_doc_recursive (SPObject *r, std::list<Glib::ustring> *l)
-{ 
-    if (!r) {
-        return;
-    }
+  Glib::ustring family = gtk_entry_get_text ( entry );
+  //std::cout << "text_toolbox_missing_font_cb: selecting: " << family << std::endl;
 
-    const gchar *style = r->getRepr()->attribute("style");
-    if( style != NULL ) {
-        //std::cout << style << std::endl;
-        std::vector<Glib::ustring> tokens = Glib::Regex::split_simple(";", style );
-        for( size_t i=0; i < tokens.size(); ++i ) {
-            Glib::ustring token = tokens[i];
-            size_t found = token.find("font-family:");
-            if( found != Glib::ustring::npos ) {
-                // Remove "font-family:"
-                token.erase(found,12);
-                // Remove any leading single or double quote
-                if( token[0] == '\'' || token[0] == '"' ) {
-                    token.erase(0,1);
-                }
-                // Remove any trailing single or double quote
-                if( token[token.length()-1] == '\'' || token[token.length()-1] == '"' ) {
-                    token.erase(token.length()-1);
-                }
-                l->push_back( token );
-            }
-        }
-    }
+  // Get all items with matching font-family set (not inherited!).
+  GSList *selectList = NULL;
+
+  SPDesktop *desktop = SP_ACTIVE_DESKTOP;
+  SPDocument *document = sp_desktop_document( desktop );
+  GSList *allList = get_all_items(NULL, document->getRoot(), desktop, false, false, true, NULL);
+  for (GSList *i = allList; i != NULL; i = i->next) {
+
+    SPItem *item = SP_ITEM(i->data);
+    SPStyle *style = item->style;
+
+    if (style && style->text) {
+
+      Glib::ustring family_style;
+      if (style->text->font_family.set) {
+	family_style = style->text->font_family.value;
+	//std::cout << " family style from font_family: " << family_style << std::endl;
+      }
+      else if (style->text->font_specification.set) {
+	family_style = style->text->font_specification.value;
+	//std::cout << " family style from font_spec: " << family_style << std::endl;
+      }
 
-    for (SPObject *child = r->firstChild(); child; child = child->getNext()) {
-        sp_text_toolbox_get_font_list_in_doc_recursive( child, l );
+      if (family_style.compare( family ) == 0 ) {
+        //std::cout << "   found: " << item->getId() << std::endl;
+	selectList = g_slist_prepend (selectList, item);
+      }
     }
+  }
+
+  // Update selection
+  Inkscape::Selection *selection = sp_desktop_selection (desktop );
+  selection->clear();
+  //std::cout << "   list length: " << g_slist_length ( selectList ) << std::endl;
+  selection->setList(selectList);
 }
 
 
@@ -1526,8 +1244,16 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
                                           (gpointer)font_lister_separator_func,
                                           GTK_WIDGET(desktop->canvas)); // Focus widget
         ink_comboboxentry_action_popup_enable( act ); // Enable entry completion
+
+        gchar *const info = _("Select all text with this font-family");
+        ink_comboboxentry_action_set_info( act, info ); // Show selection icon
+        ink_comboboxentry_action_set_info_cb( act, (gpointer)sp_text_toolbox_select_cb );
+
         gchar *const warning = _("Font not found on system");
-        ink_comboboxentry_action_set_warning( act, warning ); // Show icon with tooltip if missing font
+        ink_comboboxentry_action_set_warning( act, warning ); // Show icon w/ tooltip if font missing
+        ink_comboboxentry_action_set_warning_cb( act, (gpointer)sp_text_toolbox_select_cb );
+
+        //ink_comboboxentry_action_set_warning_callback( act, sp_text_fontfamily_select_all );
         ink_comboboxentry_action_set_altx_name( act, "altx-text" ); // Set Alt-X keyboard shortcut
         g_signal_connect( G_OBJECT(act), "changed", G_CALLBACK(sp_text_fontfamily_value_changed), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
@@ -1577,18 +1303,20 @@ void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObje
 
     /* Font styles */
     {
-        GtkListStore* model_style = gtk_list_store_new( 1, G_TYPE_STRING );
+        Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance();
+        Glib::RefPtr<Gtk::ListStore> store = fontlister->get_style_list();
+        GtkListStore* model_style = store->gobj();
 
-       Ink_ComboBoxEntry_Action* act = ink_comboboxentry_action_new( "TextFontStyleAction",
+        Ink_ComboBoxEntry_Action* act = ink_comboboxentry_action_new( "TextFontStyleAction",
                                                                       _("Font Style"),
                                                                       _("Font style"),
                                                                       NULL,
                                                                       GTK_TREE_MODEL(model_style),
                                                                       12, // Width in characters
-                                                                       0,      // Extra list width
-                                                                       NULL,   // Cell layout
-                                                                       NULL,   // Separator
-                                                                       GTK_WIDGET(desktop->canvas)); // Focus widget
+                                                                      0,      // Extra list width
+                                                                      NULL,   // Cell layout
+                                                                      NULL,   // Separator
+                                                                      GTK_WIDGET(desktop->canvas)); // Focus widget
 
         g_signal_connect( G_OBJECT(act), "changed", G_CALLBACK(sp_text_fontstyle_value_changed), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );