diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-08 08:59:37 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-08 08:59:37 +0000 |
| commit | d8a3b36b43e0700126a7a25a1d38858d1a1d4836 (patch) | |
| tree | eaf5a86ac5542fc33ed8bb697a615e08ddd2ae01 | |
| parent | changes_2013_02_25a.patch (diff) | |
| parent | Drop deprecated get_vbox method in Gtk::Dialog (diff) | |
| download | inkscape-d8a3b36b43e0700126a7a25a1d38858d1a1d4836.tar.gz inkscape-d8a3b36b43e0700126a7a25a1d38858d1a1d4836.zip | |
merge from trunk (r12181)
(bzr r11668.1.53)
112 files changed, 6044 insertions, 4713 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..cc315800e 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,35 @@ # 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 +autopoint --force +AUTOPOINT='intltoolize --automake --copy' autoreconf --force --install --verbose -# 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 +# Patch the generated po/Makefile.in.in file so that locale files are installed +# in the correct location on OS X and Free-BSD systems. This is a workaround +# for a bug in intltool. See https://launchpad.net/bugs/398571 +# +# TODO: Drop this hack, and bump our intltool version requiement once the issue +# is fixed in intltool +sed 's/itlocaledir = $(prefix)\/$(DATADIRNAME)\/locale/itlocaledir = $(datarootdir)\/locale/' < po/Makefile.in.in > po/Makefile.in.in.tmp +mv po/Makefile.in.in.tmp po/Makefile.in.in -echo "" -echo "Done! Please run './configure' now." +cd $olddir +test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" @@ -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 546280ff8..d31aa0dea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,17 +1,25 @@ 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]) -AM_INIT_AUTOMAKE([dist-zip dist-bzip2 tar-pax]) +AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_AUX_DIR([build-aux]) +AC_CANONICAL_HOST + +AM_INIT_AUTOMAKE([-Wall dist-zip dist-bzip2 tar-pax]) AC_ARG_ENABLE([lsb], AS_HELP_STRING([--enable-lsb], [LSB-compatible build configuration]), [ prefix=/opt/inkscape @@ -21,24 +29,38 @@ 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 +79,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 +92,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 +106,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 +119,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 +130,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 +157,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 +179,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 +195,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 +215,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 +243,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 +315,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 +349,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)]) @@ -421,97 +362,11 @@ fi AM_CONDITIONAL(INKJAR, test "$with_ij" = "yes") dnl ****************************** -dnl PERL checking -dnl ****************************** - -AC_MSG_CHECKING(for Perl development environment) -AC_ARG_WITH(perl, - AC_HELP_STRING([--with-perl], [use Perl for embedded scripting (EXPERIMENTAL)]), - [with_perl=$withval], [with_perl=skipped]) - -if test "x$with_perl" = "xyes"; then - checkPERL_CFLAGS=`perl -MExtUtils::Embed -e perl_inc 2>/dev/null` - if test "$?" -gt "0"; then - with_perl="no" - else - checkPERL_LIBS=`perl -MExtUtils::Embed -e ldopts 2>/dev/null` - if test "$?" -gt "0"; then - with_perl="no" - else - with_perl="yes" - fi - fi -fi -AC_MSG_RESULT([$with_perl]) -if test "x$with_perl" = "xyes"; then - # Test that we actually have the perl libraries installed - oldCFLAGS="$CFLAGS" - oldLIBS="$LIBS" - CFLAGS="$CFLAGS $checkPERL_CFLAGS" - LIBS="$LIBS $checkPERL_LIBS" - AC_CHECK_FUNC([perl_parse],[ - PERL_CFLAGS="$checkPERL_CFLAGS" - PERL_LIBS="$checkPERL_LIBS" - AC_DEFINE(WITH_PERL, 1, [use Perl for embedded scripting]) - ],[ - with_perl="no" - ]) - CFLAGS="$oldCFLAGS" - LIBS="$oldLIBS" -fi -AM_CONDITIONAL(WITH_PERL, test "x$with_perl" = "xyes") -AC_SUBST(PERL_CFLAGS) -AC_SUBST(PERL_LIBS) - -dnl ****************************** -dnl Python checking -dnl ****************************** - -AC_MSG_CHECKING(for Python development environment) -AC_ARG_WITH(python, - AC_HELP_STRING([--with-python], [use Python for embedded scripting (EXPERIMENTAL)]), - [with_python=$withval], [with_python=skipped]) - -if test "x$with_python" = "xyes"; then - checkPYTHON_CFLAGS=`python -c "import distutils.sysconfig ; print '-I%s' % distutils.sysconfig.get_config_var('INCLUDEPY')" 2>/dev/null` - if test "$?" -gt "0"; then - with_python="no" - else - checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null` - if test "$?" -gt "0"; then - with_python="no" - else - with_python="yes" - fi - fi -fi -AC_MSG_RESULT([$with_python]) -if test "x$with_python" = "xyes"; then - # Test that we actually have the python libraries installed - oldCFLAGS="$CFLAGS" - oldLIBS="$LIBS" - CFLAGS="$CFLAGS $checkPYTHON_CFLAGS" - LIBS="$LIBS $checkPYTHON_LIBS" - AC_CHECK_FUNC([Py_Initialize],[ - PYTHON_CFLAGS="$checkPYTHON_CFLAGS" - PYTHON_LIBS="$checkPYTHON_LIBS" - AC_DEFINE(WITH_PYTHON, 1, [use Python for embedded scripting]) - ],[ - with_python="no" - ]) - CFLAGS="$oldCFLAGS" - LIBS="$oldLIBS" -fi -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 +404,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 +465,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 +480,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 +648,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 +660,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 +671,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="-DGDK_DISABLE_DEPRECATED $CPPFLAGS" + fi else ink_spell_pkg= @@ -829,50 +697,81 @@ 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" + + # 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 library symbols unless strict build +# checking has been disabled +if test "x$enable_strict_build" != "xno"; then + CPPFLAGS="-DGDKMM_DISABLE_DEPRECATED $CPPFLAGS" + # 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 +785,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 +805,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 +932,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 +954,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 +974,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 @@ -1184,8 +1082,6 @@ Configuration: Use gnome-vfs: ${gnome_vfs} Use openoffice files: ${ij} Use relocation support: ${enable_binreloc} - Internal Python: ${with_python} - Internal Perl: ${with_perl} Enable LittleCms: ${enable_lcms} Enable DBUS: ${with_dbus} Enable Poppler-Cairo: ${enable_poppler_cairo} 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 @@ -17,8 +17,8 @@ msgid "" 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-01-31 06:04+0100\n" +"POT-Creation-Date: 2013-02-25 22:03+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" @@ -26,7 +26,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" @@ -258,7 +258,7 @@ msgstr "Simuliere Ölgemälde" #. Pencil #: ../share/filters/filters.svg.h:1 -#: ../src/ui/dialog/inkscape-preferences.cpp:415 +#: ../src/ui/dialog/inkscape-preferences.cpp:416 msgid "Pencil" msgstr "Malwerkzeug (Freihand)" @@ -377,7 +377,7 @@ msgstr "Blasige Oberfläche" #: ../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 "Raue Texturen" @@ -973,8 +973,8 @@ msgstr "Schwarzes Licht" #: ../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 @@ -4147,21 +4147,21 @@ msgstr "<small>Pro Spalte:</small>" msgid "<small>Randomize:</small>" msgstr "<small>Zufallsfaktor:</small>" -#: ../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 "Einheiten:" -#: ../src/ui/dialog/export.cpp:140 +#: ../src/ui/dialog/export.cpp:145 msgid "_Export As..." msgstr "_exportieren als…" -#: ../src/ui/dialog/export.cpp:143 +#: ../src/ui/dialog/export.cpp:148 msgid "B_atch export all selected objects" msgstr "Alle gewählten Objekte auf einmal exportieren" # !!! "export hints" are not clear to the user I guess -#: ../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!)" @@ -4170,168 +4170,168 @@ msgstr "" "Berücksichtigung von Exporthinweisen, wenn vorhanden (Vorsicht, überschreibt " "ohne Warnung!)" -#: ../src/ui/dialog/export.cpp:145 +#: ../src/ui/dialog/export.cpp:150 msgid "Hide a_ll except selected" msgstr "Alle außer Ausgewählte verstecken" -#: ../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 "Verstecke alle Objekte außer den gerade gewählten im exportierten Bild" -#: ../src/ui/dialog/export.cpp:146 +#: ../src/ui/dialog/export.cpp:151 msgid "Close when complete" msgstr "Schließen wenn fertig" -#: ../src/ui/dialog/export.cpp:146 +#: ../src/ui/dialog/export.cpp:151 msgid "Once the export completes, close this dialog" msgstr "Wenn der Export fertig ist, schließe den Dialog." -#: ../src/ui/dialog/export.cpp:148 +#: ../src/ui/dialog/export.cpp:153 msgid "_Export" msgstr "_Exportieren" -#: ../src/ui/dialog/export.cpp:166 +#: ../src/ui/dialog/export.cpp:171 msgid "<b>Export area</b>" msgstr "<b>Exportbereich</b>" -#: ../src/ui/dialog/export.cpp:196 +#: ../src/ui/dialog/export.cpp:201 msgid "_x0:" msgstr "_x0:" -#: ../src/ui/dialog/export.cpp:200 +#: ../src/ui/dialog/export.cpp:205 msgid "x_1:" msgstr "x_1:" -#: ../src/ui/dialog/export.cpp:204 +#: ../src/ui/dialog/export.cpp:209 msgid "Wid_th:" msgstr "Brei_te:" -#: ../src/ui/dialog/export.cpp:208 +#: ../src/ui/dialog/export.cpp:213 msgid "_y0:" msgstr "_y0:" -#: ../src/ui/dialog/export.cpp:212 +#: ../src/ui/dialog/export.cpp:217 msgid "y_1:" msgstr "y_1:" -#: ../src/ui/dialog/export.cpp:216 +#: ../src/ui/dialog/export.cpp:221 msgid "Hei_ght:" msgstr "Höhe:" -#: ../src/ui/dialog/export.cpp:231 +#: ../src/ui/dialog/export.cpp:236 msgid "<b>Image size</b>" msgstr "<b>Bildgröße</b>" -#: ../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 "_Breite:" -#: ../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 "Pixel bei" -#: ../src/ui/dialog/export.cpp:247 +#: ../src/ui/dialog/export.cpp:252 msgid "dp_i" msgstr "dp_i" -#: ../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 "_Höhe:" -#: ../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 "dpi" -#: ../src/ui/dialog/export.cpp:268 +#: ../src/ui/dialog/export.cpp:273 msgid "<b>_Filename</b>" msgstr "<b>_Dateiname</b>" -#: ../src/ui/dialog/export.cpp:310 +#: ../src/ui/dialog/export.cpp:315 msgid "Export the bitmap file with these settings" msgstr "Bitmapdatei mit diesen Einstellungen exportieren" -#: ../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] "B_atch-Export von %d gewähltem Objekt" msgstr[1] "B_atch-Export von %d gewählten Objekten" -#: ../src/ui/dialog/export.cpp:861 +#: ../src/ui/dialog/export.cpp:866 msgid "Export in progress" msgstr "Exportieren läuft" -#: ../src/ui/dialog/export.cpp:945 +#: ../src/ui/dialog/export.cpp:950 msgid "No items selected." msgstr "Kein Element gewählt." -#: ../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 "Exportiere %1 Dateien" -#: ../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 "Exportiere Dateie <b>%s</b>..." -#: ../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 "Konnte nicht als Datei %s exportieren.\n" -#: ../src/ui/dialog/export.cpp:1005 +#: ../src/ui/dialog/export.cpp:1010 #, c-format msgid "Could not export to filename <b>%s</b>." msgstr "Konnte nicht als Datei <b>%s</b> exportieren." -#: ../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 "" "Erfolgreich <b>%d</b> Dateien aus <b>%d</b> ausgewählten Artikeln exportiert." -#: ../src/ui/dialog/export.cpp:1031 +#: ../src/ui/dialog/export.cpp:1036 msgid "You have to enter a filename." msgstr "Sie müssen einen Dateinamen angeben" -#: ../src/ui/dialog/export.cpp:1032 +#: ../src/ui/dialog/export.cpp:1037 msgid "You have to enter a filename" msgstr "Sie müssen einen Dateinamen angeben" -#: ../src/ui/dialog/export.cpp:1046 +#: ../src/ui/dialog/export.cpp:1051 msgid "The chosen area to be exported is invalid." msgstr "Der zum Exportieren gewählte Bereich ist ungültig" -#: ../src/ui/dialog/export.cpp:1047 +#: ../src/ui/dialog/export.cpp:1052 msgid "The chosen area to be exported is invalid" msgstr "Der zum Exportieren gewählte Bereich ist ungültig" -#: ../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 "Das Verzeichnis %s existiert nicht oder ist kein Verzeichnis.\n" #. 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 "Exportiere %1 (%2 x %3)" -#: ../src/ui/dialog/export.cpp:1104 +#: ../src/ui/dialog/export.cpp:1109 #, c-format msgid "Drawing exported to <b>%s</b>." msgstr "Zeichnung exportiert zu <b>%s</b>." -#: ../src/ui/dialog/export.cpp:1108 +#: ../src/ui/dialog/export.cpp:1113 msgid "Export aborted." msgstr "Export abgebochen." -#: ../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 "Wählen Sie einen Namen für die zu exportierende Datei" @@ -4571,31 +4571,31 @@ msgid "AaBbCcIiPpQq12369$€¢?.;/()" msgstr "AaBbCcIiPpQqÄäÖöÜüß012369€¢?&.;/|()„“»«" #. 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 "Linksbündig ausrichten" -#: ../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 "Zentriert ausrichten" -#: ../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 "Rechtsbündig ausrichten" -#: ../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 "Ausrichten - Nur Fließtext" #. 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 "Horizontale Textausrichtung" -#: ../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 "Vertikale Textausrichtung" @@ -4723,8 +4723,8 @@ msgid "_Origin X:" msgstr "_Ursprung X:" #: ../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 "X-Koordinate des Gitterursprungs" @@ -4733,8 +4733,8 @@ msgid "O_rigin Y:" msgstr "U_rsprung Y:" #: ../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 "Y-Koordinate des Gitterursprungs" @@ -4743,29 +4743,29 @@ msgid "Spacing _Y:" msgstr "Abstand _Y:" #: ../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 "Basislänge der Z-Achse" #: ../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 "Winkel X:" #: ../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 "Winkel der X-Achse" #: ../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 "Winkel Z:" #: ../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 "Winkel der Z-Achse" @@ -4774,7 +4774,7 @@ msgid "Minor grid line _color:" msgstr "Nebengitter-Linienfarbe:" #: ../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 "Nebengitter-Linienfarbe:" @@ -4787,7 +4787,7 @@ msgid "Ma_jor grid line color:" msgstr "Farbe der _dicken Gitterlinien:" #: ../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 "Farbe der dicken Gitterlinien" @@ -4856,12 +4856,12 @@ msgid "Spacing _X:" msgstr "Abstand _X:" #: ../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 "Abstand der vertikalen Gitterlinien" #: ../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 "Abstand der horizontalen Gitterlinien" @@ -5204,23 +5204,23 @@ msgstr "_Rückgängig" msgid "_Redo" msgstr "_Wiederherstellen" -#: ../src/extension/dependency.cpp:235 +#: ../src/extension/dependency.cpp:237 msgid "Dependency:" msgstr "Abhängigkeit:" -#: ../src/extension/dependency.cpp:236 +#: ../src/extension/dependency.cpp:238 msgid " type: " msgstr " Typ: " -#: ../src/extension/dependency.cpp:237 +#: ../src/extension/dependency.cpp:239 msgid " location: " msgstr " Speicherort: " -#: ../src/extension/dependency.cpp:238 +#: ../src/extension/dependency.cpp:240 msgid " string: " msgstr " Zeichenkette: " -#: ../src/extension/dependency.cpp:241 +#: ../src/extension/dependency.cpp:243 msgid " description: " msgstr " Beschreibung: " @@ -5338,7 +5338,7 @@ msgstr "" "Inkscape Webseite oder wenden Sie sich an die Mailing List wenn Sie Fragen " "bezüglich dieser Erweiterung haben." -#: ../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 " @@ -5348,12 +5348,12 @@ msgstr "" "keine Fehlermeldung vom Skript zurückgegeben, doch das Resultat ist " "möglicherweise unbrauchbar." -#: ../src/extension/init.cpp:290 +#: ../src/extension/init.cpp:296 msgid "Null external module directory name. Modules will not be loaded." msgstr "Modulverzeichnis ist nicht verfügbar. Module werden nicht geladen." -#: ../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 " @@ -5384,7 +5384,7 @@ msgstr "Breite:" #: ../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 @@ -5455,8 +5455,8 @@ msgstr "Rauschen hinzufügen" #: ../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 @@ -5506,7 +5506,7 @@ msgstr "Unschärfe" #: ../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 "Radius:" @@ -5827,7 +5827,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 "Deckkraft:" @@ -5884,13 +5884,13 @@ msgstr "Schattieren" #: ../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 "Azimut" #: ../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 "Anhebung" @@ -6192,7 +6192,7 @@ msgstr "Hervorhebungsfarbe:" #: ../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 @@ -6212,7 +6212,7 @@ msgstr "Hervorhebungsfarbe:" #: ../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 @@ -6309,8 +6309,8 @@ msgstr "Mischen:" #: ../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 @@ -6325,8 +6325,8 @@ msgstr "Verdunkeln" #: ../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 @@ -6342,8 +6342,8 @@ msgstr "Screen" #: ../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 @@ -6360,8 +6360,8 @@ msgstr "Multiplizieren" #: ../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 @@ -6425,8 +6425,8 @@ msgstr "Misch-Typ:" #: ../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 @@ -6438,7 +6438,7 @@ msgstr "Misch-Typ:" #: ../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 "Normal" @@ -6455,27 +6455,27 @@ msgid "Bump" msgstr "Erhöhung" #: ../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 "Bild-Vereinfachungen:" #: ../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 "Stoß-Vereinfachungen:" #: ../src/extension/internal/filter/bumps.h:86 -#: ../src/extension/internal/filter/bumps.h:318 +#: ../src/extension/internal/filter/bumps.h:315 msgid "Crop:" msgstr "Schneiden:" #: ../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 "Stoß-Quelle" #: ../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 @@ -6483,7 +6483,7 @@ msgid "Red:" msgstr "Rot:" #: ../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 @@ -6491,7 +6491,7 @@ msgid "Green:" msgstr "Grün:" #: ../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 @@ -6515,7 +6515,7 @@ msgid "Diffuse" msgstr "Diffuses Licht" #: ../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 @@ -6526,7 +6526,7 @@ msgid "Lightness:" msgstr "Helligkeit:" #: ../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 "Genauigkeit" @@ -6544,7 +6544,7 @@ msgid "Distant" msgstr "Entfernt" #: ../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 "Punkt" @@ -6611,67 +6611,67 @@ msgstr "Farbbeule" msgid "All purposes bump filter" msgstr "Allzweck-Stoßfilter" -#: ../src/extension/internal/filter/bumps.h:312 +#: ../src/extension/internal/filter/bumps.h:309 msgid "Wax Bump" msgstr "Wachsbeule" -#: ../src/extension/internal/filter/bumps.h:323 +#: ../src/extension/internal/filter/bumps.h:320 msgid "Background:" msgstr "_Hintergrund:" -#: ../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 "Bild" -#: ../src/extension/internal/filter/bumps.h:326 +#: ../src/extension/internal/filter/bumps.h:323 msgid "Blurred image" msgstr "Verschwommenes Bild" -#: ../src/extension/internal/filter/bumps.h:328 +#: ../src/extension/internal/filter/bumps.h:325 msgid "Background opacity:" msgstr "Hintergrund-Deckkraft:" -#: ../src/extension/internal/filter/bumps.h:330 +#: ../src/extension/internal/filter/bumps.h:327 #: ../src/extension/internal/filter/color.h:1040 msgid "Lighting" msgstr "Blitz" -#: ../src/extension/internal/filter/bumps.h:337 +#: ../src/extension/internal/filter/bumps.h:334 msgid "Lighting blend:" msgstr "Blitz-Mischung:" -#: ../src/extension/internal/filter/bumps.h:344 +#: ../src/extension/internal/filter/bumps.h:341 msgid "Highlight blend:" msgstr "Schlaglicht-Mischung:" -#: ../src/extension/internal/filter/bumps.h:353 +#: ../src/extension/internal/filter/bumps.h:350 msgid "Bump color" msgstr "Beulenfarbe" -#: ../src/extension/internal/filter/bumps.h:354 +#: ../src/extension/internal/filter/bumps.h:351 msgid "Revert bump" msgstr "Beule umkehren" -#: ../src/extension/internal/filter/bumps.h:355 +#: ../src/extension/internal/filter/bumps.h:352 msgid "Transparency type:" msgstr "Transparenztyp:" -#: ../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 "Obenauf" -#: ../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 "In" -#: ../src/extension/internal/filter/bumps.h:368 +#: ../src/extension/internal/filter/bumps.h:365 msgid "Turns an image to jelly" msgstr "Verändert ein Bild zu Gelee" @@ -7158,7 +7158,7 @@ msgstr "Out" #: ../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 "Kontur:" @@ -7253,15 +7253,15 @@ msgstr "Turbulenz-Typ:" msgid "Small-scale roughening to edges and content" msgstr "Kanten und Fläche leicht aufrauen" -#: ../src/extension/internal/filter/filter-file.cpp:33 +#: ../src/extension/internal/filter/filter-file.cpp:34 msgid "Bundled" msgstr "Gebündelt" -#: ../src/extension/internal/filter/filter-file.cpp:34 +#: ../src/extension/internal/filter/filter-file.cpp:35 msgid "Personal" msgstr "Persönlich" -#: ../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 "Leerer Modulverzeichnisname. Filter werden nicht geladen." @@ -7517,11 +7517,11 @@ 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:1916 +#: ../src/widgets/desktop-widget.cpp:1923 msgid "Drawing" msgstr "Zeichnung" -#: ../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 "Vereinfachen" @@ -7819,7 +7819,7 @@ msgid "Background" msgstr "Hintergrund" #: ../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 @@ -7968,7 +7968,7 @@ msgstr "Rendern" #: ../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 "Gitter" @@ -7977,15 +7977,15 @@ msgstr "Gitter" msgid "Draw a path which is a grid" msgstr "Pfad zeichnen, der ein Gitter ist" -#: ../src/extension/internal/javafx-out.cpp:964 +#: ../src/extension/internal/javafx-out.cpp:966 msgid "JavaFX Output" msgstr "JavaFX-Ausgabe" -#: ../src/extension/internal/javafx-out.cpp:969 +#: ../src/extension/internal/javafx-out.cpp:971 msgid "JavaFX (*.fx)" msgstr "JavaFx (*.fx)" -#: ../src/extension/internal/javafx-out.cpp:970 +#: ../src/extension/internal/javafx-out.cpp:972 msgid "JavaFX Raytracer File" msgstr "JavaFX-Raytracer-Datei" @@ -8240,65 +8240,65 @@ msgstr "Vorschau" msgid "Is the effect previewed live on canvas?" msgstr "Ist Vorschau des Effekts auf Leinwand aktiv?" -#: ../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 "" "Die automatische Ermittlung des Formats ist fehlgeschlagen. Die Datei wird " "als SVG-Dokument geöffnet." -#: ../src/file.cpp:154 +#: ../src/file.cpp:155 msgid "default.svg" msgstr "default.de.svg" -#: ../src/file.cpp:285 +#: ../src/file.cpp:286 msgid "Broken links have been changed to point to existing files." msgstr "" "Defekte Verknüpfungen wurden geändert, um vorhandene Dateien zu verweisen." -#: ../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 "Laden der gewünschten Datei %s fehlgeschlagen" -#: ../src/file.cpp:322 +#: ../src/file.cpp:323 msgid "Document not saved yet. Cannot revert." msgstr "Dokument noch nicht gespeichtert. Kann nicht zurücksetzen." -#: ../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 "" "Änderungen gehen verloren! Sind Sie sicher, dass Sie das Dokument %s erneut " "laden möchten?" -#: ../src/file.cpp:357 +#: ../src/file.cpp:358 msgid "Document reverted." msgstr "Dokument zurückgesetzt." -#: ../src/file.cpp:359 +#: ../src/file.cpp:360 msgid "Document not reverted." msgstr "Dokument nicht zurückgesetzt." -#: ../src/file.cpp:509 +#: ../src/file.cpp:510 msgid "Select file to open" msgstr "Wählen Sie die zu öffnende Datei" -#: ../src/file.cpp:593 +#: ../src/file.cpp:594 msgid "Clean up document" msgstr "Dokument bereinigen" -#: ../src/file.cpp:598 +#: ../src/file.cpp:599 #, c-format msgid "Removed <b>%i</b> unused definition in <defs>." msgid_plural "Removed <b>%i</b> unused definitions in <defs>." msgstr[0] "<b>%i</b> überflüssiges Element aus <defs> entfernt." msgstr[1] "<b>%i</b> überflüssige Elemente aus <defs> entfernt." -#: ../src/file.cpp:603 +#: ../src/file.cpp:604 msgid "No unused definitions in <defs>." msgstr "Keine überflüssigen Elemente in <defs>." -#: ../src/file.cpp:634 +#: ../src/file.cpp:635 #, c-format msgid "" "No Inkscape extension found to save document (%s). This may have been " @@ -8307,12 +8307,12 @@ msgstr "" "Keine vorhandene Erweiterung von Inkscape kann das Dokument (%s) sichern. " "Dies Ursache dafür ist möglicherweise eine unbekannte Dateinamenendung." -#: ../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 "Dokument wurde nicht gespeichert." -#: ../src/file.cpp:642 +#: ../src/file.cpp:643 #, c-format msgid "" "File %s is write protected. Please remove write protection and try again." @@ -8320,60 +8320,60 @@ msgstr "" "Datei %s ist schreibgeschützt! Bitte entfernen Sie den Schreibschutz und " "versuchen es dann erneut." -#: ../src/file.cpp:650 +#: ../src/file.cpp:651 #, c-format msgid "File %s could not be saved." msgstr "Datei %s konnte nicht gespeichert werden." -#: ../src/file.cpp:680 ../src/file.cpp:682 +#: ../src/file.cpp:681 ../src/file.cpp:683 msgid "Document saved." msgstr "Dokument wurde gespeichert." #. 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 "Zeichnung%s" -#: ../src/file.cpp:836 +#: ../src/file.cpp:837 #, c-format msgid "drawing-%d%s" msgstr "Zeichnung-%d%s" -#: ../src/file.cpp:840 +#: ../src/file.cpp:841 #, c-format msgid "%s" msgstr "%s" -#: ../src/file.cpp:855 +#: ../src/file.cpp:856 msgid "Select file to save a copy to" msgstr "Datei wählen, in die eine Kopie gespeichert werden soll" -#: ../src/file.cpp:857 +#: ../src/file.cpp:858 msgid "Select file to save to" msgstr "Datei wählen, in die gespeichert werden soll" -#: ../src/file.cpp:963 ../src/file.cpp:965 +#: ../src/file.cpp:964 ../src/file.cpp:966 msgid "No changes need to be saved." msgstr "Es müssen keine Änderungen gespeichert werden." -#: ../src/file.cpp:984 +#: ../src/file.cpp:985 msgid "Saving document..." msgstr "Dokument wird gespeichert…" -#: ../src/file.cpp:1219 ../src/ui/dialog/ocaldialogs.cpp:1238 +#: ../src/file.cpp:1220 ../src/ui/dialog/ocaldialogs.cpp:1238 msgid "Import" msgstr "Importieren" -#: ../src/file.cpp:1269 +#: ../src/file.cpp:1270 msgid "Select file to import" msgstr "Wählen Sie die zu importierende Datei" -#: ../src/file.cpp:1407 +#: ../src/file.cpp:1408 msgid "Select file to export to" msgstr "Wählen Sie die Datei, in die exportiert werden soll" -#: ../src/file.cpp:1660 +#: ../src/file.cpp:1661 msgid "Import Clip Art" msgstr "Importiere Clipart" @@ -8480,11 +8480,11 @@ msgstr "Umbrechen" # CHECK #: ../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 @@ -8541,7 +8541,7 @@ msgstr "Sichtbare Farben" msgid "Hue" msgstr "Farbton" -#: ../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 @@ -8629,35 +8629,35 @@ 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:110 ../src/gradient-drag.cpp:95 +#: ../src/gradient-context.cpp:110 ../src/gradient-drag.cpp:96 msgid "Linear gradient <b>start</b>" msgstr "<b>Anfang</b> des linearen Farbverlaufs" #. 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 "<b>Ende</b> des linearen Farbverlaufs" -#: ../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 "<b>Zwischenfarbe</b> des linearen Farbverlaufs" -#: ../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 "<b>Zentrum</b> des radialen Farbverlaufs" #: ../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 "<b>Radius</b> des radialen Farbverlaufs" -#: ../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 "<b>Fokus</b> des radialen Farbverlaufs" #. 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 "<b>Zwischenfarbe</b> des radialen Farbverlaufs" @@ -8716,7 +8716,7 @@ msgstr[1] "" "<b>Keine</b> Verlaufs-Handles von %d ausgewählt bei %d markierten Objekten" #: ../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 "Zwischenfarbe zum Farbverlauf hinzufügen" @@ -8751,35 +8751,35 @@ msgstr[1] "<b>Farbverlauf</b> für %d Objekte; mit <b>Strg</b> Winkel einrasten" msgid "Select <b>objects</b> on which to create gradient." msgstr "<b>Objekte</b> auswählen, für die ein Farbverlauf erzeugt werden soll." -#: ../src/gradient-drag.cpp:104 +#: ../src/gradient-drag.cpp:105 msgid "Mesh gradient <b>corner</b>" msgstr "Gitterverlauf <b>Ecke</b>" -#: ../src/gradient-drag.cpp:105 +#: ../src/gradient-drag.cpp:106 msgid "Mesh gradient <b>handle</b>" msgstr "Gitterverlauf <b>Anfasser</b>" -#: ../src/gradient-drag.cpp:106 +#: ../src/gradient-drag.cpp:107 msgid "Mesh gradient <b>tensor</b>" msgstr "Gitterverlauf <b>Tensor</b>" -#: ../src/gradient-drag.cpp:565 +#: ../src/gradient-drag.cpp:566 msgid "Added patch row or column" msgstr "Hinzugefügte Patchreihe oder Spalte" -#: ../src/gradient-drag.cpp:791 +#: ../src/gradient-drag.cpp:792 msgid "Merge gradient handles" msgstr "Farbverlaufs-Anfasser vereinigen" -#: ../src/gradient-drag.cpp:1100 +#: ../src/gradient-drag.cpp:1101 msgid "Move gradient handle" msgstr "Farbverlaufs-Anfasser verschieben" -#: ../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 "Zwischenfarbe des Farbverlaufs löschen" -#: ../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" @@ -8788,11 +8788,11 @@ msgstr "" "%s %d für %s%s; Ziehen mit <b>Strg</b> rastet Versatz ein, Klick mit <b>Strg" "+Alt</b> löscht Zwischenfarbe" -#: ../src/gradient-drag.cpp:1426 ../src/gradient-drag.cpp:1433 +#: ../src/gradient-drag.cpp:1427 ../src/gradient-drag.cpp:1434 msgid " (stroke)" msgstr " (Kontur)" -#: ../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 " @@ -8801,7 +8801,7 @@ msgstr "" "%s für %s%s; Ziehen mit <b>Strg</b> rastet Winkel ein, Ziehen mit <b>Strg" "+Alt</b> behält Winkel bei; <b>Strg+Umschalt</b> skaliert um den Mittelpunkt" -#: ../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 " @@ -8810,7 +8810,7 @@ msgstr "" "<b>Zentrum</b> und <b>Fokus</b> des radialen Farbverlaufs; Ziehen mit " "<b>Umschalt</b>, um den Fokus einzeln zu bewegen" -#: ../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 " @@ -8825,15 +8825,15 @@ msgstr[1] "" "Farbverlaufspunkt ist <b>%d</b> weiteren Farbverläufen zugewiesen. Ziehen " "mit <b>Umschalt</b> trennt die Zuweisung" -#: ../src/gradient-drag.cpp:2369 +#: ../src/gradient-drag.cpp:2370 msgid "Move gradient handle(s)" msgstr "Farbverlaufs-Anfasser verschieben" -#: ../src/gradient-drag.cpp:2405 +#: ../src/gradient-drag.cpp:2406 msgid "Move gradient mid stop(s)" msgstr "Zwischenfarbe(n) des Farbverlaufs verschieben" -#: ../src/gradient-drag.cpp:2694 +#: ../src/gradient-drag.cpp:2695 msgid "Delete gradient stop(s)" msgstr "Zwischenfarbe(n) des Farbverlaufs löschen" @@ -8861,7 +8861,7 @@ msgstr "Punkte" msgid "Pt" msgstr "Pkt" -#: ../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 "Pica" @@ -8877,7 +8877,7 @@ msgstr "Picas" msgid "Pc" msgstr "PC" -#: ../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 "Pixel" @@ -8899,7 +8899,7 @@ msgstr "Px" msgid "Percent" msgstr "Prozent" -#: ../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 "%" @@ -8907,7 +8907,7 @@ msgstr "%" msgid "Percents" msgstr "Prozent" -#: ../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 "Millimeter" @@ -8927,7 +8927,7 @@ msgstr "mm" msgid "Millimeters" msgstr "Millimeter" -#: ../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 "Zentimeter" @@ -8952,7 +8952,7 @@ msgid "Meters" msgstr "Meter" #. 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 "Zoll" @@ -8986,7 +8986,7 @@ msgstr "Vorschub" #. 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 "Em-Quadrat" @@ -9011,46 +9011,46 @@ msgstr "ex" msgid "Ex squares" msgstr "Ix-Quadrate" -#: ../src/inkscape.cpp:316 +#: ../src/inkscape.cpp:318 msgid "Autosave failed! Cannot create directory %1." msgstr "Autospeicherung fehlgeschlagen! Kann Verzeichnis %1 nicht erstellen." -#: ../src/inkscape.cpp:325 +#: ../src/inkscape.cpp:327 msgid "Autosave failed! Cannot open directory %1." msgstr "Autospeicherung fehlgeschlagen! Kann Verzeichnis %1 nicht öffnen." -#: ../src/inkscape.cpp:341 +#: ../src/inkscape.cpp:343 msgid "Autosaving documents..." msgstr "Dokument wird automatisch gespeichert…" -#: ../src/inkscape.cpp:412 +#: ../src/inkscape.cpp:414 msgid "Autosave failed! Could not find inkscape extension to save document." msgstr "" "Automatisches Speichern fehlgeschlagen! Inkscape-Endung konnte nicht " "gefunden werden." -#: ../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 "" "Automatisches Speichern fehlgeschlagen! Datei %s konnte nicht gespeichert " "werden." -#: ../src/inkscape.cpp:437 +#: ../src/inkscape.cpp:439 msgid "Autosave complete." msgstr "Automatisches Speichern abgeschlossen." -#: ../src/inkscape.cpp:683 +#: ../src/inkscape.cpp:685 msgid "Untitled document" msgstr "Unbenanntes Dokument" #. Show nice dialog box -#: ../src/inkscape.cpp:715 +#: ../src/inkscape.cpp:717 msgid "Inkscape encountered an internal error and will close now.\n" msgstr "" "Inkscape ist auf einen internen Fehler gestoßen und wird nun geschlossen.\n" -#: ../src/inkscape.cpp:716 +#: ../src/inkscape.cpp:718 msgid "" "Automatic backups of unsaved documents were done to the following " "locations:\n" @@ -9058,75 +9058,75 @@ msgstr "" "Unter folgenden Speicherorten wurden automatische Sicherungskopien nicht " "gespeicherter Dokumente angelegt:\n" -#: ../src/inkscape.cpp:717 +#: ../src/inkscape.cpp:719 msgid "Automatic backup of the following documents failed:\n" msgstr "" "Anlegen von automatischen Sicherungskopien folgender Dokumente " "fehlgeschlagen:\n" -#: ../src/interface.cpp:921 +#: ../src/interface.cpp:866 msgctxt "Interface setup" msgid "Default" msgstr "Vorgabe" -#: ../src/interface.cpp:921 +#: ../src/interface.cpp:866 msgid "Default interface setup" msgstr "Standard Schnittstellen-Setup" -#: ../src/interface.cpp:922 +#: ../src/interface.cpp:867 msgctxt "Interface setup" msgid "Custom" msgstr "Benutzerdefiniert" -#: ../src/interface.cpp:922 +#: ../src/interface.cpp:867 msgid "Setup for custom task" msgstr "Setup für benutzerdefinierte Aufgabe" -#: ../src/interface.cpp:923 +#: ../src/interface.cpp:868 msgctxt "Interface setup" msgid "Wide" msgstr "Breit" -#: ../src/interface.cpp:923 +#: ../src/interface.cpp:868 msgid "Setup for widescreen work" msgstr "Setup für die Breitbild-Arbeit" -#: ../src/interface.cpp:1035 +#: ../src/interface.cpp:980 #, c-format msgid "Verb \"%s\" Unknown" msgstr "Verb \"%s\" unbekannt" -#: ../src/interface.cpp:1077 +#: ../src/interface.cpp:1022 msgid "Open _Recent" msgstr "Zuletzt _geöffnete Dateien" # !!! correct? -#: ../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 "Farbe ablegen" -#: ../src/interface.cpp:1224 ../src/interface.cpp:1334 +#: ../src/interface.cpp:1169 ../src/interface.cpp:1279 msgid "Drop color on gradient" msgstr "Keine Zwischenfarben im Farbverlauf" -#: ../src/interface.cpp:1387 +#: ../src/interface.cpp:1332 msgid "Could not parse SVG data" msgstr "SVG-Daten konnten nicht analysiert werden" -#: ../src/interface.cpp:1426 +#: ../src/interface.cpp:1371 msgid "Drop SVG" msgstr "SVG ablegen" -#: ../src/interface.cpp:1439 +#: ../src/interface.cpp:1384 msgid "Drop Symbol" msgstr "Symbol fallenlassen" -#: ../src/interface.cpp:1470 +#: ../src/interface.cpp:1415 msgid "Drop bitmap image" msgstr "Bitmap-Bild ablegen" -#: ../src/interface.cpp:1562 +#: ../src/interface.cpp:1507 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">A file named \"%s\" already exists. Do " @@ -9140,160 +9140,160 @@ msgstr "" "Die Datei existiert bereits in »%s«. Sie zu ersetzen wird ihren Inhalt " "überschreiben." -#: ../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 "Ersetzen" -#: ../src/interface.cpp:1638 +#: ../src/interface.cpp:1583 msgid "Go to parent" msgstr "Zum übergeordneten Objekt gehen" #. 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 "Gruppe #%1 beitreten" #. Item dialog -#: ../src/interface.cpp:1818 ../src/verbs.cpp:2797 +#: ../src/interface.cpp:1736 ../src/verbs.cpp:2797 msgid "_Object Properties..." msgstr "Objekt_eigenschaften…" -#: ../src/interface.cpp:1827 +#: ../src/interface.cpp:1745 msgid "_Select This" msgstr "_Dies auswählen" -#: ../src/interface.cpp:1838 +#: ../src/interface.cpp:1756 msgid "Select Same" msgstr "Das Gleiche auswählen" #. Select same fill and stroke -#: ../src/interface.cpp:1848 +#: ../src/interface.cpp:1766 msgid "Fill and Stroke" msgstr "Füllung und _Kontur" #. Select same fill color -#: ../src/interface.cpp:1855 +#: ../src/interface.cpp:1773 msgid "Fill Color" msgstr "Füllfarbe" #. Select same stroke color -#: ../src/interface.cpp:1862 +#: ../src/interface.cpp:1780 msgid "Stroke Color" msgstr "Konturfarbe" #. Select same stroke style -#: ../src/interface.cpp:1869 +#: ../src/interface.cpp:1787 msgid "Stroke Style" msgstr "Muster der Kontur" #. Select same stroke style -#: ../src/interface.cpp:1876 +#: ../src/interface.cpp:1794 msgid "Object type" msgstr "Objekttyp" #. Move to layer -#: ../src/interface.cpp:1883 +#: ../src/interface.cpp:1801 msgid "_Move to layer ..." msgstr "Verschiebe zu Ebene..." #. Create link -#: ../src/interface.cpp:1893 +#: ../src/interface.cpp:1811 msgid "Create _Link" msgstr "_Verknüpfung erzeugen" #. Set mask -#: ../src/interface.cpp:1916 +#: ../src/interface.cpp:1834 msgid "Set Mask" msgstr "Maskierung setzen" #. Release mask -#: ../src/interface.cpp:1927 +#: ../src/interface.cpp:1845 msgid "Release Mask" msgstr "Maskierung entfernen" #. Set Clip -#: ../src/interface.cpp:1938 +#: ../src/interface.cpp:1856 msgid "Set Cl_ip" msgstr "_Clip setzen" #. Release Clip -#: ../src/interface.cpp:1949 +#: ../src/interface.cpp:1867 msgid "Release C_lip" msgstr "C_lip lösen" #. Group -#: ../src/interface.cpp:1960 ../src/verbs.cpp:2436 +#: ../src/interface.cpp:1878 ../src/verbs.cpp:2436 msgid "_Group" msgstr "_Gruppieren" -#: ../src/interface.cpp:2031 +#: ../src/interface.cpp:1949 msgid "Create link" msgstr "Verknüpfung erzeugen" #. Ungroup -#: ../src/interface.cpp:2062 ../src/verbs.cpp:2438 +#: ../src/interface.cpp:1980 ../src/verbs.cpp:2438 msgid "_Ungroup" msgstr "Grupp_ierung aufheben" #. Link dialog -#: ../src/interface.cpp:2087 +#: ../src/interface.cpp:2005 msgid "Link _Properties..." msgstr "Verknüpfungseigenschaften..." #. Select item -#: ../src/interface.cpp:2093 +#: ../src/interface.cpp:2011 msgid "_Follow Link" msgstr "Verknüpfung _folgen" #. Reset transformations -#: ../src/interface.cpp:2099 +#: ../src/interface.cpp:2017 msgid "_Remove Link" msgstr "Verknüpfung en_tfernen" -#: ../src/interface.cpp:2130 +#: ../src/interface.cpp:2048 msgid "Remove link" msgstr "Verknüpfung en_tfernen" #. Image properties -#: ../src/interface.cpp:2141 +#: ../src/interface.cpp:2059 msgid "Image _Properties..." msgstr "Bildeigenschaften..." #. Edit externally -#: ../src/interface.cpp:2147 +#: ../src/interface.cpp:2065 msgid "Edit Externally..." msgstr "Extern bearbeiten…" #. 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 "Bitmap _vektorisieren…" -#: ../src/interface.cpp:2166 +#: ../src/interface.cpp:2084 msgctxt "Context menu" msgid "Embed Image" msgstr "Bild einbetten" -#: ../src/interface.cpp:2177 +#: ../src/interface.cpp:2095 msgctxt "Context menu" msgid "Extract Image..." msgstr "Bild extrahieren..." #. 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 "Füllung und _Kontur…" #. Edit Text dialog -#: ../src/interface.cpp:2342 ../src/verbs.cpp:2777 +#: ../src/interface.cpp:2260 ../src/verbs.cpp:2777 msgid "_Text and Font..." msgstr "_Schrift und Text…" #. Spellcheck dialog -#: ../src/interface.cpp:2348 ../src/verbs.cpp:2785 +#: ../src/interface.cpp:2266 ../src/verbs.cpp:2785 msgid "Check Spellin_g..." msgstr "Rechtschreibprüfun_g..." @@ -9362,9 +9362,10 @@ msgid "Dockitem which 'owns' this grip" msgstr "Dockobjekt, das diesen Griff \"besitzt\"" #. 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 "Ausrichtung" @@ -9510,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:1912 +#: ../src/widgets/desktop-widget.cpp:1919 #: ../share/extensions/voronoi2svg.inx.h:9 msgid "Page" msgstr "Seite" @@ -9520,7 +9521,7 @@ msgid "The index of the current page" msgstr "Aktuelle Seitenzahl" #: ../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 @@ -9705,8 +9706,8 @@ msgstr "" msgid "Dockitem which 'owns' this tablabel" msgstr "Dock-Objekt, dem dieser Tabbezeichner \"gehört\"." -#: ../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 "Schwebend." @@ -9747,7 +9748,7 @@ msgstr "Y-Koordinate eines schwebenden Docks" msgid "Dock #%d" msgstr "Andocken #%d" -#: ../src/libnrtype/FontFactory.cpp:909 +#: ../src/libnrtype/FontFactory.cpp:955 msgid "Ignoring font without family that will crash Pango" msgstr "" "Schrift ohne zugehörige Schriftfamilie wird ignoriert, damit Pango nicht " @@ -10813,7 +10814,7 @@ msgid "How many construction lines (tangents) to draw" msgstr "Wie viele Konstruktionslinien (Tangenten) gezeichnet werden sollen" #: ../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 "Skalierung:" @@ -11090,7 +11091,7 @@ msgid "The ID of the object to export" msgstr "Kennung des zu exportierenden Objektes" #: ../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 "Kennung" @@ -11686,7 +11687,7 @@ msgstr "Klecksig" msgid "Tracing" msgstr "Nachzeichnen" -#: ../src/preferences.cpp:131 +#: ../src/preferences.cpp:132 msgid "" "Inkscape will run with default settings, and new settings will not be saved. " msgstr "" @@ -11696,7 +11697,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 "Kann Profilverzeichnis %s nicht anlegen." @@ -11704,7 +11705,7 @@ msgstr "Kann Profilverzeichnis %s nicht anlegen." #. 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 "%s ist kein gültiges Verzeichnis." @@ -11712,27 +11713,27 @@ msgstr "%s ist kein gültiges Verzeichnis." #. 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 "Fehler beim Erstellen der Einstellungs-Datei %s." -#: ../src/preferences.cpp:211 +#: ../src/preferences.cpp:212 #, c-format msgid "The preferences file %s is not a regular file." msgstr "Die Einstellungs-Datei %s ist keine reguläre Datei." -#: ../src/preferences.cpp:221 +#: ../src/preferences.cpp:222 #, c-format msgid "The preferences file %s could not be read." msgstr "Datei %s konnte nicht gelesen werden." -#: ../src/preferences.cpp:232 +#: ../src/preferences.cpp:233 #, c-format msgid "The preferences file %s is not a valid XML document." msgstr "Die Vorgabendatei %s is kein gültiges XML-Dokument" -#: ../src/preferences.cpp:241 +#: ../src/preferences.cpp:242 #, c-format msgid "The file %s is not a valid Inkscape preferences file." msgstr "%s ist keine gültige Einstellungsdatei." @@ -11858,7 +11859,7 @@ msgstr "Beziehung:" msgid "Unique URI to a related document" msgstr "Eindeutige URI zu einem verwandten Dokument." -#: ../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 "Sprache:" @@ -12056,7 +12057,7 @@ msgstr "Es wurde <b>nichts</b> gelöscht." #: ../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 @@ -12173,7 +12174,7 @@ msgid "Select <b>object(s)</b> to remove filters from." msgstr "<b>Text</b> auswählen, um Filter zu entfernen." #: ../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 "Filter entfernen" @@ -12496,7 +12497,7 @@ msgstr "Kreis" #. 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 "Ellipse" @@ -12523,13 +12524,13 @@ msgstr "Linienzug" #. Rectangle #: ../src/selection-describer.cpp:65 -#: ../src/ui/dialog/inkscape-preferences.cpp:393 +#: ../src/ui/dialog/inkscape-preferences.cpp:394 msgid "Rectangle" msgstr "Rechteck" #. 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 "3D-Box" @@ -12552,14 +12553,14 @@ msgstr "Pfadversatz" #. 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 "Spirale" #. 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 "Stern" @@ -13101,74 +13102,74 @@ msgstr "" "Eines der ausgewählten Objekte ist <b>kein Pfad</b>. Boole'sche Operation " "wird nicht ausgeführt." -#: ../src/splivarot.cpp:907 +#: ../src/splivarot.cpp:910 msgid "Select <b>stroked path(s)</b> to convert stroke to path." msgstr "" "<b>Pfade mit Kontur</b> auswählen, um die Konturlinie in einen Pfad " "umzuwandeln." -#: ../src/splivarot.cpp:1260 +#: ../src/splivarot.cpp:1263 msgid "Convert stroke to path" msgstr "Kontur in Pfad umwandeln" #. 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 "<b>Keine Pfade mit Konturlinien</b> in der Auswahl." -#: ../src/splivarot.cpp:1334 +#: ../src/splivarot.cpp:1337 msgid "Selected object is <b>not a path</b>, cannot inset/outset." msgstr "" "Ausgewähltes Objekt ist <b>kein Pfad</b> - kann es nicht schrumpfen/" "erweitern." -#: ../src/splivarot.cpp:1460 ../src/splivarot.cpp:1525 +#: ../src/splivarot.cpp:1463 ../src/splivarot.cpp:1528 msgid "Create linked offset" msgstr "Verbundenen Versatz erzeugen" -#: ../src/splivarot.cpp:1461 ../src/splivarot.cpp:1526 +#: ../src/splivarot.cpp:1464 ../src/splivarot.cpp:1529 msgid "Create dynamic offset" msgstr "Dynamischen Versatz erzeugen" -#: ../src/splivarot.cpp:1551 +#: ../src/splivarot.cpp:1554 msgid "Select <b>path(s)</b> to inset/outset." msgstr "<b>Pfad</b> zum Schrumpfen/Erweitern auswählen." -#: ../src/splivarot.cpp:1764 +#: ../src/splivarot.cpp:1767 msgid "Outset path" msgstr "Pfad erweitern" -#: ../src/splivarot.cpp:1764 +#: ../src/splivarot.cpp:1767 msgid "Inset path" msgstr "Pfad schrumpfen" -#: ../src/splivarot.cpp:1766 +#: ../src/splivarot.cpp:1769 msgid "<b>No paths</b> to inset/outset in the selection." msgstr "Die Auswahl enthält <b>keine Pfade</b> zum Schrumpfen/Erweitern." -#: ../src/splivarot.cpp:1928 +#: ../src/splivarot.cpp:1931 msgid "Simplifying paths (separately):" msgstr "Vereinfache Pfade (getrennt):" -#: ../src/splivarot.cpp:1930 +#: ../src/splivarot.cpp:1933 msgid "Simplifying paths:" msgstr "Vereinfache Pfade:" -#: ../src/splivarot.cpp:1967 +#: ../src/splivarot.cpp:1970 #, c-format msgid "%s <b>%d</b> of <b>%d</b> paths simplified..." msgstr "%s <b>%d</b> von <b>%d</b> Pfaden vereinfacht…" -#: ../src/splivarot.cpp:1979 +#: ../src/splivarot.cpp:1982 #, c-format msgid "<b>%d</b> paths simplified." msgstr "<b>%d</b> Pfade vereinfacht." -#: ../src/splivarot.cpp:1993 +#: ../src/splivarot.cpp:1996 msgid "Select <b>path(s)</b> to simplify." msgstr "<b>Pfad</b> zum Vereinfachen auswählen." -#: ../src/splivarot.cpp:2009 +#: ../src/splivarot.cpp:2012 msgid "<b>No paths</b> to simplify in the selection." msgstr "Die Auswahl enthält <b>keine Pfade</b> zum Vereinfachen." @@ -13483,7 +13484,7 @@ msgstr "" msgid "Type text" msgstr "Text eingeben" -#: ../src/text-editing.cpp:43 +#: ../src/text-editing.cpp:44 msgid "You cannot edit <b>cloned character data</b>." msgstr "<b>Geklonte Zeichendaten</b> können nicht editiert werden." @@ -14150,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:1920 +#: ../src/widgets/desktop-widget.cpp:1927 #: ../share/extensions/printing_marks.inx.h:18 msgid "Selection" msgstr "Auswahl" @@ -14746,36 +14747,36 @@ msgstr "Vorschau einschalten" #: ../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 "Alle Dateitypen" #: ../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 "Alle Inkscape-Dateien" #: ../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 "Alle Bilder" #: ../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 "Alle Vektorgrafiken" #: ../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 "Alle Bitmaps" @@ -14856,15 +14857,15 @@ msgstr "Kantenglättung" msgid "Destination" msgstr "Ziel" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:416 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:423 msgid "All Executable Files" msgstr "Alle ausführbaren Dateien" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:608 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:615 msgid "Show Preview" msgstr "Zeige Vorschau" -#: ../src/ui/dialog/filedialogimpl-win32.cpp:746 +#: ../src/ui/dialog/filedialogimpl-win32.cpp:753 msgid "No file selected" msgstr "Keine Datei ausgewählt" @@ -15001,95 +15002,95 @@ msgstr "_Filter" msgid "R_ename" msgstr "Umb_enennen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1270 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1269 msgid "Rename filter" msgstr "Filter umbenennen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1307 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1306 msgid "Apply filter" msgstr "Filter anwenden" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1377 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1376 msgid "filter" msgstr "Filter" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1384 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1383 msgid "Add filter" msgstr "Filter hinzufügen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1436 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1435 msgid "Duplicate filter" msgstr "Filter duplizieren" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1535 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1534 msgid "_Effect" msgstr "_Effekt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1544 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1543 msgid "Connections" msgstr "Verbindungen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:1682 +#: ../src/ui/dialog/filter-effects-dialog.cpp:1681 msgid "Remove filter primitive" msgstr "Filterbaustein entfernen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2242 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2226 msgid "Remove merge node" msgstr "Zusammengefassten Knoten löschen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2362 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2346 msgid "Reorder filter primitive" msgstr "Filterbausteine umordnen" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2414 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2398 msgid "Add Effect:" msgstr "Effekt hinzufügen:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2415 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2399 msgid "No effect selected" msgstr "Kein Effekt gewählt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2416 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2400 msgid "No filter selected" msgstr "Kein Filter gewählt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2459 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2443 msgid "Effect parameters" msgstr "Effektparameter" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2460 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2444 msgid "Filter General Settings" msgstr "Allgemeine Filtereinstellungen" #. default x: #. default y: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2516 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2500 msgid "Coordinates:" msgstr "Koordinaten:" -#: ../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 "X-Koordinate der linken Ecke des Ausschnitts, auf den Filter wirkt" -#: ../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 "Y-Koordinate der obere Ecke des Ausschnitts, auf den Filter wirkt" #. default width: #. default height: -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 msgid "Dimensions:" msgstr "Dimensionen:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 msgid "Width of filter effects region" msgstr "Breite des Filtereffekts" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2517 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2501 msgid "Height of filter effects region" msgstr "Höhe des Filtereffekts" -#: ../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 " @@ -15101,23 +15102,23 @@ msgstr "" "für oft verwendete Farboperationen bereitstellen, ohne eine komplette Matrix " "angeben zu müssen." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2524 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2508 msgid "Value(s):" msgstr "Wert(e):" -#: ../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 "Operator:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2540 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2524 msgid "K1:" msgstr "K1:" -#: ../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 " @@ -15127,38 +15128,38 @@ msgstr "" "Formel k1*i1*i2 + k2*i1 + k3*i2 + k4 berechnet, wobei i1 und i2 die Werte " "der Eingangsbildpunkte sind." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2525 msgid "K2:" msgstr "K2:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2542 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2526 msgid "K3:" msgstr "K3:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2543 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2527 msgid "K4:" msgstr "K4:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2530 msgid "Size:" msgstr "Größe:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2530 msgid "width of the convolve matrix" msgstr "Breite der Faltungsmatrix" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2546 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2530 msgid "height of the convolve matrix" msgstr "Höhe der Faltungsmatrix" #. 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 "Target:" -#: ../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." @@ -15166,7 +15167,7 @@ msgstr "" "X-Koordinate des Zielpunktes der Faltung. Die Faltungsmatrix wirkt auf Pixel " "um diesen Punkt herum." -#: ../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." @@ -15175,11 +15176,11 @@ msgstr "" "um diesen Punkt herum." #. 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 "Faltungsmatrix:" -#: ../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 " @@ -15195,11 +15196,11 @@ msgstr "" "(entlang der Richtung der Matrixdiagonalen), während eine Matrix mit " "konstanten Einträgen eine isotrope Unschärfe erzeugt." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2551 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2535 msgid "Divisor:" msgstr "Teiler:" -#: ../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 " @@ -15211,11 +15212,11 @@ msgstr "" "erhalten. Ist der Divisor die Summe der Matrixeinträge, so wird das Ergebnis " "eine gemittelte Farbintensität aufweisen." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2552 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2536 msgid "Bias:" msgstr "Grundwert:" -#: ../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." @@ -15223,11 +15224,11 @@ msgstr "" "Dieser Wert wird zu jeder Komponente hinzu addiert. Dies ergibt eine " "Grundantwort des Filters bei leerer Eingabe." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2537 msgid "Edge Mode:" msgstr "Kanten-Modus:" -#: ../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 " @@ -15237,33 +15238,33 @@ msgstr "" "erweitert wird, damit die Faltungsmatrix bis an die Kanten des Originals " "angewendet werden kann." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2554 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2538 msgid "Preserve Alpha" msgstr "Alphawert beibehalten" -#: ../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 "" "Wenn gesetzt, wird der Alphakanal von diesem Filterbaustein nicht " "beeinflusst." #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2557 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2541 msgid "Diffuse Color:" msgstr "Diffusreflektierende Farbe:" -#: ../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 "Definiert die Farbe der Lichtquelle" -#: ../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 "Oberflächenskalierung:" -#: ../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" @@ -15271,59 +15272,59 @@ msgstr "" "Dieser Wert multipliziert die Oberflächenstruktur, die aus dem Alphakanal " "der Eingabe gewonnen wird." -#: ../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 "Konstante:" -#: ../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 "Diese Größe beeinflusst die Phong-Beleuchtung." -#: ../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 "Größe der Faltungsmatrixeinheit:" -#: ../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 "Dies bestimmt die Stärke des Versatzeffekts." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2565 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2549 msgid "X displacement:" msgstr "X-Verschiebung:" -#: ../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 "Farbkomponente, die den Versatz in X-Richtung bestimmt" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2566 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2550 msgid "Y displacement:" msgstr "Y-Verschiebung:" -#: ../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 "Farbkomponente, die den Versatz in Y-Richtung bestimmt" #. default: black -#: ../src/ui/dialog/filter-effects-dialog.cpp:2569 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2553 msgid "Flood Color:" msgstr "Füllfarbe:" -#: ../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 "Die gesamte Filterregion wird mit dieser Farbe gefüllt." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2573 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2557 msgid "Standard Deviation:" msgstr "Standard Abweichung:" -#: ../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 "Standardabweichung für die Unschärfeoperation" -#: ../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." @@ -15331,67 +15332,67 @@ msgstr "" "Erodieren: \"Verdünnt\" das Eingangsbild.\n" "Weiten:\"Verdickt\" das Eingangsbild." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2583 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2567 msgid "Source of Image:" msgstr "Bild-Quelle:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2586 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2570 msgid "Delta X:" msgstr "Delta X:" -#: ../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 "Um diesen Betrag wird das Eingangsbild nach rechts verschoben." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2587 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2571 msgid "Delta Y:" msgstr "Delta Y:" -#: ../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 "Um diesen Betrag wird das Eingangsbild nach unten verschoben." #. default: white -#: ../src/ui/dialog/filter-effects-dialog.cpp:2590 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2574 msgid "Specular Color:" msgstr "Glanzpunktfarbe:" -#: ../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 "Exponent:" -#: ../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 "Exponent bestimmt Glanzlicht, größer ist \"glänzender\"" -#: ../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 "Zeigt an, ob der Filterbaustein Rauschen oder Turbulenz erzeugt." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2603 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2587 msgid "Base Frequency:" msgstr "Basisfrequenz:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2604 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2588 msgid "Octaves:" msgstr "Oktaven:" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2605 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2589 msgid "Seed:" msgstr "Startwert:" -#: ../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 "Startwert des Pseudozufallsgenerators" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2617 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2601 msgid "Add filter primitive" msgstr "Filterbaustein hinzufügen" -#: ../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." @@ -15399,7 +15400,7 @@ msgstr "" "Der <b>Mischen</b> Filterbaustein sieht 4 Bild-Misch-Modi vor: Screen, " "Multiplizieren, Verdunkeln und Aufhellen." -#: ../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 " @@ -15409,7 +15410,7 @@ msgstr "" "die Farben der gerenderten Pixel an. Dies erlaubt Effekte wie Umwandeln in " "Graustufen, Modifizieren der Sättigung und Änderung des Farbwerts." -#: ../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 " @@ -15421,7 +15422,7 @@ msgstr "" "festzulegender Transferfunktionen. Dies erlaubt Operationen wie Helligkeits- " "und Kontrasteinstellung, Farbbalance und Schwellenwerte." -#: ../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 " @@ -15434,7 +15435,7 @@ msgstr "" "Wesentlichen aus logischen Operationen zwischen den korrespondierenden Pixel-" "Werten der Bilder." -#: ../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, " @@ -15449,7 +15450,7 @@ msgstr "" "allerdings ist der spezialisierte Effekt schneller und von der Auflösung " "unabhängig. " -#: ../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 " @@ -15461,7 +15462,7 @@ msgstr "" "verwendet, um Höheninformationen zu erhalten: opakere Gebiete werden " "angehoben, weniger opake abgesenkt." -#: ../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 " @@ -15473,7 +15474,7 @@ msgstr "" "definiert, woher die Pixel kommen sollen. Klassische Beispiele sind Wirbel- " "und Quetscheffekte." -#: ../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 " @@ -15483,7 +15484,7 @@ msgstr "" "und Opazität. Normalerweise wird dies als Eingang für andere Filter " "verwendet, um so Farben ins Spiel zu bringen." -#: ../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." @@ -15492,7 +15493,7 @@ msgstr "" "Er wird normalerweise zusammen mit dem Filterbaustein Versatz benutzt, um " "abgesetzte Schatten zu erzeugen." -#: ../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." @@ -15500,7 +15501,7 @@ msgstr "" "Der Filterbaustein <b>Bild</b> füllt eine Region mit einem externen Bild " "oder einem anderen Teil des Dokuments." -#: ../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 " @@ -15512,7 +15513,7 @@ msgstr "" "zu den Bausteinen Überblenden im Normalmodus oder Verbund im \"Überlagern\"-" "Modus." -#: ../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 " @@ -15522,7 +15523,7 @@ msgstr "" "\"Weiten\" zur Verfügung. Für einfarbige Objekte wirkt \"Erodieren\" " "ausdünnend und \"Weiten\" verdickend." -#: ../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 " @@ -15533,26 +15534,26 @@ msgstr "" "die sich an einer leicht anderen Position als das eigentliche Objekt " "befinden." -#: ../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 "" -"Die Filterbausteine DiffuseBeleuchtung und <b>Punktlichtbeleuchtung</b> " -"erzeugen \"geprägte\" Schattierungen. Der Alphakanal des Eingangs wird " -"verwendet, um Höheninformationen zu erhalten: opakere Gebiete werden " +"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." -#: ../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 "" "Der Filterbaustein <b>Kacheln</b> belegt einen Bereich mit Kopien einer " "Graphik." -#: ../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 " @@ -15562,11 +15563,11 @@ msgstr "" "Rauschen kann verwendet werden, um natürliche Phänomene wie Wolken, Feuer " "oder Rauch, sowie komplexe Texturen wie Marmor oder Granit nachzubilden." -#: ../src/ui/dialog/filter-effects-dialog.cpp:2713 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2697 msgid "Duplicate filter primitive" msgstr "Filterbaustein duplizieren" -#: ../src/ui/dialog/filter-effects-dialog.cpp:2766 +#: ../src/ui/dialog/filter-effects-dialog.cpp:2750 msgid "Set filter primitive attribute" msgstr "Attribut für Filterbaustein setzen" @@ -16570,31 +16571,31 @@ msgstr "Auswahl" msgid "Selection only or whole document" msgstr "Nur Auswahl oder ganzes Dokument" -#: ../src/ui/dialog/inkscape-preferences.cpp:181 +#: ../src/ui/dialog/inkscape-preferences.cpp:182 msgid "Show selection cue" msgstr "Auswahlmarkierung anzeigen" # !!! Frage? Passiv formulieren? -#: ../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 "" "Sind die ausgewählten Objekte visuell hervorgehoben (wie beim " "Auswahlwerkzeug) " -#: ../src/ui/dialog/inkscape-preferences.cpp:188 +#: ../src/ui/dialog/inkscape-preferences.cpp:189 msgid "Enable gradient editing" msgstr "Farbverlaufs-Editor aktiviert" -#: ../src/ui/dialog/inkscape-preferences.cpp:189 +#: ../src/ui/dialog/inkscape-preferences.cpp:190 msgid "Whether selected objects display gradient editing controls" msgstr "Ausgewählten Objekte zeigen Farbverlaufs-Anfasser an" -#: ../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 "Umwandlung zu Führungslinien nutzt Ecken anstelle von Umrandungsboxen" -#: ../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" @@ -16602,25 +16603,25 @@ msgstr "" "Wird ein Objekt zu Führungslinien umgewandelt, so gelten die tatsächlichen " "Umrisse des Objekts, nicht die rechteckige Umrandung." -#: ../src/ui/dialog/inkscape-preferences.cpp:202 +#: ../src/ui/dialog/inkscape-preferences.cpp:203 msgid "Ctrl+click _dot size:" msgstr "Strg+Klick Punktgröße:" -#: ../src/ui/dialog/inkscape-preferences.cpp:202 +#: ../src/ui/dialog/inkscape-preferences.cpp:203 msgid "times current stroke width" msgstr "(Faktor zur Kontur)" -#: ../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 "" "Größe der Punkte, die durch Strg+Klick erzeugt werden (Relativ zur aktuellen " "Strichdicke)" -#: ../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 "<b>Objekte auswählen</b>, um Stil zu übernehmen." -#: ../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." @@ -16628,23 +16629,23 @@ msgstr "" "<b>Mehr als ein Objekt ausgewählt.</b> Ein Stil kann nicht von mehreren " "Objekten übernommen werden." -#: ../src/ui/dialog/inkscape-preferences.cpp:260 +#: ../src/ui/dialog/inkscape-preferences.cpp:261 msgid "Style of new objects" msgstr "Stil von neuen Objekten" -#: ../src/ui/dialog/inkscape-preferences.cpp:262 +#: ../src/ui/dialog/inkscape-preferences.cpp:263 msgid "Last used style" msgstr "Zuletzt benutzter Stil" -#: ../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 "Stil anwenden, der zuletzt für ein Objekt gesetzt wurde" -#: ../src/ui/dialog/inkscape-preferences.cpp:269 +#: ../src/ui/dialog/inkscape-preferences.cpp:270 msgid "This tool's own style:" msgstr "Stilvorgaben für dieses Werkzeug:" -#: ../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." @@ -16653,65 +16654,65 @@ msgstr "" "angewendet werden. Stilvorgabe mit dem unteren Knopf festlegen." #. style swatch -#: ../src/ui/dialog/inkscape-preferences.cpp:277 +#: ../src/ui/dialog/inkscape-preferences.cpp:278 msgid "Take from selection" msgstr "Aus Auswahl übernehmen" -#: ../src/ui/dialog/inkscape-preferences.cpp:282 +#: ../src/ui/dialog/inkscape-preferences.cpp:283 msgid "This tool's style of new objects" msgstr "Stilvorgaben für dieses Werkzeug für neue Objekte:" -#: ../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 "" "Stil des (ersten) ausgewählten Objektes zur Vorgabe für dieses Werkzeug " "machen" -#: ../src/ui/dialog/inkscape-preferences.cpp:294 +#: ../src/ui/dialog/inkscape-preferences.cpp:295 msgid "Tools" msgstr "Werkzeuge" -#: ../src/ui/dialog/inkscape-preferences.cpp:297 +#: ../src/ui/dialog/inkscape-preferences.cpp:298 msgid "Bounding box to use" msgstr "Zu verwendende Umrandungsbox:" -#: ../src/ui/dialog/inkscape-preferences.cpp:298 +#: ../src/ui/dialog/inkscape-preferences.cpp:299 msgid "Visual bounding box" msgstr "Visuelle Umrandungsbox" -#: ../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 "" "Diese Umrandungsbox berücksichtigt Strichbreiten, Markierungen, Filterränder " "usw." -#: ../src/ui/dialog/inkscape-preferences.cpp:301 +#: ../src/ui/dialog/inkscape-preferences.cpp:302 msgid "Geometric bounding box" msgstr "Geometrische Umrandungsbox" -#: ../src/ui/dialog/inkscape-preferences.cpp:303 +#: ../src/ui/dialog/inkscape-preferences.cpp:304 msgid "This bounding box includes only the bare path" msgstr "Diese Umrandungsbox berücksichtigt nur den reinen Pfad" -#: ../src/ui/dialog/inkscape-preferences.cpp:305 +#: ../src/ui/dialog/inkscape-preferences.cpp:306 msgid "Conversion to guides" msgstr "Umwandlung in Führungslinien" -#: ../src/ui/dialog/inkscape-preferences.cpp:306 +#: ../src/ui/dialog/inkscape-preferences.cpp:307 msgid "Keep objects after conversion to guides" msgstr "Behalte Objekte nach Umwandlung in Führungslinien" -#: ../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 "Objekt bleibt erhalten, wenn es in Führungslinien umgewandelt wird." -#: ../src/ui/dialog/inkscape-preferences.cpp:309 +#: ../src/ui/dialog/inkscape-preferences.cpp:310 msgid "Treat groups as a single object" msgstr "Behandle Gruppen als Einzelobjekte" -#: ../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" @@ -16719,104 +16720,104 @@ msgstr "" "Gruppen werden als Ganzes (statt der Einzelteile) zu Führungslinien " "umgewandelt." -#: ../src/ui/dialog/inkscape-preferences.cpp:313 +#: ../src/ui/dialog/inkscape-preferences.cpp:314 msgid "Average all sketches" msgstr "Durchschnittliche Qualität der Sketche" -#: ../src/ui/dialog/inkscape-preferences.cpp:314 +#: ../src/ui/dialog/inkscape-preferences.cpp:315 msgid "Width is in absolute units" msgstr "Breitenangabe in absoluten Einheiten" -#: ../src/ui/dialog/inkscape-preferences.cpp:315 +#: ../src/ui/dialog/inkscape-preferences.cpp:316 msgid "Select new path" msgstr "Neuen Pfad auswählen" -#: ../src/ui/dialog/inkscape-preferences.cpp:316 +#: ../src/ui/dialog/inkscape-preferences.cpp:317 msgid "Don't attach connectors to text objects" msgstr "Objektverbinder nicht mit Textobjekten verbinden" #. Selector -#: ../src/ui/dialog/inkscape-preferences.cpp:319 +#: ../src/ui/dialog/inkscape-preferences.cpp:320 msgid "Selector" msgstr "Auswahlwerkzeug" -#: ../src/ui/dialog/inkscape-preferences.cpp:324 +#: ../src/ui/dialog/inkscape-preferences.cpp:325 msgid "When transforming, show" msgstr "Zeige beim Transformieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:325 +#: ../src/ui/dialog/inkscape-preferences.cpp:326 msgid "Objects" msgstr "Objekte" -#: ../src/ui/dialog/inkscape-preferences.cpp:327 +#: ../src/ui/dialog/inkscape-preferences.cpp:328 msgid "Show the actual objects when moving or transforming" msgstr "Zeige Objekte mit Inhalt beim Verschieben oder Verändern" -#: ../src/ui/dialog/inkscape-preferences.cpp:328 +#: ../src/ui/dialog/inkscape-preferences.cpp:329 msgid "Box outline" msgstr "Objektumriss" -#: ../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 "Zeige rechteckige Objektumrisse beim Verschieben oder Verändern" -#: ../src/ui/dialog/inkscape-preferences.cpp:331 +#: ../src/ui/dialog/inkscape-preferences.cpp:332 msgid "Per-object selection cue" msgstr "Pro Objekt-Auswahl" -#: ../src/ui/dialog/inkscape-preferences.cpp:334 +#: ../src/ui/dialog/inkscape-preferences.cpp:335 msgid "No per-object selection indication" msgstr "Keine Auswahlmarkierung für Objekte" -#: ../src/ui/dialog/inkscape-preferences.cpp:335 +#: ../src/ui/dialog/inkscape-preferences.cpp:336 msgid "Mark" msgstr "Markierung" -#: ../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 "" "Jedes ausgewählte Objekt hat eine diamantförmige Markierung in der linken " "oberen Ecke" -#: ../src/ui/dialog/inkscape-preferences.cpp:338 +#: ../src/ui/dialog/inkscape-preferences.cpp:339 msgid "Box" msgstr "Umschließendes Rechteck" -#: ../src/ui/dialog/inkscape-preferences.cpp:340 +#: ../src/ui/dialog/inkscape-preferences.cpp:341 msgid "Each selected object displays its bounding box" msgstr "" "Jedes gewählte Objekt zeigt sein umschließendes Rechteck (Umrandungsbox)" #. Node -#: ../src/ui/dialog/inkscape-preferences.cpp:343 +#: ../src/ui/dialog/inkscape-preferences.cpp:344 msgid "Node" msgstr "Knoten" -#: ../src/ui/dialog/inkscape-preferences.cpp:346 +#: ../src/ui/dialog/inkscape-preferences.cpp:347 msgid "Path outline" msgstr "Pfadumriss" -#: ../src/ui/dialog/inkscape-preferences.cpp:347 +#: ../src/ui/dialog/inkscape-preferences.cpp:348 msgid "Path outline color" msgstr "Entwurfspfad Farbe" -#: ../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 "Die Farbe in der der Entwurfspfad angezeigt wird." -#: ../src/ui/dialog/inkscape-preferences.cpp:349 +#: ../src/ui/dialog/inkscape-preferences.cpp:350 msgid "Always show outline" msgstr "Umriss zeigen" -#: ../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 "Zeigt Umrandung aller Pfade an, nicht nur von unsichtbaren Pfaden" -#: ../src/ui/dialog/inkscape-preferences.cpp:351 +#: ../src/ui/dialog/inkscape-preferences.cpp:352 msgid "Update outline when dragging nodes" msgstr "Umriss beim Ziehen von Knoten aktualisieren" -#: ../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" @@ -16825,11 +16826,11 @@ msgstr "" "es deaktiviert ist, wird die Umrandung erst wieder aktualisiert, wenn die " "Aktion abgeschlossen ist." -#: ../src/ui/dialog/inkscape-preferences.cpp:353 +#: ../src/ui/dialog/inkscape-preferences.cpp:354 msgid "Update paths when dragging nodes" msgstr "Pfad beim Ziehen von Knoten aktualisieren" -#: ../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" @@ -16838,11 +16839,11 @@ msgstr "" "deaktiviert ist, wird der Pfad erst aktualisiert, wenn die Aktion " "abgeschlossen ist." -#: ../src/ui/dialog/inkscape-preferences.cpp:355 +#: ../src/ui/dialog/inkscape-preferences.cpp:356 msgid "Show path direction on outlines" msgstr "Zeige die Pfadrichtung an Außenlinine" -#: ../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" @@ -16850,30 +16851,30 @@ msgstr "" "Veranschaulichen Sie die Richtung der ausgewählten Pfade, in dem Sie kleine " "Pfeile in die Mitte jedes Rand-Segments zeichnen." -#: ../src/ui/dialog/inkscape-preferences.cpp:357 +#: ../src/ui/dialog/inkscape-preferences.cpp:358 msgid "Show temporary path outline" msgstr "Zeige temporär Pfadumrandung" -#: ../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 "" "Wenn die Maus über den Pfad bewegt wird, wird dessen Entwurfspfad kurz " "angezeigt." -#: ../src/ui/dialog/inkscape-preferences.cpp:359 +#: ../src/ui/dialog/inkscape-preferences.cpp:360 msgid "Show temporary outline for selected paths" msgstr "Zeige temporär Umrandung für ausgewählte Pfade" -#: ../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 "" "Zeigt temporäre Umrandung an, wenn der Pfad zum Bearbeiten ausgewählt wurde." -#: ../src/ui/dialog/inkscape-preferences.cpp:362 +#: ../src/ui/dialog/inkscape-preferences.cpp:363 msgid "_Flash time:" msgstr "Anzeigedauer" -#: ../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 " @@ -16882,23 +16883,23 @@ msgstr "" "Bestimmt die Dauer der Pfad anzeige (in Millisekunden). Bei 0 wird der " "Entwurfspfad angezeigt bis die Maus den Bereich verlassen hat." -#: ../src/ui/dialog/inkscape-preferences.cpp:363 +#: ../src/ui/dialog/inkscape-preferences.cpp:364 msgid "Editing preferences" msgstr "Einstellungen bearbeiten" -#: ../src/ui/dialog/inkscape-preferences.cpp:364 +#: ../src/ui/dialog/inkscape-preferences.cpp:365 msgid "Show transform handles for single nodes" msgstr "Zeige Anfasser für einzelne Knoten" -#: ../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 "Anfasser anzeigen, wenn nur ein einzelner Knoten ausgewählt ist." -#: ../src/ui/dialog/inkscape-preferences.cpp:366 +#: ../src/ui/dialog/inkscape-preferences.cpp:367 msgid "Deleting nodes preserves shape" msgstr "Knoten löschen, Form beibehalten" -#: ../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" @@ -16907,31 +16908,31 @@ msgstr "" "Origianlform ähnelt; drücken Sie STRG für das andere Verhalten" #. Tweak -#: ../src/ui/dialog/inkscape-preferences.cpp:370 +#: ../src/ui/dialog/inkscape-preferences.cpp:371 msgid "Tweak" msgstr "Modellieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:371 +#: ../src/ui/dialog/inkscape-preferences.cpp:372 msgid "Object paint style" msgstr "Objekt-Farbstil" #. Zoom -#: ../src/ui/dialog/inkscape-preferences.cpp:376 +#: ../src/ui/dialog/inkscape-preferences.cpp:377 #: ../src/widgets/desktop-widget.cpp:632 msgid "Zoom" msgstr "Zoomfaktor" #. 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 "Ausmessen" -#: ../src/ui/dialog/inkscape-preferences.cpp:383 +#: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "Ignore first and last points" msgstr "Ersten und letzen Punkt ignorieren" -#: ../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 " @@ -16942,15 +16943,15 @@ msgstr "" "werden angezeigt." #. Shapes -#: ../src/ui/dialog/inkscape-preferences.cpp:387 +#: ../src/ui/dialog/inkscape-preferences.cpp:388 msgid "Shapes" msgstr "Formen" -#: ../src/ui/dialog/inkscape-preferences.cpp:419 +#: ../src/ui/dialog/inkscape-preferences.cpp:420 msgid "Sketch mode" msgstr "Freihandmodus" -#: ../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" @@ -16959,17 +16960,17 @@ msgstr "" "alte Ergebnis mit der neuen Skizze zu mitteln." #. Pen -#: ../src/ui/dialog/inkscape-preferences.cpp:424 +#: ../src/ui/dialog/inkscape-preferences.cpp:425 #: ../src/ui/dialog/input.cpp:1399 msgid "Pen" msgstr "Füller (Linien & Bézierkurven)" #. Calligraphy -#: ../src/ui/dialog/inkscape-preferences.cpp:430 +#: ../src/ui/dialog/inkscape-preferences.cpp:431 msgid "Calligraphy" msgstr "Kalligrafie" -#: ../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" @@ -16978,7 +16979,7 @@ msgstr "" "unabhängig vom Zoom; ansonsten hängt die Stiftbreite vom Zoom ab, so dass " "sie bei jeder Zoomeinstellung gleich aussieht" -#: ../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)" @@ -16987,27 +16988,27 @@ msgstr "" "(vorherige Auswahl ist nicht mehr aktiv)" #. 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 "Text" -#: ../src/ui/dialog/inkscape-preferences.cpp:444 +#: ../src/ui/dialog/inkscape-preferences.cpp:445 msgid "Show font samples in the drop-down list" msgstr "Zeigt Schriftart-Beispiele in der Auswahl-Liste" -#: ../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 "" "Zeigt Schriftart-Beispiele neben den Schriftartnamen in der Auswahl-Liste " "in der Textleiste" -#: ../src/ui/dialog/inkscape-preferences.cpp:447 +#: ../src/ui/dialog/inkscape-preferences.cpp:448 msgid "Show font substitution warning dialog" msgstr "Zeige Warnungsdialog für Schriftersetzung" -#: ../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" @@ -17017,25 +17018,25 @@ 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 "Texteinheiten" -#: ../src/ui/dialog/inkscape-preferences.cpp:456 +#: ../src/ui/dialog/inkscape-preferences.cpp:457 msgid "Text size unit type:" msgstr "Textgrößen-Einheitstyp:" -#: ../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 "" "Setzt den Typ der Einheit, die in der Text-Werkzeugleiste und in " "Textdialogen verwendet werden" -#: ../src/ui/dialog/inkscape-preferences.cpp:458 +#: ../src/ui/dialog/inkscape-preferences.cpp:459 msgid "Always output text size in pixels (px)" msgstr "Ausgabe-Textgröße immer in Pixeln (px)" -#: ../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" @@ -17044,33 +17045,33 @@ msgstr "" "immer umwandeln" #. Spray -#: ../src/ui/dialog/inkscape-preferences.cpp:464 +#: ../src/ui/dialog/inkscape-preferences.cpp:465 msgid "Spray" msgstr "Spray" # Name des Effekte-submenü, das alle Bitmap-Effekte beinhaltet. #. Eraser -#: ../src/ui/dialog/inkscape-preferences.cpp:469 +#: ../src/ui/dialog/inkscape-preferences.cpp:470 msgid "Eraser" msgstr "Radierer" #. Paint Bucket -#: ../src/ui/dialog/inkscape-preferences.cpp:473 +#: ../src/ui/dialog/inkscape-preferences.cpp:474 msgid "Paint Bucket" msgstr "Farbeimer" #. 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 "Farbverlauf" -#: ../src/ui/dialog/inkscape-preferences.cpp:480 +#: ../src/ui/dialog/inkscape-preferences.cpp:481 msgid "Prevent sharing of gradient definitions" msgstr "Keine gemeinsamen Verlaufdefinitionen " -#: ../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 " @@ -17080,11 +17081,11 @@ msgstr "" "sobald einer geändert wird. Andernfalls werden bei der Änderung eines " "Verlaufes sämtliche Objekte mit dem gleichen Verlauf ebenfalls geändert." -#: ../src/ui/dialog/inkscape-preferences.cpp:483 +#: ../src/ui/dialog/inkscape-preferences.cpp:484 msgid "Use legacy Gradient Editor" msgstr "Nutze den alten Farbverlaufs-Editor" -#: ../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" @@ -17093,11 +17094,11 @@ msgstr "" "Kontur Dialog den alten Verlaufs-Editor Dialog, wenn ausgeschaltet, wird das " "Verlaufswerkzeug verwendet." -#: ../src/ui/dialog/inkscape-preferences.cpp:488 +#: ../src/ui/dialog/inkscape-preferences.cpp:489 msgid "Linear gradient _angle:" msgstr "Winkel des linearen Farbverlaufs" -#: ../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 "" @@ -17105,331 +17106,331 @@ msgstr "" "im Uhrzeigersinn)" #. Dropper -#: ../src/ui/dialog/inkscape-preferences.cpp:493 +#: ../src/ui/dialog/inkscape-preferences.cpp:494 msgid "Dropper" msgstr "Farbpipette" #. Connector -#: ../src/ui/dialog/inkscape-preferences.cpp:498 +#: ../src/ui/dialog/inkscape-preferences.cpp:499 msgid "Connector" msgstr "Objektverbinder" -#: ../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 "" "Wenn eingeschaltet, dann werden die Einrastpunkte nicht für Textobjekte " "angezeigt" -#: ../src/ui/dialog/inkscape-preferences.cpp:511 +#: ../src/ui/dialog/inkscape-preferences.cpp:512 msgid "Interface" msgstr "Benutzeroberfläche" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "System default" msgstr "Standardeinstellungen" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Albanian (sq)" msgstr "Albanisch (sq)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Amharic (am)" msgstr "Amharisch (am)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Arabic (ar)" msgstr "Arabisch (ar)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Armenian (hy)" msgstr "Armenisch (hy)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Azerbaijani (az)" msgstr "Aserbeidschanisch (az)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Basque (eu)" msgstr "Baskisch (eu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:514 +#: ../src/ui/dialog/inkscape-preferences.cpp:515 msgid "Belarusian (be)" msgstr "Belorussisch (be)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Bulgarian (bg)" msgstr "Bulgarisch (bg)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Bengali (bn)" msgstr "Bengalesisch (bn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Bengali/Bangladesh (bn_BD)" msgstr "Bengalesisch (bn_BD)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Breton (br)" msgstr "Bretonisch (br)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Catalan (ca)" msgstr "Katalanisch (ca)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Valencian Catalan (ca@valencia)" msgstr "Valencianisches Katalan (ca@valencia)" -#: ../src/ui/dialog/inkscape-preferences.cpp:515 +#: ../src/ui/dialog/inkscape-preferences.cpp:516 msgid "Chinese/China (zh_CN)" msgstr "Chinesisch/china (zh_CN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Chinese/Taiwan (zh_TW)" msgstr "Chinesisch/Taiwan (zh_TW)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Croatian (hr)" msgstr "Kroatisch (hr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:516 +#: ../src/ui/dialog/inkscape-preferences.cpp:517 msgid "Czech (cs)" msgstr "Tschechisch (cs)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Danish (da)" msgstr "Dänisch (da)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Dutch (nl)" msgstr "Niderländisch (nl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Dzongkha (dz)" msgstr "Dzongkha (dz)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "German (de)" msgstr "Deutsch (de)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "Greek (el)" msgstr "Griechisch (el)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "English (en)" msgstr "Englisch (en)" -#: ../src/ui/dialog/inkscape-preferences.cpp:517 +#: ../src/ui/dialog/inkscape-preferences.cpp:518 msgid "English/Australia (en_AU)" msgstr "Englisch/Australien (en_AU)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "English/Canada (en_CA)" msgstr "Englisch/Kanada (en_CA)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "English/Great Britain (en_GB)" msgstr "Englisch/Großbritannien (en_GB)" -#: ../src/ui/dialog/inkscape-preferences.cpp:518 +#: ../src/ui/dialog/inkscape-preferences.cpp:519 msgid "Pig Latin (en_US@piglatin)" msgstr "Pig Latin (en_US@piglatin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Esperanto (eo)" msgstr "Esperanto (eo)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Estonian (et)" msgstr "Estnisch (et)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Farsi (fa)" msgstr "Farsi (fa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:519 +#: ../src/ui/dialog/inkscape-preferences.cpp:520 msgid "Finnish (fi)" msgstr "Finnisch (fi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "French (fr)" msgstr "Französisch (fr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Irish (ga)" msgstr "Irisch (ga)" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Galician (gl)" msgstr "Galizisch (gl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Hebrew (he)" msgstr "Hebräisch (he)" -#: ../src/ui/dialog/inkscape-preferences.cpp:520 +#: ../src/ui/dialog/inkscape-preferences.cpp:521 msgid "Hungarian (hu)" msgstr "Ungarisch (hu)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Indonesian (id)" msgstr "Indonesisch (id)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Italian (it)" msgstr "Italienisch (it)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Japanese (ja)" msgstr "Japanisch (ja)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Khmer (km)" msgstr "Khmer (km)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Kinyarwanda (rw)" msgstr "Kinyarwanda (rw)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Korean (ko)" msgstr "Koreanisch (ko)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Lithuanian (lt)" msgstr "Litauisch (lt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Latvian (lv)" msgstr "Lettisch (lv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:521 +#: ../src/ui/dialog/inkscape-preferences.cpp:522 msgid "Macedonian (mk)" msgstr "Mazedonisch (mk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Mongolian (mn)" msgstr "Mongolisch (mn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Nepali (ne)" msgstr "Nepalesisch (ne)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Norwegian Bokmål (nb)" msgstr "Norwegisch/Bokmål (nb)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Norwegian Nynorsk (nn)" msgstr "Norwegisch/Nynorsk (nn)" -#: ../src/ui/dialog/inkscape-preferences.cpp:522 +#: ../src/ui/dialog/inkscape-preferences.cpp:523 msgid "Panjabi (pa)" msgstr "Panjabi (pa)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Polish (pl)" msgstr "Polnisch (pl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Portuguese (pt)" msgstr "Portugisisch(pt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Portuguese/Brazil (pt_BR)" msgstr "Portugisisch/Brasilien (pt_BR)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Romanian (ro)" msgstr "Rumänisch (ro)" -#: ../src/ui/dialog/inkscape-preferences.cpp:523 +#: ../src/ui/dialog/inkscape-preferences.cpp:524 msgid "Russian (ru)" msgstr "Russisch (ru)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Serbian (sr)" msgstr "Serbisch (sr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Serbian in Latin script (sr@latin)" msgstr "Serbisch in lateinischer Schrift (sr@latin)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Slovak (sk)" msgstr "Slovakisch (sk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Slovenian (sl)" msgstr "Slovenisch (sl)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Spanish (es)" msgstr "Spanisch (es)" -#: ../src/ui/dialog/inkscape-preferences.cpp:524 +#: ../src/ui/dialog/inkscape-preferences.cpp:525 msgid "Spanish/Mexico (es_MX)" msgstr "Spanisch/Mexico (es_MX)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Swedish (sv)" msgstr "Schwedisch (sv)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Telugu (te_IN)" msgstr "Telugu (te_IN)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Thai (th)" msgstr "Thai (th)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Turkish (tr)" msgstr "Türkisch (tr)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Ukrainian (uk)" msgstr "Ukrainisch (uk)" -#: ../src/ui/dialog/inkscape-preferences.cpp:525 +#: ../src/ui/dialog/inkscape-preferences.cpp:526 msgid "Vietnamese (vi)" msgstr "Vietnamesisch (vi)" -#: ../src/ui/dialog/inkscape-preferences.cpp:557 +#: ../src/ui/dialog/inkscape-preferences.cpp:558 msgid "Language (requires restart):" msgstr "Sprache (erfordert Neustart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:558 +#: ../src/ui/dialog/inkscape-preferences.cpp:559 msgid "Set the language for menus and number formats" msgstr "Sprache für Menüs und Zahlenformate setzen" -#: ../src/ui/dialog/inkscape-preferences.cpp:561 +#: ../src/ui/dialog/inkscape-preferences.cpp:562 msgid "Large" msgstr "Groß" -#: ../src/ui/dialog/inkscape-preferences.cpp:561 +#: ../src/ui/dialog/inkscape-preferences.cpp:562 msgid "Small" msgstr "Klein" -#: ../src/ui/dialog/inkscape-preferences.cpp:561 +#: ../src/ui/dialog/inkscape-preferences.cpp:562 msgid "Smaller" msgstr "Kleiner" # !!! called "Commands Bar" in other places -#: ../src/ui/dialog/inkscape-preferences.cpp:565 +#: ../src/ui/dialog/inkscape-preferences.cpp:566 msgid "Toolbox icon size:" msgstr "Symbolgröße in der Werkzeugleiste" -#: ../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 "Größe der Werkzeugsymbole verändern (erfordert Neustart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:569 +#: ../src/ui/dialog/inkscape-preferences.cpp:570 msgid "Control bar icon size:" msgstr "Symbolgröße in Einstellungsleiste" -#: ../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 "" @@ -17437,22 +17438,22 @@ msgstr "" "Neustart)" # !!! called "Commands Bar" in other places -#: ../src/ui/dialog/inkscape-preferences.cpp:573 +#: ../src/ui/dialog/inkscape-preferences.cpp:574 msgid "Secondary toolbar icon size:" msgstr "Symbolgröße in zweiter Werkzeugleiste" -#: ../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 "" "Bestimmt die Größe der Piktogramme in untergeordneten Werkzeugleisten " "(erfordert Neustart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:577 +#: ../src/ui/dialog/inkscape-preferences.cpp:578 msgid "Work-around color sliders not drawing" msgstr "Abhilfe für nicht gezeichnete Farb-Schieberegler" -#: ../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" @@ -17460,26 +17461,26 @@ msgstr "" "Wenn gewählt, wird versucht, den Fehler bzgl. nicht gezeichneter Farb-" "Schieberegler in manchen GTK-Themen zu umgehen." -#: ../src/ui/dialog/inkscape-preferences.cpp:584 +#: ../src/ui/dialog/inkscape-preferences.cpp:585 msgid "Clear list" msgstr "Liste löschen" -#: ../src/ui/dialog/inkscape-preferences.cpp:587 +#: ../src/ui/dialog/inkscape-preferences.cpp:588 msgid "Maximum documents in Open _Recent:" msgstr "Länge der \"letzte Dokumente\"-Liste:" -#: ../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 "" "Die maximale Länge der Liste zuletzt geöffneter Dokumente im Menü »Datei«" -#: ../src/ui/dialog/inkscape-preferences.cpp:591 +#: ../src/ui/dialog/inkscape-preferences.cpp:592 msgid "_Zoom correction factor (in %):" msgstr "_Zoom Korrektur (in %)" -#: ../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 " @@ -17489,11 +17490,11 @@ msgstr "" "Bildschirm der echten Größe entspricht. Diese Information wird genutzt, um " "beim Zoom auf 1:1, 1:2, usw. das Objekt in realistischen Größen darzustellen." -#: ../src/ui/dialog/inkscape-preferences.cpp:595 +#: ../src/ui/dialog/inkscape-preferences.cpp:596 msgid "Enable dynamic relayout for incomplete sections" msgstr "Dynamischer Neu-Entwurf für unvollständige Abschnitte" -#: ../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" @@ -17502,11 +17503,11 @@ msgstr "" "Komponenten, die noch nicht komplett beendet sind." #. show infobox -#: ../src/ui/dialog/inkscape-preferences.cpp:600 +#: ../src/ui/dialog/inkscape-preferences.cpp:601 msgid "Show filter primitives infobox" msgstr "Zeigt Informationen zu den Filterbausteinen" -#: ../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" @@ -17514,70 +17515,108 @@ msgstr "" "Zeigt Symbole und Beschreibungen für die verfügbaren Filterbausteine im " "Filtereffektdialog." +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:614 +msgid "Icons only" +msgstr "nur Symbole" + +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:614 +msgid "Text only" +msgstr "nur Text" + +#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:614 +msgid "Icons and text" +msgstr "Symbole und Text" + +#: ../src/ui/dialog/inkscape-preferences.cpp:611 +msgid "Dockbar style (requires restart):" +msgstr "Dockleistenstil (erfordert Neustart)" + +#: ../src/ui/dialog/inkscape-preferences.cpp:612 +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" + +#: ../src/ui/dialog/inkscape-preferences.cpp:619 +msgid "Switcher style (requires restart):" +msgstr "Stil des Umschalters (erfordert Neustart):" + +#: ../src/ui/dialog/inkscape-preferences.cpp:620 +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" + #. 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 "Fenstergeometrie für jedes Dokument speichern und wiederherstellen" -#: ../src/ui/dialog/inkscape-preferences.cpp:606 +#: ../src/ui/dialog/inkscape-preferences.cpp:625 msgid "Remember and use last window's geometry" msgstr "Geometrie des letzten Fensters merken und verwenden" -#: ../src/ui/dialog/inkscape-preferences.cpp:607 +#: ../src/ui/dialog/inkscape-preferences.cpp:626 msgid "Don't save window geometry" msgstr "Fenstergeometrie nicht speichern" -#: ../src/ui/dialog/inkscape-preferences.cpp:609 +#: ../src/ui/dialog/inkscape-preferences.cpp:628 msgid "Save and restore dialogs status" msgstr "Speichern und Wiederherstellen von Dialog-Status" -#: ../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 "Dialogstatus nicht speichern" -#: ../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 "Andockbar" -#: ../src/ui/dialog/inkscape-preferences.cpp:616 +#: ../src/ui/dialog/inkscape-preferences.cpp:635 msgid "Native open/save dialogs" msgstr "Ursprüngliche Öffnen/Speichern-Dialoge" -#: ../src/ui/dialog/inkscape-preferences.cpp:617 +#: ../src/ui/dialog/inkscape-preferences.cpp:636 msgid "GTK open/save dialogs" msgstr "GTk Öffnen/Speichern-Dialog" -#: ../src/ui/dialog/inkscape-preferences.cpp:619 +#: ../src/ui/dialog/inkscape-preferences.cpp:638 msgid "Dialogs are hidden in taskbar" msgstr "Dialoge werden in der Fensterliste nicht angezeigt" -#: ../src/ui/dialog/inkscape-preferences.cpp:620 +#: ../src/ui/dialog/inkscape-preferences.cpp:639 msgid "Save and restore documents viewport" msgstr "Fenstergeometrie für jedes Dokument speichern und wiederherstellen" -#: ../src/ui/dialog/inkscape-preferences.cpp:621 +#: ../src/ui/dialog/inkscape-preferences.cpp:640 msgid "Zoom when window is resized" msgstr "Zeichnungsgröße ändern, wenn die Fenstergröße verändert wird" -#: ../src/ui/dialog/inkscape-preferences.cpp:622 +#: ../src/ui/dialog/inkscape-preferences.cpp:641 msgid "Show close button on dialogs" msgstr "Schließknöpfe in Dialogen zeigen" -#: ../src/ui/dialog/inkscape-preferences.cpp:625 +#: ../src/ui/dialog/inkscape-preferences.cpp:644 msgid "Aggressive" msgstr "Aggressiv" -#: ../src/ui/dialog/inkscape-preferences.cpp:627 +#: ../src/ui/dialog/inkscape-preferences.cpp:646 msgid "Saving window geometry (size and position)" msgstr "Fenstergeometrie speichern (Größe und Position):" -#: ../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 "Dem Fenstermanager die Platzierung aller Fenster entscheiden lassen" -#: ../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)" @@ -17585,7 +17624,7 @@ msgstr "" "Geometrie des letzten Fensters merken und verwenden (speichert Geometrie in " "Benutzereinstellungen)" -#: ../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)" @@ -17593,11 +17632,11 @@ msgstr "" "Fenstergeometrie für jedes Dokument speichern und wiederherstellen " "(speichert Geometrie im Dokument)" -#: ../src/ui/dialog/inkscape-preferences.cpp:635 +#: ../src/ui/dialog/inkscape-preferences.cpp:654 msgid "Saving dialogs status" msgstr "Speichere Dialogstatud" -#: ../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)" @@ -17605,64 +17644,64 @@ msgstr "" "Speichern und Wiederherstellen von Dialog-Status (die letzten offenen " "Fenster Dialoge werden gespeichert, wenn sie geschlossen werden)" -#: ../src/ui/dialog/inkscape-preferences.cpp:643 +#: ../src/ui/dialog/inkscape-preferences.cpp:662 msgid "Dialog behavior (requires restart)" msgstr "Dialogfensterverhalten (erfordert Neustart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:649 +#: ../src/ui/dialog/inkscape-preferences.cpp:668 msgid "Desktop integration" msgstr "Desktopintegration" -#: ../src/ui/dialog/inkscape-preferences.cpp:651 +#: ../src/ui/dialog/inkscape-preferences.cpp:670 msgid "Use Windows like open and save dialogs" msgstr "Nutze Windows-artige Öffnen- und Speichern-Dialoge" -#: ../src/ui/dialog/inkscape-preferences.cpp:653 +#: ../src/ui/dialog/inkscape-preferences.cpp:672 msgid "Use GTK open and save dialogs " msgstr "Nutze GTK-Öffnen- und Speichern-Dialoge" -#: ../src/ui/dialog/inkscape-preferences.cpp:657 +#: ../src/ui/dialog/inkscape-preferences.cpp:676 msgid "Dialogs on top:" msgstr "Dialoge im Vordergrund:" -#: ../src/ui/dialog/inkscape-preferences.cpp:660 +#: ../src/ui/dialog/inkscape-preferences.cpp:679 msgid "Dialogs are treated as regular windows" msgstr "Dialoge werden wie normale Fenster behandelt" -#: ../src/ui/dialog/inkscape-preferences.cpp:662 +#: ../src/ui/dialog/inkscape-preferences.cpp:681 msgid "Dialogs stay on top of document windows" msgstr "Dialoge bleiben vor Dokumentenfenstern" -#: ../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 "" "Wie »Normal«, aber funktioniert evtl. besser mit manchen Fenstermanagern" -#: ../src/ui/dialog/inkscape-preferences.cpp:667 +#: ../src/ui/dialog/inkscape-preferences.cpp:686 msgid "Dialog Transparency" msgstr "Dialog Transparenz:" -#: ../src/ui/dialog/inkscape-preferences.cpp:669 +#: ../src/ui/dialog/inkscape-preferences.cpp:688 msgid "_Opacity when focused:" msgstr "Deckkraft bei Focus:" -#: ../src/ui/dialog/inkscape-preferences.cpp:671 +#: ../src/ui/dialog/inkscape-preferences.cpp:690 msgid "Opacity when _unfocused:" msgstr "Trübung wenn nicht fokussiert:" -#: ../src/ui/dialog/inkscape-preferences.cpp:673 +#: ../src/ui/dialog/inkscape-preferences.cpp:692 msgid "_Time of opacity change animation:" msgstr "Zeit für Deckkraft-Änderungsanimation" -#: ../src/ui/dialog/inkscape-preferences.cpp:676 +#: ../src/ui/dialog/inkscape-preferences.cpp:695 msgid "Miscellaneous" msgstr "Verschiedenes:" -#: ../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 "Sollen Dialogfenster in der Fensterliste nicht angezeigt werden?" -#: ../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 " @@ -17672,7 +17711,7 @@ msgstr "" "- der selbe Bereich bleibt sichtbar (Vorgabe, die in jedem Fenster mit dem " "Knopf über dem rechten Rollbalken geändert wird)" -#: ../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." @@ -17681,101 +17720,101 @@ msgstr "" "Nützlich abzuschalten, wenn gemeinsame Versionskontrolle von Dateien " "verwendet wird." -#: ../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 "Dialogfenster haben Knöpfe zum Schließen (erfordert Neustart)" -#: ../src/ui/dialog/inkscape-preferences.cpp:687 +#: ../src/ui/dialog/inkscape-preferences.cpp:706 msgid "Windows" msgstr "Fenster" #. Grids -#: ../src/ui/dialog/inkscape-preferences.cpp:690 +#: ../src/ui/dialog/inkscape-preferences.cpp:709 msgid "Line color when zooming out" msgstr "Linienfarbe beim Herauszoomen" -#: ../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 "Die Gitterlinien werden in der Nebengitterlinienfarbe angezeigt" -#: ../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 "Die Gitterlinien werden in der Hauptgitterlinienfarbe angezeigt" -#: ../src/ui/dialog/inkscape-preferences.cpp:697 +#: ../src/ui/dialog/inkscape-preferences.cpp:716 msgid "Default grid settings" msgstr "Vorgabe Gittereinstellungen" -#: ../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 "Gitter Einheiten:" -#: ../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 "Ursprung X:" -#: ../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 "Ursprung Y:" -#: ../src/ui/dialog/inkscape-preferences.cpp:714 +#: ../src/ui/dialog/inkscape-preferences.cpp:733 msgid "Spacing X:" msgstr "Abstand X:" -#: ../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 "Abstand Y:" -#: ../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 "Farbe der Nebengitterlinien:" -#: ../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 "Farbe der normalen Gitterlinien" -#: ../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 "Farbe der Hauptgitterlinien:" -#: ../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 "Farbe der dicken (hervorgehobenen) Gitterlinien" -#: ../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 "Hauptgitterlinien alle:" -#: ../src/ui/dialog/inkscape-preferences.cpp:723 +#: ../src/ui/dialog/inkscape-preferences.cpp:742 msgid "Show dots instead of lines" msgstr "Zeige Punkte anstelle von Linien" -#: ../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 "Punkte anstelle von Gitterlinien verwenden" -#: ../src/ui/dialog/inkscape-preferences.cpp:798 +#: ../src/ui/dialog/inkscape-preferences.cpp:817 msgid "Input/Output" msgstr "Eingabe/Ausgabe" -#: ../src/ui/dialog/inkscape-preferences.cpp:801 +#: ../src/ui/dialog/inkscape-preferences.cpp:820 msgid "Use current directory for \"Save As ...\"" msgstr "Verwende aktuelles Verzeichnis für \"Speichern unter...\"" -#: ../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 " @@ -17786,11 +17825,11 @@ msgstr "" "offene Dokument liegt. Ist sie deaktiviert, wird das Verzeichnis der letzten " "Speicherung über diesen Dialog geöffnet." -#: ../src/ui/dialog/inkscape-preferences.cpp:805 +#: ../src/ui/dialog/inkscape-preferences.cpp:824 msgid "Add label comments to printing output" msgstr "Beim Ausdruck Bezeichnerkommentare mitdrucken" -#: ../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" @@ -17798,11 +17837,11 @@ msgstr "" "Diese Option fügt der unbehandelten Druckausgabe einen Kommentar hinzu.\n" "Das zu druckende Objekt wird mit einem Bezeichner markiert." -#: ../src/ui/dialog/inkscape-preferences.cpp:809 +#: ../src/ui/dialog/inkscape-preferences.cpp:828 msgid "Add default metadata to new documents" msgstr "Fügt Standard Metadaten neuen Dokumenten hinzu" -#: ../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." @@ -17810,15 +17849,15 @@ msgstr "" "Fügt Standardmetadaten in neue Dokumente ein. Standard-Metadaten können über " "Dokument-Eigenschaften-> Metadaten gesetzt werden." -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:834 msgid "_Grab sensitivity:" msgstr "Anfass-Empfindlichkeit:" -#: ../src/ui/dialog/inkscape-preferences.cpp:815 +#: ../src/ui/dialog/inkscape-preferences.cpp:834 msgid "pixels (requires restart)" msgstr "Pixel (erfordert Neustart)" -#: ../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)" @@ -17826,37 +17865,37 @@ msgstr "" "Mindestentfernung des Mauszeigers zu einem Objekt, um es zu erfassen (in " "Pixeln)" -#: ../src/ui/dialog/inkscape-preferences.cpp:818 +#: ../src/ui/dialog/inkscape-preferences.cpp:837 msgid "_Click/drag threshold:" msgstr "Schwellwert für Klicken/Ziehen:" -#: ../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 "Pixel" -#: ../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 "" "Maximale Bewegung des Zeigers (in Pixeln), bei der noch Klicken statt Ziehen " "interpretiert wird" -#: ../src/ui/dialog/inkscape-preferences.cpp:822 +#: ../src/ui/dialog/inkscape-preferences.cpp:841 msgid "_Handle size:" msgstr "Anfassergröße:" -#: ../src/ui/dialog/inkscape-preferences.cpp:823 +#: ../src/ui/dialog/inkscape-preferences.cpp:842 msgid "Set the relative size of node handles" msgstr "Relative Größe der Knotenanfasser setzen" -#: ../src/ui/dialog/inkscape-preferences.cpp:825 +#: ../src/ui/dialog/inkscape-preferences.cpp:844 msgid "Use pressure-sensitive tablet (requires restart)" msgstr "Druckempfindliches Grafiktablett verwenden (erfordert Neustart)" -#: ../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 " @@ -17866,27 +17905,27 @@ msgstr "" "Geräts verwenden. Schalten Sie dies nur aus, wenn Sie Probleme mit dem Gerät " "haben (Sie können es immer noch als Maus verwenden)." -#: ../src/ui/dialog/inkscape-preferences.cpp:829 +#: ../src/ui/dialog/inkscape-preferences.cpp:848 msgid "Switch tool based on tablet device (requires restart)" msgstr "Wechsel Werkzeug abhängig von Tablett-Werkzeug (erfordert Neustart)" -#: ../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 "" "Wechselt das Werkzeug wenn auf dem Grafiktablett ein anderes Gerät verwendet " "wird (Stift, Radierer, Maus)" -#: ../src/ui/dialog/inkscape-preferences.cpp:832 +#: ../src/ui/dialog/inkscape-preferences.cpp:851 msgid "Input devices" msgstr "_Eingabegeräte…" #. SVG output options -#: ../src/ui/dialog/inkscape-preferences.cpp:835 +#: ../src/ui/dialog/inkscape-preferences.cpp:854 msgid "Use named colors" msgstr "Benutze Farbnamen" -#: ../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" @@ -17894,23 +17933,23 @@ msgstr "" "Benutzt, wenn möglich, die CSS-Farbnamen (z.B. 'red', 'magenta') anstelle " "von nummerischen Werten." -#: ../src/ui/dialog/inkscape-preferences.cpp:838 +#: ../src/ui/dialog/inkscape-preferences.cpp:857 msgid "XML formatting" msgstr "XML Format" -#: ../src/ui/dialog/inkscape-preferences.cpp:840 +#: ../src/ui/dialog/inkscape-preferences.cpp:859 msgid "Inline attributes" msgstr "Attribute kürzen" -#: ../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 "Schreibt Attribute in die gleiche Zeile wie das Element-Tag." -#: ../src/ui/dialog/inkscape-preferences.cpp:844 +#: ../src/ui/dialog/inkscape-preferences.cpp:863 msgid "_Indent, spaces:" msgstr "E_inzug, Leerzeichen:" -#: ../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" @@ -17918,24 +17957,24 @@ msgstr "" "Die Anzahl an Leerstellen die zum einrücken untergeordneter Elemente genutzt " "werden soll. Mit 0 werden keine Leerstellen eingefügt." -#: ../src/ui/dialog/inkscape-preferences.cpp:846 +#: ../src/ui/dialog/inkscape-preferences.cpp:865 msgid "Path data" msgstr "Pfad Daten" -#: ../src/ui/dialog/inkscape-preferences.cpp:848 +#: ../src/ui/dialog/inkscape-preferences.cpp:867 msgid "Allow relative coordinates" msgstr "Relative Koordinaten erlauben." -#: ../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 "" "Wenn gesetzt können relative Koordinaten als Pfaddaten verwendet werden." -#: ../src/ui/dialog/inkscape-preferences.cpp:851 +#: ../src/ui/dialog/inkscape-preferences.cpp:870 msgid "Force repeat commands" msgstr "Erzwinge Kommandowiederholung" -#: ../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')" @@ -17943,23 +17982,23 @@ msgstr "" "Erzwingt die Wiederholung von Pfad-Kommandos (z.B. 'L 1,2 L 3,4' anstatt 'L " "1,2 3,4')" -#: ../src/ui/dialog/inkscape-preferences.cpp:854 +#: ../src/ui/dialog/inkscape-preferences.cpp:873 msgid "Numbers" msgstr "Zahlen" -#: ../src/ui/dialog/inkscape-preferences.cpp:857 +#: ../src/ui/dialog/inkscape-preferences.cpp:876 msgid "_Numeric precision:" msgstr "Genauigkeit:" -#: ../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 "Maßgebliche Zahlen der Werte, die in die SVG-Datei geschrieben werden" -#: ../src/ui/dialog/inkscape-preferences.cpp:860 +#: ../src/ui/dialog/inkscape-preferences.cpp:879 msgid "Minimum _exponent:" msgstr "Minimal _Exponent:" -#: ../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" @@ -17969,17 +18008,17 @@ 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 "Unsachgemäße Attribut-Aktionen" -#: ../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 "Drucke Warnungen" -#: ../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." @@ -17987,20 +18026,20 @@ msgstr "" "Gebe Warnung aus, wenn ungültige oder nicht-nützliche Attribute gefunden " "werden. Datenbank-Dateien liegen in inkscape_data_dir/Attribute." -#: ../src/ui/dialog/inkscape-preferences.cpp:869 +#: ../src/ui/dialog/inkscape-preferences.cpp:888 msgid "Remove attributes" msgstr "Attribute löschen" -#: ../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 "Löscht ungültige oder nicht-nützliche Attribute vom Element Tag" #. 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 "Unangemessene Stileigenschaften-Aktionen" -#: ../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." @@ -18009,21 +18048,21 @@ msgstr "" "'Schrift-Familie' auf einem <rect> gesetzt). Datenbank-Dateien liegen in " "inkscape_data_dir/Attribute." -#: ../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 "Stileigenschaften löschen" -#: ../src/ui/dialog/inkscape-preferences.cpp:878 +#: ../src/ui/dialog/inkscape-preferences.cpp:897 msgid "Delete inappropriate style properties" msgstr "Unpassende Stileigenschaften löschen" #. 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 "Nicht-nützliche Stileigenschafts-Aktionen" -#: ../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 " @@ -18035,19 +18074,19 @@ msgstr "" "vererbt wird oder wenn ein Wert der gleiche ist, wenn er vererbt würde). " "Datenbank-Dateien liegen in inkscape_data_dir/Attribute." -#: ../src/ui/dialog/inkscape-preferences.cpp:886 +#: ../src/ui/dialog/inkscape-preferences.cpp:905 msgid "Delete redundant style properties" msgstr "Redundante Stileigenschaften löschen" -#: ../src/ui/dialog/inkscape-preferences.cpp:888 +#: ../src/ui/dialog/inkscape-preferences.cpp:907 msgid "Check Attributes and Style Properties on" msgstr "Überprüfen Sie Attribute und Style-Eigenschaften auf" -#: ../src/ui/dialog/inkscape-preferences.cpp:890 +#: ../src/ui/dialog/inkscape-preferences.cpp:909 msgid "Reading" msgstr "Lesen" -#: ../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)" @@ -18056,11 +18095,11 @@ msgstr "" "Dateien (einschließlich derjenigen internen von Inkscape die den Start " "verlangsamen)" -#: ../src/ui/dialog/inkscape-preferences.cpp:892 +#: ../src/ui/dialog/inkscape-preferences.cpp:911 msgid "Editing" msgstr "Bearbeiten" -#: ../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)" @@ -18068,42 +18107,42 @@ msgstr "" "Überprüfen Sie die Attribute und Style-Eigenschaften während der Bearbeitung " "von SVG-Dateien (kann Inkscape verlangsamen, meist nützlich zur Fehlersuche)" -#: ../src/ui/dialog/inkscape-preferences.cpp:894 +#: ../src/ui/dialog/inkscape-preferences.cpp:913 msgid "Writing" msgstr "Schreiben" -#: ../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 "" "Überprüfen Sie die Attribut- und Style-Eigenschaften beim Schreiben von SVG-" "Dateien" -#: ../src/ui/dialog/inkscape-preferences.cpp:897 +#: ../src/ui/dialog/inkscape-preferences.cpp:916 msgid "SVG output" msgstr "SVG-Ausgabe" #. 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 "Wahrnehmung" -#: ../src/ui/dialog/inkscape-preferences.cpp:903 +#: ../src/ui/dialog/inkscape-preferences.cpp:922 msgid "Relative Colorimetric" msgstr "Relative Farbmetrik" -#: ../src/ui/dialog/inkscape-preferences.cpp:903 +#: ../src/ui/dialog/inkscape-preferences.cpp:922 msgid "Absolute Colorimetric" msgstr "Absolute Farbmetrik" -#: ../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 "(Hinweis: Farbmanagement wurde in diesem Build deaktiviert)" -#: ../src/ui/dialog/inkscape-preferences.cpp:911 +#: ../src/ui/dialog/inkscape-preferences.cpp:930 msgid "Display adjustment" msgstr "Anzeige Anpassungen" -#: ../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" @@ -18112,113 +18151,113 @@ msgstr "" "ICC-Profil, das zum Kalibrieren der Anzeige genutzt werden soll.\n" "Durchsuchte Verzeichnisse:%s" -#: ../src/ui/dialog/inkscape-preferences.cpp:922 +#: ../src/ui/dialog/inkscape-preferences.cpp:941 msgid "Display profile:" msgstr "Anzeigeprofil:" -#: ../src/ui/dialog/inkscape-preferences.cpp:927 +#: ../src/ui/dialog/inkscape-preferences.cpp:946 msgid "Retrieve profile from display" msgstr "Profil von Anzeige ermitteln" -#: ../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 "Ermittle Profil von angeschlossenen Anzeigegeräten mittels XICC." -#: ../src/ui/dialog/inkscape-preferences.cpp:932 +#: ../src/ui/dialog/inkscape-preferences.cpp:951 msgid "Retrieve profiles from those attached to displays" msgstr "Ermittle Profil von angeschlossenen Anzeigegeräten." -#: ../src/ui/dialog/inkscape-preferences.cpp:937 +#: ../src/ui/dialog/inkscape-preferences.cpp:956 msgid "Display rendering intent:" msgstr "Anzeigenversatz" -#: ../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 "" "Geräte-Wiedergabe-Bedeutung wird genutzt, um die Ausgabe zu kalibrieren." -#: ../src/ui/dialog/inkscape-preferences.cpp:940 +#: ../src/ui/dialog/inkscape-preferences.cpp:959 msgid "Proofing" msgstr "Druckprobe" -#: ../src/ui/dialog/inkscape-preferences.cpp:942 +#: ../src/ui/dialog/inkscape-preferences.cpp:961 msgid "Simulate output on screen" msgstr "Simulieren der Ausgabe auf dem Bildschirm" -#: ../src/ui/dialog/inkscape-preferences.cpp:944 +#: ../src/ui/dialog/inkscape-preferences.cpp:963 msgid "Simulates output of target device" msgstr "Simulieren der Ausgabe auf dem Zielgerät" -#: ../src/ui/dialog/inkscape-preferences.cpp:946 +#: ../src/ui/dialog/inkscape-preferences.cpp:965 msgid "Mark out of gamut colors" msgstr "Farben der Farbskala hervorheben" -#: ../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 "Hebe Farben hervor die nicht im Farbbereich des Ausgabegerätes liegen." -#: ../src/ui/dialog/inkscape-preferences.cpp:953 +#: ../src/ui/dialog/inkscape-preferences.cpp:972 msgid "Out of gamut warning color:" msgstr "Farbbereichswarnung:" -#: ../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 "Bestimmt die Farbe die für Farbbereichswarnungen genutzt werden soll." -#: ../src/ui/dialog/inkscape-preferences.cpp:956 +#: ../src/ui/dialog/inkscape-preferences.cpp:975 msgid "Device profile:" msgstr "Geräteprofil:" -#: ../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 "ICC-Profil für Simulation der Geräteausgabe." -#: ../src/ui/dialog/inkscape-preferences.cpp:960 +#: ../src/ui/dialog/inkscape-preferences.cpp:979 msgid "Device rendering intent:" msgstr "Gerätewiedergabe-Bedeutung" -#: ../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 "" "Geräte-Wiedergabe-Bedeutung wird genutzt, um die Ausgabe zu kalibrieren." -#: ../src/ui/dialog/inkscape-preferences.cpp:963 +#: ../src/ui/dialog/inkscape-preferences.cpp:982 msgid "Black point compensation" msgstr "Schwarzpunktanpassung" -#: ../src/ui/dialog/inkscape-preferences.cpp:965 +#: ../src/ui/dialog/inkscape-preferences.cpp:984 msgid "Enables black point compensation" msgstr "Ermöglicht Schwarzpunktkompensation" -#: ../src/ui/dialog/inkscape-preferences.cpp:967 +#: ../src/ui/dialog/inkscape-preferences.cpp:986 msgid "Preserve black" msgstr "Schwarzwert beibehalten" -#: ../src/ui/dialog/inkscape-preferences.cpp:974 +#: ../src/ui/dialog/inkscape-preferences.cpp:993 msgid "(LittleCMS 1.15 or later required)" msgstr "(LittleCMS 1.15 oder neuer wird benötigt)" -#: ../src/ui/dialog/inkscape-preferences.cpp:976 +#: ../src/ui/dialog/inkscape-preferences.cpp:995 msgid "Preserve K channel in CMYK -> CMYK transforms" msgstr "Lässt K-Kanal in CMYK -> CMYK Transformation unverändert." # CHECK -#: ../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 "<keins>" -#: ../src/ui/dialog/inkscape-preferences.cpp:1035 +#: ../src/ui/dialog/inkscape-preferences.cpp:1054 msgid "Color management" msgstr "Farb-Management" #. Autosave options -#: ../src/ui/dialog/inkscape-preferences.cpp:1038 +#: ../src/ui/dialog/inkscape-preferences.cpp:1057 msgid "Enable autosave (requires restart)" msgstr "Automatisches Speichern (erfordert Neustart)" -#: ../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" @@ -18226,12 +18265,12 @@ msgstr "" "Speichert das Dokument in bestimmten Zeitabständen. Dadurch kann der " "Verlust, der durch Programmabstürze entsteht, verringert werden." -#: ../src/ui/dialog/inkscape-preferences.cpp:1045 +#: ../src/ui/dialog/inkscape-preferences.cpp:1064 msgctxt "Filesystem" msgid "Autosave _directory:" msgstr "Ort für automatisches Speichern:" -#: ../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). " @@ -18240,21 +18279,21 @@ msgstr "" "sollte ein absoluter Pfad sein (startet mit / bei UNIX und einem " "Laufwerksbuchstaben wir C: bei Windows)." -#: ../src/ui/dialog/inkscape-preferences.cpp:1047 +#: ../src/ui/dialog/inkscape-preferences.cpp:1066 msgid "_Interval (in minutes):" msgstr "Zeitabstand (in Minuten):" -#: ../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 "" "In diesen Zeitabständen (in Minuten) wird das Dokument automatisch " "gespeichert." -#: ../src/ui/dialog/inkscape-preferences.cpp:1049 +#: ../src/ui/dialog/inkscape-preferences.cpp:1068 msgid "_Maximum number of autosaves:" msgstr "Maximale Anzahl an Sicherungen:" -#: ../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 "" @@ -18273,15 +18312,15 @@ 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 "Automatische Sicherung" -#: ../src/ui/dialog/inkscape-preferences.cpp:1068 +#: ../src/ui/dialog/inkscape-preferences.cpp:1087 msgid "Open Clip Art Library _Server Name:" msgstr "Open Clip Art Library Servername:" -#: ../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" @@ -18289,35 +18328,35 @@ msgstr "" "Der Servername des \"Open Clip Art Library\" Webdav Servers. Dieser wird " "beim Im- und Export zur OCAL verwendet." -#: ../src/ui/dialog/inkscape-preferences.cpp:1071 +#: ../src/ui/dialog/inkscape-preferences.cpp:1090 msgid "Open Clip Art Library _Username:" msgstr "Open Clip Art Library Benutzername:" -#: ../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 "Der Benutzername zum einloggen in die Open Clip Art Library." -#: ../src/ui/dialog/inkscape-preferences.cpp:1074 +#: ../src/ui/dialog/inkscape-preferences.cpp:1093 msgid "Open Clip Art Library _Password:" msgstr "Open Clip Art Library Kennwort:" -#: ../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 "Das Passwort zum einloggen in die Open Clip Art Library." -#: ../src/ui/dialog/inkscape-preferences.cpp:1076 +#: ../src/ui/dialog/inkscape-preferences.cpp:1095 msgid "Open Clip Art" msgstr "Login bei Open Clip Art" -#: ../src/ui/dialog/inkscape-preferences.cpp:1081 +#: ../src/ui/dialog/inkscape-preferences.cpp:1100 msgid "Behavior" msgstr "Verhalten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1085 +#: ../src/ui/dialog/inkscape-preferences.cpp:1104 msgid "_Simplification threshold:" msgstr "Schwellwert für Vereinfachungen:" -#: ../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 " @@ -18327,47 +18366,47 @@ msgstr "" "mehrmals schnell hintereinander ausgeführt, erhöht sich die Stärke; kurze " "Pause dazwischen setzt den Schwellwert zurück." -#: ../src/ui/dialog/inkscape-preferences.cpp:1088 +#: ../src/ui/dialog/inkscape-preferences.cpp:1107 msgid "Color stock markers the same color as object" msgstr "Farbe Standard-Marker in der gleichen Farbe wie das Objekt" -#: ../src/ui/dialog/inkscape-preferences.cpp:1089 +#: ../src/ui/dialog/inkscape-preferences.cpp:1108 msgid "Color custom markers the same color as object" msgstr "" "Färbe die benutzerdefinierten Markierungen in der gleichen Farbe wie das " "Objekt" -#: ../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 "Aktualisiert die Markierungsfarbe, wenn das Objekt die Farbe ändert" #. Selecting options -#: ../src/ui/dialog/inkscape-preferences.cpp:1093 +#: ../src/ui/dialog/inkscape-preferences.cpp:1112 msgid "Select in all layers" msgstr "In allen Ebenen auswählen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1094 +#: ../src/ui/dialog/inkscape-preferences.cpp:1113 msgid "Select only within current layer" msgstr "Nur innerhalb der aktuellen Ebene auswählen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1095 +#: ../src/ui/dialog/inkscape-preferences.cpp:1114 msgid "Select in current layer and sublayers" msgstr "Nur innerhalb der aktuellen Ebene und Unterebenen auswählen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1096 +#: ../src/ui/dialog/inkscape-preferences.cpp:1115 msgid "Ignore hidden objects and layers" msgstr "Ausgeblendete Objekte und Ebenen ignorieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1097 +#: ../src/ui/dialog/inkscape-preferences.cpp:1116 msgid "Ignore locked objects and layers" msgstr "Gesperrte Objekte und Ebenen ignorieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1098 +#: ../src/ui/dialog/inkscape-preferences.cpp:1117 msgid "Deselect upon layer change" msgstr "Auswahl bei Ebenenwechsel aufheben" -#: ../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" @@ -18375,20 +18414,20 @@ msgstr "" "Dieses abwählen um Objekte ausgewählt zu lassen, wenn die aktuelle Ebene " "geändert wird" -#: ../src/ui/dialog/inkscape-preferences.cpp:1103 +#: ../src/ui/dialog/inkscape-preferences.cpp:1122 msgid "Ctrl+A, Tab, Shift+Tab" msgstr "Strg+A, Tabulator, Umschalt+Tabulator:" -#: ../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 "Tastaturkommandos zur Auswahl wirken auf Objekte aller Ebenen" -#: ../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 "" "Tastaturkommandos zur Auswahl wirken nur auf Objekte in der aktuellen Ebene" -#: ../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" @@ -18396,7 +18435,7 @@ msgstr "" "Tastaturkommandos zur Auswahl wirken auf Objekte in der aktuellen Ebene und " "aller ihrer Unterebenen" -#: ../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)" @@ -18404,7 +18443,7 @@ msgstr "" "Dieses abwählen, damit ausgeblendete Objekte ausgewählt werden können (gilt " "auch für Objekte in ausgeblendeten Ebenen/Gruppierungen)" -#: ../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)" @@ -18412,81 +18451,81 @@ msgstr "" "Dieses abwählen damit gesperrte Objekte ausgewählt werden können (gilt auch " "für Objekte in gesperrten Ebenen/Gruppierungen)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1115 +#: ../src/ui/dialog/inkscape-preferences.cpp:1134 msgid "Wrap when cycling objects in z-order" msgstr "Beim drehen von Objekten in Z-Ordnung einwickeln." -#: ../src/ui/dialog/inkscape-preferences.cpp:1117 +#: ../src/ui/dialog/inkscape-preferences.cpp:1136 msgid "Alt+Scroll Wheel" msgstr "Alt+Scroll-Rad" -#: ../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 "" "Beim drehen von Objekten in Z-Ordnung um den Start- und Endpunkt einwickeln." -#: ../src/ui/dialog/inkscape-preferences.cpp:1121 +#: ../src/ui/dialog/inkscape-preferences.cpp:1140 msgid "Selecting" msgstr "Auswählen" #. 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 "Breite der Kontur skalieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1125 +#: ../src/ui/dialog/inkscape-preferences.cpp:1144 msgid "Scale rounded corners in rectangles" msgstr "Abgerundete Ecken in Rechtecken mitskalieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1126 +#: ../src/ui/dialog/inkscape-preferences.cpp:1145 msgid "Transform gradients" msgstr "Farbverläufe transformieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1127 +#: ../src/ui/dialog/inkscape-preferences.cpp:1146 msgid "Transform patterns" msgstr "Füllmuster transformieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1128 +#: ../src/ui/dialog/inkscape-preferences.cpp:1147 msgid "Optimized" msgstr "Optimiert" -#: ../src/ui/dialog/inkscape-preferences.cpp:1129 +#: ../src/ui/dialog/inkscape-preferences.cpp:1148 msgid "Preserved" msgstr "Beibehalten" -#: ../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 "" "Wenn Objekte skaliert werden, dann wird die Breite der Kontur ebenso " "skaliert." -#: ../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 "" "Wenn Rechtecke skaliert werden, dann werden die Radien von abgerundeten " "Ecken ebenso mitskaliert." -#: ../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 "" "Farbverläufe (in Füllung oder Konturen) zusammen mit den Objekten " "transformieren" -#: ../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 "" "Muster (in Füllung oder Konturen) zusammen mit den Objekten transformieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1139 +#: ../src/ui/dialog/inkscape-preferences.cpp:1158 msgid "Store transformation" msgstr "Transformation speichern:" -#: ../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" @@ -18494,19 +18533,19 @@ msgstr "" "Wenn möglich, dann werden Transformationen auf Objekte angewendet, ohne ein " "transform=-Attribut hinzuzufügen." -#: ../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 "Transformationen immer als transform=-Attribute speichern." -#: ../src/ui/dialog/inkscape-preferences.cpp:1145 +#: ../src/ui/dialog/inkscape-preferences.cpp:1164 msgid "Transforms" msgstr "Transformationen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1149 +#: ../src/ui/dialog/inkscape-preferences.cpp:1168 msgid "Mouse _wheel scrolls by:" msgstr "Mausrad rollt um:" -#: ../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)" @@ -18514,23 +18553,23 @@ msgstr "" "Eine Stufe des Maus-Rades rollt um die angegebene Distanz in Pixeln " "(horizontal mit Umschalttaste)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1151 +#: ../src/ui/dialog/inkscape-preferences.cpp:1170 msgid "Ctrl+arrows" msgstr "Strg+Pfeile" -#: ../src/ui/dialog/inkscape-preferences.cpp:1153 +#: ../src/ui/dialog/inkscape-preferences.cpp:1172 msgid "Sc_roll by:" msgstr "Rolle um:" -#: ../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 "Strg+Pfeiltasten rollen um diese Distanz (in Pixeln)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1156 +#: ../src/ui/dialog/inkscape-preferences.cpp:1175 msgid "_Acceleration:" msgstr "Beschleunigung:" -#: ../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)" @@ -18538,15 +18577,15 @@ msgstr "" "Drücken von Strg+Pfeiltaste erhöht zunehmend die Rollgeschwindigkeit (0 " "bedeutet »keine Beschleunigung«)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1158 +#: ../src/ui/dialog/inkscape-preferences.cpp:1177 msgid "Autoscrolling" msgstr "Automatisches Rollen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1160 +#: ../src/ui/dialog/inkscape-preferences.cpp:1179 msgid "_Speed:" msgstr "Geschwindigkeit:" -#: ../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)" @@ -18554,12 +18593,12 @@ msgstr "" "Geschwindigkeit mit der die Arbeitsfläche verschoben wird, wenn der Zeiger " "ihren Rand überschreitet (0: Autorollen ist deaktiviert)" -#: ../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 "Schwellwert:" -#: ../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" @@ -18573,11 +18612,11 @@ 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 "Standardmäßig zoomt das Mausrad" -#: ../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" @@ -18585,25 +18624,25 @@ msgstr "" "Wenn aktiviert kann mit dem Mausrad die Ansicht vergrößert/verkleinert " "werden. Ist dies deaktiviert benötigt man dazu Strg+Mausrad. " -#: ../src/ui/dialog/inkscape-preferences.cpp:1173 +#: ../src/ui/dialog/inkscape-preferences.cpp:1192 msgid "Scrolling" msgstr "Rollen" #. Snapping options -#: ../src/ui/dialog/inkscape-preferences.cpp:1176 +#: ../src/ui/dialog/inkscape-preferences.cpp:1195 msgid "Enable snap indicator" msgstr "Einrast-Indikator aktivieren" -#: ../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 "" "Nach dem Einrasten wird ein Symbol an der Stelle, die einrastete, gezeichnet." -#: ../src/ui/dialog/inkscape-preferences.cpp:1181 +#: ../src/ui/dialog/inkscape-preferences.cpp:1200 msgid "_Delay (in ms):" msgstr "Verzögerung (in msec):" -#: ../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. " @@ -18613,22 +18652,22 @@ msgstr "" "zusätzlichen Sekundenbruchteil. Diese additive Verzögerung wird hier " "festgelegt. Ist sie sehr klein, passiert das Einrasten sofort." -#: ../src/ui/dialog/inkscape-preferences.cpp:1184 +#: ../src/ui/dialog/inkscape-preferences.cpp:1203 msgid "Only snap the node closest to the pointer" msgstr "Nur an dem Knoten einrasten, der dem Zeiger am nähesten ist." -#: ../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 "" "Nur versuchen an dem Knoten einzurasten, der dem Mauszeiger zu Beginn am " "nächsten ist." -#: ../src/ui/dialog/inkscape-preferences.cpp:1189 +#: ../src/ui/dialog/inkscape-preferences.cpp:1208 msgid "_Weight factor:" msgstr "Gewichtsfaktor:" -#: ../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 " @@ -18638,11 +18677,11 @@ msgstr "" "Transformation anwenden (wenn auf 0 gesetzt) oder am Knoten, der dem " "Mauszeiger am nähesten ist (wenn auf 1 gesetzt) einrasten." -#: ../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 "Rastet den Mauszeiger ein, wenn ein festgesetzter Knoten gezogen wird." -#: ../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 " @@ -18651,16 +18690,16 @@ msgstr "" "Wird ein Knoten entlang einer festgesetzten Linie gezogen, dann rastet der " "Mauszeiger statt der Projektion des Knotens auf der Linie ein." -#: ../src/ui/dialog/inkscape-preferences.cpp:1196 +#: ../src/ui/dialog/inkscape-preferences.cpp:1215 msgid "Snapping" msgstr "Einrasten" #. 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 "Pfeiltasten bewegen um:" -#: ../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 "" @@ -18668,31 +18707,31 @@ msgstr "" "Knoten) um diese Entfernung (in SVG-Pixeln)" #. 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 "> und < skalieren um:" -#: ../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 "" "Drücken von > oder < skaliert die ausgewählten Elemente um diesen Wert " "größer oder kleiner (in SVG-Pixeln) " -#: ../src/ui/dialog/inkscape-preferences.cpp:1208 +#: ../src/ui/dialog/inkscape-preferences.cpp:1227 msgid "_Inset/Outset by:" msgstr "Schrumpfen/Erweitern um:" -#: ../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 "" "Schrumpfungs- und Erweiterungsbefehle verändern den Pfad um diese Distanz " "(in SVG-Pixeln)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1210 +#: ../src/ui/dialog/inkscape-preferences.cpp:1229 msgid "Compass-like display of angles" msgstr "Anzeige von Winkeln wie bei einem Kompaß" -#: ../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 " @@ -18703,15 +18742,15 @@ msgstr "" "-180 bis 180, positiv entgegen dem Uhrzeigersinn" # !!! need %s -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 msgid "_Rotation snaps every:" msgstr "Rotation rastet ein alle:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1218 +#: ../src/ui/dialog/inkscape-preferences.cpp:1237 msgid "degrees" msgstr "Grad" -#: ../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" @@ -18719,11 +18758,11 @@ msgstr "" "Rotation mit gedrückter Strg-Taste lässt das Objekt mit dieser Gradrastung " "einrasten; die Tasten [ oder ] haben den gleichen Effekt" -#: ../src/ui/dialog/inkscape-preferences.cpp:1220 +#: ../src/ui/dialog/inkscape-preferences.cpp:1239 msgid "Relative snapping of guideline angles" msgstr "Relatives Einrasten von Führungslininen-Winkeln" -#: ../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" @@ -18731,11 +18770,11 @@ msgstr "" "Wenn eingeschaltet, wird der Einrastwinkel beim Drehen einer Führungslinie " "relativ zum ursprünglichen Winkel" -#: ../src/ui/dialog/inkscape-preferences.cpp:1224 +#: ../src/ui/dialog/inkscape-preferences.cpp:1243 msgid "_Zoom in/out by:" msgstr "Zoomfaktor vergrößern/verkleinern um:" -#: ../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" @@ -18743,45 +18782,45 @@ msgstr "" "Mit dem Zoomwerkzeug klicken, die + oder - Taste drücken, oder die mittlere " "Maustaste betätigen, damit sich die Zoomgröße um diesen Faktor ändert" -#: ../src/ui/dialog/inkscape-preferences.cpp:1226 +#: ../src/ui/dialog/inkscape-preferences.cpp:1245 msgid "Steps" msgstr "Schritte" #. Clones options -#: ../src/ui/dialog/inkscape-preferences.cpp:1229 +#: ../src/ui/dialog/inkscape-preferences.cpp:1248 msgid "Move in parallel" msgstr "parallel verschoben" -#: ../src/ui/dialog/inkscape-preferences.cpp:1231 +#: ../src/ui/dialog/inkscape-preferences.cpp:1250 msgid "Stay unmoved" msgstr "unbewegt bleiben" -#: ../src/ui/dialog/inkscape-preferences.cpp:1233 +#: ../src/ui/dialog/inkscape-preferences.cpp:1252 msgid "Move according to transform" msgstr "sich entsprechend des transform=-Attributs bewegen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1235 +#: ../src/ui/dialog/inkscape-preferences.cpp:1254 msgid "Are unlinked" msgstr "ihre Verbindung zum Original verlieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1237 +#: ../src/ui/dialog/inkscape-preferences.cpp:1256 msgid "Are deleted" msgstr "ebenso gelöscht" -#: ../src/ui/dialog/inkscape-preferences.cpp:1240 +#: ../src/ui/dialog/inkscape-preferences.cpp:1259 msgid "Moving original: clones and linked offsets" msgstr "Verschiebe Original: Klone und verbundener Versatz" -#: ../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 "Klone werden mit demselben Vektor wie das Original verschoben." -#: ../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 "" "Klone bleiben an ihren Positionen, während das Original verschoben wird." -#: ../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" @@ -18790,27 +18829,27 @@ msgstr "" "Attributs. Ein rotierter Klon wird sich zum Beispiel in eine andere Richtung " "als das Original drehen." -#: ../src/ui/dialog/inkscape-preferences.cpp:1247 +#: ../src/ui/dialog/inkscape-preferences.cpp:1266 msgid "Deleting original: clones" msgstr "Lösche Original: Klone" -#: ../src/ui/dialog/inkscape-preferences.cpp:1249 +#: ../src/ui/dialog/inkscape-preferences.cpp:1268 msgid "Orphaned clones are converted to regular objects" msgstr "Klone ohne Original werden zu regulären Objekten umgewandelt." -#: ../src/ui/dialog/inkscape-preferences.cpp:1251 +#: ../src/ui/dialog/inkscape-preferences.cpp:1270 msgid "Orphaned clones are deleted along with their original" msgstr "Klone werden zusammen mit ihrem Original gelöscht." -#: ../src/ui/dialog/inkscape-preferences.cpp:1253 +#: ../src/ui/dialog/inkscape-preferences.cpp:1272 msgid "Duplicating original+clones/linked offset" msgstr "Duplizieren Original+Klone/verbundener Versatz" -#: ../src/ui/dialog/inkscape-preferences.cpp:1255 +#: ../src/ui/dialog/inkscape-preferences.cpp:1274 msgid "Relink duplicated clones" msgstr "Duplizierte Klone neu verbinden" -#: ../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 " @@ -18821,29 +18860,29 @@ msgstr "" "den alten Originalen." #. 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 "Klone" #. 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 "" "Verwende das oberste ausgewählte Objekt beim Anwenden als Ausschneidepfad " "oder Maskierung" -#: ../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 "" "Nicht auswählen, um das unterste ausgewählte Objekt als Ausschneidepfad oder " "Maskierung zu verwenden" -#: ../src/ui/dialog/inkscape-preferences.cpp:1266 +#: ../src/ui/dialog/inkscape-preferences.cpp:1285 msgid "Remove clippath/mask object after applying" msgstr "Ausschneidepfad oder Maskierungsobjekt nach dem Anwenden entfernen" -#: ../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" @@ -18851,60 +18890,60 @@ msgstr "" "Entferne das Objekt von der Zeichnung, welches als Ausschneidepfad oder " "Maskierung verwendet wird, nach dem Anwenden" -#: ../src/ui/dialog/inkscape-preferences.cpp:1270 +#: ../src/ui/dialog/inkscape-preferences.cpp:1289 msgid "Before applying" msgstr "Vor dem Anwenden:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1272 +#: ../src/ui/dialog/inkscape-preferences.cpp:1291 msgid "Do not group clipped/masked objects" msgstr "Kein Gruppieren ausgeschnittener/maskierter Objekte" -#: ../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 "" "Jedes ausgeschnittene/maskierte Objekt in seiner eigenen Gruppe anlegen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1274 +#: ../src/ui/dialog/inkscape-preferences.cpp:1293 msgid "Put all clipped/masked objects into one group" msgstr "" "Alle ausgeschnittenen/maskierten Objekte in einer einzelne Gruppe ablegen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1277 +#: ../src/ui/dialog/inkscape-preferences.cpp:1296 msgid "Apply clippath/mask to every object" msgstr "Ausschneidungspfad/Maske auf jedes Objekt anwenden" -#: ../src/ui/dialog/inkscape-preferences.cpp:1280 +#: ../src/ui/dialog/inkscape-preferences.cpp:1299 msgid "Apply clippath/mask to groups containing single object" msgstr "" "Ausschneidungspfad/Maske auf Gruppen anwenden, die Einzelobjekte beinhalten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1283 +#: ../src/ui/dialog/inkscape-preferences.cpp:1302 msgid "Apply clippath/mask to group containing all objects" msgstr "" "Ausschneidungspfad/Maske auf Gruppen anwenden, die alle Objekte beinhalten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1285 +#: ../src/ui/dialog/inkscape-preferences.cpp:1304 msgid "After releasing" msgstr "Nach dem Lösen:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1287 +#: ../src/ui/dialog/inkscape-preferences.cpp:1306 msgid "Ungroup automatically created groups" msgstr "Gruppierung automatisch erstellter Gruppen aufheben" -#: ../src/ui/dialog/inkscape-preferences.cpp:1289 +#: ../src/ui/dialog/inkscape-preferences.cpp:1308 msgid "Ungroup groups created when setting clip/mask" msgstr "Gruppierung aufheben beim Setzen der Ausschneidung/Maske" -#: ../src/ui/dialog/inkscape-preferences.cpp:1291 +#: ../src/ui/dialog/inkscape-preferences.cpp:1310 msgid "Clippaths and masks" msgstr "Ausschneidepfade und Maskierungen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1294 +#: ../src/ui/dialog/inkscape-preferences.cpp:1313 msgid "Stroke Style Markers" msgstr "Strich-Stilmarkierungen" -#: ../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" @@ -18912,35 +18951,35 @@ msgstr "" "Konturfarbe wie Objekt, Füllfarbe entweder Objekt-Füllfarbe oder Marker-" "Füllfarbe" -#: ../src/ui/dialog/inkscape-preferences.cpp:1302 +#: ../src/ui/dialog/inkscape-preferences.cpp:1321 msgid "Markers" msgstr "Markierungen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1310 +#: ../src/ui/dialog/inkscape-preferences.cpp:1329 msgid "Number of _Threads:" msgstr "Anzahl der Threads:" -#: ../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 "(erfordert Neustart)" -#: ../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 "" "Konfiguration der Anzahl an Prozessoren/Threads, die für das Rendern genutzt " "werden sollen." -#: ../src/ui/dialog/inkscape-preferences.cpp:1315 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgid "Rendering _cache size:" msgstr "Rendering-Cachegröße:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1315 +#: ../src/ui/dialog/inkscape-preferences.cpp:1334 msgctxt "mebibyte (2^20 bytes) abbreviation" msgid "MiB" msgstr "MiB" -#: ../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" @@ -18951,37 +18990,37 @@ 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 "Beste Qualität (am langsamsten)" -#: ../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 "Gute Qualität (langsamer)" -#: ../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 "Durchschnittliche Qualität" -#: ../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 "Niedrigere Qualität (schneller)" -#: ../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 "Niedrigste Qualität (am schnellsten)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1329 +#: ../src/ui/dialog/inkscape-preferences.cpp:1348 msgid "Gaussian blur quality for display" msgstr "Anzeige Qualität des Gaußschen Weichzeichners:" -#: ../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)" @@ -18989,124 +19028,124 @@ msgstr "" "Beste Qualität, aber die Anzeige kann bei hohen Zoomstufen sehr langsam sein " "(Bitmap-Export verwendet immer diese Einstellung)" -#: ../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 "Bessere Qualität, aber langsamere Anzeige" -#: ../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 "Durchschnittliche Qualität, akzeptable Geschwindigkeit der Anzeige" -#: ../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 "Niedrigere Qualität (einige Artefakte), aber schnellere Anzeige" -#: ../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 "Niedrigste Qualität (beträchtliche Artefakte), aber schnellste Anzeige" -#: ../src/ui/dialog/inkscape-preferences.cpp:1353 +#: ../src/ui/dialog/inkscape-preferences.cpp:1372 msgid "Filter effects quality for display" msgstr "Effekt-Qualität für Anzeige:" #. 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 "Rendern" -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "2x2" msgstr "2×2" -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "4x4" msgstr "4×4" -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "8x8" msgstr "8×8" -#: ../src/ui/dialog/inkscape-preferences.cpp:1371 +#: ../src/ui/dialog/inkscape-preferences.cpp:1390 msgid "16x16" msgstr "16×16" -#: ../src/ui/dialog/inkscape-preferences.cpp:1375 +#: ../src/ui/dialog/inkscape-preferences.cpp:1394 msgid "Oversample bitmaps:" msgstr "Bitmap Überabtastung:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1378 +#: ../src/ui/dialog/inkscape-preferences.cpp:1397 msgid "Automatically reload bitmaps" msgstr "Automatisches Aktualisieren von Bildern" -#: ../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 "Bilder neu laden, wenn diese auf dem Datenträger geändert wurden." -#: ../src/ui/dialog/inkscape-preferences.cpp:1382 +#: ../src/ui/dialog/inkscape-preferences.cpp:1401 msgid "_Bitmap editor:" msgstr "_Bitmap-Editor:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1384 +#: ../src/ui/dialog/inkscape-preferences.cpp:1403 msgid "Default export _resolution:" msgstr "Standard-Exportauflösung:" -#: ../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 "" "Bevorzugte Auflösung der Bitmap (Punkte pro Zoll) im Exportieren-Dialog" -#: ../src/ui/dialog/inkscape-preferences.cpp:1387 +#: ../src/ui/dialog/inkscape-preferences.cpp:1406 msgid "Resolution for Create Bitmap _Copy:" msgstr "Auflösung von Bitmap Kopien:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1388 +#: ../src/ui/dialog/inkscape-preferences.cpp:1407 msgid "Resolution used by the Create Bitmap Copy command" msgstr "Auflösung von Bildern die mit \"Kopiere als Bitmap\" erstellt werden." -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "Always embed" msgstr "Immer einbetten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "Always link" msgstr "Immer verlinken" -#: ../src/ui/dialog/inkscape-preferences.cpp:1390 +#: ../src/ui/dialog/inkscape-preferences.cpp:1409 msgid "Ask" msgstr "Fragen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1393 +#: ../src/ui/dialog/inkscape-preferences.cpp:1412 msgid "Bitmap import:" msgstr "Bitmap-Import:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1396 +#: ../src/ui/dialog/inkscape-preferences.cpp:1415 msgid "Default _import resolution:" msgstr "Standard-Importauflösung:" -#: ../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 "Standard-Bitmapauflösung (Punkte pro Zoll) für Bitmap-Import" -#: ../src/ui/dialog/inkscape-preferences.cpp:1398 +#: ../src/ui/dialog/inkscape-preferences.cpp:1417 msgid "Override file resolution" msgstr "Datei-Auflösung überschreiben" -#: ../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 "" "Verwenden Sie Standard-Bitmap-Auflösung zu Gunsten von Informationen aus der " "Datei" -#: ../src/ui/dialog/inkscape-preferences.cpp:1402 +#: ../src/ui/dialog/inkscape-preferences.cpp:1421 msgid "Bitmaps" msgstr "Bitmaps" -#: ../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 " @@ -19114,31 +19153,31 @@ msgstr "" "Wählen Sie eine Datei mit vorderfinierten Tastaturkürzeln. Jeder " "benutzerdefinierte Kürzel der erstellt wird, wird separat hinzugefügt zu" -#: ../src/ui/dialog/inkscape-preferences.cpp:1417 +#: ../src/ui/dialog/inkscape-preferences.cpp:1436 msgid "Shortcut file:" msgstr "Tastenkürzel-Datei:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1420 +#: ../src/ui/dialog/inkscape-preferences.cpp:1439 msgid "Search:" msgstr "Suchen:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1432 +#: ../src/ui/dialog/inkscape-preferences.cpp:1451 msgid "Shortcut" msgstr "Tastenkürzel" -#: ../src/ui/dialog/inkscape-preferences.cpp:1433 +#: ../src/ui/dialog/inkscape-preferences.cpp:1452 #: ../src/ui/widget/page-sizer.cpp:262 msgid "Description" msgstr "Beschreibung" -#: ../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 " _Zurücksetzen" -#: ../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" @@ -19146,40 +19185,40 @@ msgstr "" "Alle individuellen Tastaturkürzel entfernen und zurück zu den Verknüpfungen " "in der Shortcut-Datei der oben aufgeführten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1478 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 msgid "Import ..." msgstr "_Importieren…" -#: ../src/ui/dialog/inkscape-preferences.cpp:1478 +#: ../src/ui/dialog/inkscape-preferences.cpp:1497 msgid "Import custom keyboard shortcuts from a file" msgstr "Importieren einer benutzerdefinierten Tastaturkürzel-Datei" -#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +#: ../src/ui/dialog/inkscape-preferences.cpp:1500 msgid "Export ..." msgstr "_Exportieren…" -#: ../src/ui/dialog/inkscape-preferences.cpp:1481 +#: ../src/ui/dialog/inkscape-preferences.cpp:1500 msgid "Export custom keyboard shortcuts to a file" msgstr "Benutzerdefinierte Tastaturkürzel in eine Datei exportieren" -#: ../src/ui/dialog/inkscape-preferences.cpp:1491 +#: ../src/ui/dialog/inkscape-preferences.cpp:1510 msgid "Keyboard Shortcuts" msgstr "Tastaturkürzel" #. Find this group in the tree -#: ../src/ui/dialog/inkscape-preferences.cpp:1654 +#: ../src/ui/dialog/inkscape-preferences.cpp:1673 msgid "Misc" msgstr "Sonstiges" -#: ../src/ui/dialog/inkscape-preferences.cpp:1773 +#: ../src/ui/dialog/inkscape-preferences.cpp:1792 msgid "Set the main spell check language" msgstr "Setzen der Hauptsprache der Rechtschreibprüfung" -#: ../src/ui/dialog/inkscape-preferences.cpp:1776 +#: ../src/ui/dialog/inkscape-preferences.cpp:1795 msgid "Second language:" msgstr "Zweite Sprache:" -#: ../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" @@ -19187,11 +19226,11 @@ msgstr "" "Setzen der zweiten Sprache der Rechtschreibprüfung; die Prüfung stoppt nur " "bei Wörtern, die in allen ausgewählten Sprachen unbekannt sind." -#: ../src/ui/dialog/inkscape-preferences.cpp:1780 +#: ../src/ui/dialog/inkscape-preferences.cpp:1799 msgid "Third language:" msgstr "Dritte Sprache:" -#: ../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" @@ -19199,31 +19238,31 @@ msgstr "" "Setzen der dritten Sprache der Rechtschreibprüfung; die Prüfung stoppt nur " "bei Wörtern, die in allen ausgewählten Sprachen unbekannt sind." -#: ../src/ui/dialog/inkscape-preferences.cpp:1783 +#: ../src/ui/dialog/inkscape-preferences.cpp:1802 msgid "Ignore words with digits" msgstr "Ignoriere Wörter mit Zahlen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1785 +#: ../src/ui/dialog/inkscape-preferences.cpp:1804 msgid "Ignore words containing digits, such as \"R2D2\"" msgstr "Ignoriere Wörter mit Zahlen, wie \"R2D2\"" -#: ../src/ui/dialog/inkscape-preferences.cpp:1787 +#: ../src/ui/dialog/inkscape-preferences.cpp:1806 msgid "Ignore words in ALL CAPITALS" msgstr "Ignoriere Wörter die GROSSGESCHRIEBEN sind" -#: ../src/ui/dialog/inkscape-preferences.cpp:1789 +#: ../src/ui/dialog/inkscape-preferences.cpp:1808 msgid "Ignore words in all capitals, such as \"IUPAC\"" msgstr "Ignoriere Wörter die GROSSGESCHRIEBEN sind, wie \"IUPAC\"" -#: ../src/ui/dialog/inkscape-preferences.cpp:1791 +#: ../src/ui/dialog/inkscape-preferences.cpp:1810 msgid "Spellcheck" msgstr "Rechtschreibprüfung" -#: ../src/ui/dialog/inkscape-preferences.cpp:1811 +#: ../src/ui/dialog/inkscape-preferences.cpp:1830 msgid "Latency _skew:" msgstr "Latenz-Schrägstellung:" -#: ../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)" @@ -19231,11 +19270,11 @@ msgstr "" "Faktor, um den die Ereigniszeit gegenüber der Systemzeit verlangsamt wird " "(0,9766 auf manchen Systemen)" -#: ../src/ui/dialog/inkscape-preferences.cpp:1814 +#: ../src/ui/dialog/inkscape-preferences.cpp:1833 msgid "Pre-render named icons" msgstr "Symbole mit Namen im Voraus rendern" -#: ../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" @@ -19243,83 +19282,83 @@ msgstr "" "Benannte Icons werden gerendert, bevor die Benutzeroberfläche dargestellt " "wird. Damit werden Fehler in der GTK+-Hinweisen zu benannten Icons umgangen." -#: ../src/ui/dialog/inkscape-preferences.cpp:1824 +#: ../src/ui/dialog/inkscape-preferences.cpp:1843 msgid "System info" msgstr "System-Information" -#: ../src/ui/dialog/inkscape-preferences.cpp:1828 +#: ../src/ui/dialog/inkscape-preferences.cpp:1847 msgid "User config: " msgstr "Benutzerkonfiguration:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1828 +#: ../src/ui/dialog/inkscape-preferences.cpp:1847 msgid "Location of users configuration" msgstr "Ort der Benutzerkonfiguration" -#: ../src/ui/dialog/inkscape-preferences.cpp:1832 +#: ../src/ui/dialog/inkscape-preferences.cpp:1851 msgid "User preferences: " msgstr "Benutzereinstellungen:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1832 +#: ../src/ui/dialog/inkscape-preferences.cpp:1851 msgid "Location of the users preferences file" msgstr "Ort der Benutzer-Einstellungsdatei" -#: ../src/ui/dialog/inkscape-preferences.cpp:1836 +#: ../src/ui/dialog/inkscape-preferences.cpp:1855 msgid "User extensions: " msgstr "Benutzererweiterungen:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1836 +#: ../src/ui/dialog/inkscape-preferences.cpp:1855 msgid "Location of the users extensions" msgstr "Ort der Benutzer-Erweiterungen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1840 +#: ../src/ui/dialog/inkscape-preferences.cpp:1859 msgid "User cache: " msgstr "Benutzer Cache:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1840 +#: ../src/ui/dialog/inkscape-preferences.cpp:1859 msgid "Location of users cache" msgstr "Ort des Benutzer-Caches" -#: ../src/ui/dialog/inkscape-preferences.cpp:1848 +#: ../src/ui/dialog/inkscape-preferences.cpp:1867 msgid "Temporary files: " msgstr "Temporäre Dateien:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1848 +#: ../src/ui/dialog/inkscape-preferences.cpp:1867 msgid "Location of the temporary files used for autosave" msgstr "Ort der temp. Dateien, die für Auto-Speicherung verwendet werden" -#: ../src/ui/dialog/inkscape-preferences.cpp:1852 +#: ../src/ui/dialog/inkscape-preferences.cpp:1871 msgid "Inkscape data: " msgstr "Inkscapedaten:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1852 +#: ../src/ui/dialog/inkscape-preferences.cpp:1871 msgid "Location of Inkscape data" msgstr "Ort der Inkscapedaten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1856 +#: ../src/ui/dialog/inkscape-preferences.cpp:1875 msgid "Inkscape extensions: " msgstr "Inkscape-Erweiterungen:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1856 +#: ../src/ui/dialog/inkscape-preferences.cpp:1875 msgid "Location of the Inkscape extensions" msgstr "Ort der Inkscape-Erweiterungen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1865 +#: ../src/ui/dialog/inkscape-preferences.cpp:1884 msgid "System data: " msgstr "System" -#: ../src/ui/dialog/inkscape-preferences.cpp:1865 +#: ../src/ui/dialog/inkscape-preferences.cpp:1884 msgid "Locations of system data" msgstr "Ort der Systemdaten" -#: ../src/ui/dialog/inkscape-preferences.cpp:1889 +#: ../src/ui/dialog/inkscape-preferences.cpp:1908 msgid "Icon theme: " msgstr "Icon Thema:" -#: ../src/ui/dialog/inkscape-preferences.cpp:1889 +#: ../src/ui/dialog/inkscape-preferences.cpp:1908 msgid "Locations of icon themes" msgstr "Ort der Icon-Themen" -#: ../src/ui/dialog/inkscape-preferences.cpp:1891 +#: ../src/ui/dialog/inkscape-preferences.cpp:1910 msgid "System" msgstr "System" @@ -19402,7 +19441,7 @@ msgstr "" "gesamten 'Bildschirm' gemappt oder in ein einzelnes (normalerweise das " "aktive) 'Fenster'" -#: ../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 "X" @@ -19463,7 +19502,7 @@ msgstr "Ebene" msgid "_Rename" msgstr "_Umbenennen" -#: ../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 "Ebene umbenennen" @@ -19493,55 +19532,55 @@ msgstr "Zur Ebene verschieben" msgid "_Move" msgstr "_Verschieben" -#: ../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 "Ebene einblenden" -#: ../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 "Ebene ausblenden" -#: ../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 "Ebene sperren" -#: ../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 "Ebene entsperren" -#: ../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 "Sichbarkeit der aktuellen Ebene umschalten" -#: ../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 "Anderen Ebene sperren" -#: ../src/ui/dialog/layers.cpp:717 +#: ../src/ui/dialog/layers.cpp:718 msgid "Moved layer" msgstr "Verschobene Ebene" -#: ../src/ui/dialog/layers.cpp:879 +#: ../src/ui/dialog/layers.cpp:880 msgctxt "Layers" msgid "New" msgstr "Neu" -#: ../src/ui/dialog/layers.cpp:884 +#: ../src/ui/dialog/layers.cpp:885 msgctxt "Layers" msgid "Bot" msgstr "Unten" -#: ../src/ui/dialog/layers.cpp:890 +#: ../src/ui/dialog/layers.cpp:891 msgctxt "Layers" msgid "Dn" msgstr "Runter" -#: ../src/ui/dialog/layers.cpp:896 +#: ../src/ui/dialog/layers.cpp:897 msgctxt "Layers" msgid "Up" msgstr "Hoch" -#: ../src/ui/dialog/layers.cpp:902 +#: ../src/ui/dialog/layers.cpp:903 msgctxt "Layers" msgid "Top" msgstr "Oben" @@ -20098,26 +20137,26 @@ msgid "Preview size: " msgstr "Vorschaugröße:" #. 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 "Füllung festlegen" #. 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 "Kontur festlegen" -#: ../src/ui/dialog/swatches.cpp:286 +#: ../src/ui/dialog/swatches.cpp:287 msgid "Edit..." msgstr "Bearbeiten…" # !!! not the best translation -#: ../src/ui/dialog/swatches.cpp:298 +#: ../src/ui/dialog/swatches.cpp:299 msgid "Convert" msgstr "Konvertieren" # !!! palettes, not swatches? -#: ../src/ui/dialog/swatches.cpp:542 +#: ../src/ui/dialog/swatches.cpp:543 #, c-format msgid "Palettes directory (%s) is unavailable." msgstr "Palettenverzeichnis (%s) nicht auffindbar." @@ -21395,7 +21434,7 @@ msgstr "" "identisch zur angezeigten ausgegeben." #: ../src/ui/widget/selected-style.cpp:124 -#: ../src/ui/widget/style-swatch.cpp:119 +#: ../src/ui/widget/style-swatch.cpp:120 msgid "Fill:" msgstr "Füllung:" @@ -21416,35 +21455,35 @@ msgstr "Nichts ausgewählt" # !!! #: ../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 "<i>Keine</i>" #: ../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 "Keine Füllung" #: ../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 "Keine Kontur" #: ../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 "Muster" #: ../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 "Füllmuster" #: ../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 "Kontur des Musters" @@ -21454,12 +21493,12 @@ msgid "<b>L</b>" msgstr "<b>L</b>" #: ../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 "Füllung des linearen Farbverlaufs" #: ../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 "Kontur des linearen Farbverlaufs" @@ -21468,12 +21507,12 @@ msgid "<b>R</b>" msgstr "<b>R</b>" #: ../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 "Füllung des radialen Farbverlaufs" #: ../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 "Kontur des radialen Farbverlaufs" @@ -21491,7 +21530,7 @@ msgstr "Unterschiedliche Konturen" # !!! #: ../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 "<b>Ungesetzt</b>" @@ -21499,14 +21538,14 @@ msgstr "<b>Ungesetzt</b>" #: ../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 "Füllung aufheben" #: ../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 "Kontur aufheben" @@ -21746,35 +21785,35 @@ msgctxt "Sliders" msgid "Link" msgstr "Verknüpfung:" -#: ../src/ui/widget/style-swatch.cpp:273 +#: ../src/ui/widget/style-swatch.cpp:274 msgid "L Gradient" msgstr "L-Farbverlauf" -#: ../src/ui/widget/style-swatch.cpp:277 +#: ../src/ui/widget/style-swatch.cpp:278 msgid "R Gradient" msgstr "R-Farbverlauf" -#: ../src/ui/widget/style-swatch.cpp:293 +#: ../src/ui/widget/style-swatch.cpp:294 #, c-format msgid "Fill: %06x/%.3g" msgstr "Füllung: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:295 +#: ../src/ui/widget/style-swatch.cpp:296 #, c-format msgid "Stroke: %06x/%.3g" msgstr "Kontur: %06x/%.3g" -#: ../src/ui/widget/style-swatch.cpp:327 +#: ../src/ui/widget/style-swatch.cpp:328 #, c-format msgid "Stroke width: %.5g%s" msgstr "Konturbreite: %.5g%s" -#: ../src/ui/widget/style-swatch.cpp:343 +#: ../src/ui/widget/style-swatch.cpp:344 #, c-format msgid "O: %2.0f" msgstr "O: %2.0f" -#: ../src/ui/widget/style-swatch.cpp:348 +#: ../src/ui/widget/style-swatch.cpp:349 #, c-format msgid "Opacity: %2.1f %%" msgstr "Deckkraft: %2.1f %%" @@ -24656,71 +24695,71 @@ msgstr "" "<b>Willkommen zu Inkscape!</b> Formen- und Freihandwerkzeuge erstellen " "Objekte; das Auswahlwerkzeug (Pfeil) verschiebt und bearbeitet." -#: ../src/widgets/desktop-widget.cpp:823 +#: ../src/widgets/desktop-widget.cpp:829 msgid "grayscale" msgstr "Graustufen" -#: ../src/widgets/desktop-widget.cpp:824 +#: ../src/widgets/desktop-widget.cpp:830 msgid ", grayscale" msgstr ", Graustufen" -#: ../src/widgets/desktop-widget.cpp:825 +#: ../src/widgets/desktop-widget.cpp:831 msgid "print colors preview" msgstr "_Druckfarben-Vorschau" -#: ../src/widgets/desktop-widget.cpp:826 +#: ../src/widgets/desktop-widget.cpp:832 msgid ", print colors preview" msgstr ", Druckfarben-Vorschau" -#: ../src/widgets/desktop-widget.cpp:827 +#: ../src/widgets/desktop-widget.cpp:833 msgid "outline" msgstr "Umriss" -#: ../src/widgets/desktop-widget.cpp:828 +#: ../src/widgets/desktop-widget.cpp:834 msgid "no filters" msgstr "Keine _Filter" -#: ../src/widgets/desktop-widget.cpp:855 +#: ../src/widgets/desktop-widget.cpp:861 #, c-format msgid "%s%s: %d (%s%s) - Inkscape" msgstr "%s%s: %d (%s%s) - Inkscape" -#: ../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 "%s%s: %d (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:863 +#: ../src/widgets/desktop-widget.cpp:869 #, c-format msgid "%s%s: %d - Inkscape" msgstr "%s%s: %d - Inkscape" -#: ../src/widgets/desktop-widget.cpp:869 +#: ../src/widgets/desktop-widget.cpp:875 #, c-format msgid "%s%s (%s%s) - Inkscape" msgstr "%s%s (%s%s) - Inkscape" -#: ../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 "%s%s (%s) - Inkscape" -#: ../src/widgets/desktop-widget.cpp:877 +#: ../src/widgets/desktop-widget.cpp:883 #, c-format msgid "%s%s - Inkscape" msgstr "%s%s - Inkscape" # ??? -#: ../src/widgets/desktop-widget.cpp:1045 +#: ../src/widgets/desktop-widget.cpp:1052 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:1047 +#: ../src/widgets/desktop-widget.cpp:1054 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:1102 +#: ../src/widgets/desktop-widget.cpp:1109 #, c-format msgid "" "<span weight=\"bold\" size=\"larger\">Save changes to document \"%s\" before " @@ -24733,12 +24772,12 @@ msgstr "" "\n" "Wenn Sie schließen, ohne zu speichern, dann gehen Ihre Änderungen verloren." -#: ../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 "Schließen, _ohne zu speichern" -#: ../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 " @@ -24751,12 +24790,12 @@ msgstr "" "\n" "Möchten Sie das Dokument als ein Inkscape SVG speichern?" -#: ../src/widgets/desktop-widget.cpp:1173 +#: ../src/widgets/desktop-widget.cpp:1180 msgid "_Save as Inkscape SVG" msgstr "Als Inkscape-_SVG speichern" # CHECK -#: ../src/widgets/desktop-widget.cpp:1383 +#: ../src/widgets/desktop-widget.cpp:1390 msgid "Note:" msgstr "Hinweis:" @@ -24844,23 +24883,23 @@ msgstr "Muster für die Füllung setzen" msgid "Set pattern on stroke" msgstr "Muster für die Kontur setzen" -#: ../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 "Schriftgröße:" #. Family frame -#: ../src/widgets/font-selector.cpp:147 +#: ../src/widgets/font-selector.cpp:145 msgid "Font family" msgstr "Schriftfamilie" #. Style frame -#: ../src/widgets/font-selector.cpp:178 +#: ../src/widgets/font-selector.cpp:189 msgctxt "Font selector" msgid "Style" msgstr "Stil" -#: ../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 "Schriftgröße:" @@ -25147,7 +25186,7 @@ msgstr "LPE Dialog öffnen" msgid "Open LPE dialog (to adapt parameters numerically)" msgstr "Öffnet den LPE-Dialog (erlaubt Anpassung der Parameterwerte)" -#: ../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 "Schriftgröße" @@ -26438,243 +26477,238 @@ msgstr "Farbe der Markierung setzen" msgid "Change swatch color" msgstr "Farbmuster-Farbe ändern" -# !! -#: ../src/widgets/text-toolbar.cpp:374 -#, c-format -msgid "Failed to find font matching: %s\n" -msgstr "Fehler bei Schriftartübereinstimmung: %s\n" - -#: ../src/widgets/text-toolbar.cpp:408 +#: ../src/widgets/text-toolbar.cpp:180 msgid "Text: Change font family" msgstr "Text: Schriftfamilie ändern" -#: ../src/widgets/text-toolbar.cpp:476 +#: ../src/widgets/text-toolbar.cpp:244 msgid "Text: Change font size" msgstr "Text: Schriftgröße ändern" -#: ../src/widgets/text-toolbar.cpp:568 +#: ../src/widgets/text-toolbar.cpp:282 msgid "Text: Change font style" msgstr "Text: Schriftstil ändern" -#: ../src/widgets/text-toolbar.cpp:648 +#: ../src/widgets/text-toolbar.cpp:360 msgid "Text: Change superscript or subscript" msgstr "Text: Ändern von Hoch- und Tiefgestellt" -#: ../src/widgets/text-toolbar.cpp:793 +#: ../src/widgets/text-toolbar.cpp:505 msgid "Text: Change alignment" msgstr "Text: Ausrichtung ändern" -#: ../src/widgets/text-toolbar.cpp:836 +#: ../src/widgets/text-toolbar.cpp:548 msgid "Text: Change line-height" msgstr "Text: Linienhöhe ändern" -#: ../src/widgets/text-toolbar.cpp:885 +#: ../src/widgets/text-toolbar.cpp:597 msgid "Text: Change word-spacing" msgstr "Text: Wortabstand ändern" -#: ../src/widgets/text-toolbar.cpp:926 +#: ../src/widgets/text-toolbar.cpp:638 msgid "Text: Change letter-spacing" msgstr "Text: Buchstabenabstand ändern" -#: ../src/widgets/text-toolbar.cpp:966 +#: ../src/widgets/text-toolbar.cpp:678 msgid "Text: Change dx (kern)" msgstr "Text: Ändern dx (kern)" -#: ../src/widgets/text-toolbar.cpp:1000 +#: ../src/widgets/text-toolbar.cpp:712 msgid "Text: Change dy" msgstr "Text: Ändern dy" -#: ../src/widgets/text-toolbar.cpp:1035 +#: ../src/widgets/text-toolbar.cpp:747 msgid "Text: Change rotate" msgstr "Text: Ändern Drehung" -#: ../src/widgets/text-toolbar.cpp:1083 +#: ../src/widgets/text-toolbar.cpp:795 msgid "Text: Change orientation" msgstr "Text: Richtung ändern" -#: ../src/widgets/text-toolbar.cpp:1464 +#: ../src/widgets/text-toolbar.cpp:1237 msgid "Font Family" msgstr "Schriftfamilie" -#: ../src/widgets/text-toolbar.cpp:1465 +#: ../src/widgets/text-toolbar.cpp:1238 msgid "Select Font Family (Alt-X to access)" msgstr "Schriftart-Familie auswählen (Alt + X zum Setzen)" -#. 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 "Wähle allen Text mit dieser Schriftart-Familie aus" + +#: ../src/widgets/text-toolbar.cpp:1252 msgid "Font not found on system" msgstr "Schrift wurde im System nicht gefunden" -#: ../src/widgets/text-toolbar.cpp:1520 +#: ../src/widgets/text-toolbar.cpp:1311 msgid "Font Style" msgstr "Schriftstil" -#: ../src/widgets/text-toolbar.cpp:1521 +#: ../src/widgets/text-toolbar.cpp:1312 msgid "Font style" msgstr "Schriftstil" #. Name -#: ../src/widgets/text-toolbar.cpp:1537 +#: ../src/widgets/text-toolbar.cpp:1329 msgid "Toggle Superscript" msgstr "Hochgestellt umschalten" #. Label -#: ../src/widgets/text-toolbar.cpp:1538 +#: ../src/widgets/text-toolbar.cpp:1330 msgid "Toggle superscript" msgstr "Hochgestellt umschalten" #. Name -#: ../src/widgets/text-toolbar.cpp:1550 +#: ../src/widgets/text-toolbar.cpp:1342 msgid "Toggle Subscript" msgstr "Tiefgestellt umschalten" #. Label -#: ../src/widgets/text-toolbar.cpp:1551 +#: ../src/widgets/text-toolbar.cpp:1343 msgid "Toggle subscript" msgstr "Tiefgestellt umschalten" -#: ../src/widgets/text-toolbar.cpp:1592 +#: ../src/widgets/text-toolbar.cpp:1384 msgid "Justify" msgstr "Blocksatz" #. Name -#: ../src/widgets/text-toolbar.cpp:1599 +#: ../src/widgets/text-toolbar.cpp:1391 msgid "Alignment" msgstr "Ausrichtung" #. Label -#: ../src/widgets/text-toolbar.cpp:1600 +#: ../src/widgets/text-toolbar.cpp:1392 msgid "Text alignment" msgstr "Textausrichtung" -#: ../src/widgets/text-toolbar.cpp:1627 +#: ../src/widgets/text-toolbar.cpp:1419 msgid "Horizontal" msgstr "Horizontal" -#: ../src/widgets/text-toolbar.cpp:1634 +#: ../src/widgets/text-toolbar.cpp:1426 msgid "Vertical" msgstr "Vertikal" #. Label -#: ../src/widgets/text-toolbar.cpp:1641 +#: ../src/widgets/text-toolbar.cpp:1433 msgid "Text orientation" msgstr "Textausrichtung" #. Drop down menu -#: ../src/widgets/text-toolbar.cpp:1664 +#: ../src/widgets/text-toolbar.cpp:1456 msgid "Smaller spacing" msgstr "Kleinerer Abstand" -#: ../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 "Normal" -#: ../src/widgets/text-toolbar.cpp:1664 +#: ../src/widgets/text-toolbar.cpp:1456 msgid "Larger spacing" msgstr "Größerer Abstand" #. name -#: ../src/widgets/text-toolbar.cpp:1669 +#: ../src/widgets/text-toolbar.cpp:1461 msgid "Line Height" msgstr "Linienhöhe" #. label -#: ../src/widgets/text-toolbar.cpp:1670 +#: ../src/widgets/text-toolbar.cpp:1462 msgid "Line:" msgstr "Linie:" #. short label -#: ../src/widgets/text-toolbar.cpp:1671 +#: ../src/widgets/text-toolbar.cpp:1463 msgid "Spacing between lines (times font size)" msgstr "Abstand zwischen Linien (Times Schriftgröße)" #. 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 "Negativer Abstand" -#: ../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 "Positiver Abstand" #. name -#: ../src/widgets/text-toolbar.cpp:1700 +#: ../src/widgets/text-toolbar.cpp:1492 msgid "Word spacing" msgstr "Wortabstand" #. label -#: ../src/widgets/text-toolbar.cpp:1701 +#: ../src/widgets/text-toolbar.cpp:1493 msgid "Word:" msgstr "Wort:" #. short label -#: ../src/widgets/text-toolbar.cpp:1702 +#: ../src/widgets/text-toolbar.cpp:1494 msgid "Spacing between words (px)" msgstr "Abstand zwischen Wörtern (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1731 +#: ../src/widgets/text-toolbar.cpp:1523 msgid "Letter spacing" msgstr "Buchstabenabstand" #. label -#: ../src/widgets/text-toolbar.cpp:1732 +#: ../src/widgets/text-toolbar.cpp:1524 msgid "Letter:" msgstr "Buchstabe:" #. short label -#: ../src/widgets/text-toolbar.cpp:1733 +#: ../src/widgets/text-toolbar.cpp:1525 msgid "Spacing between letters (px)" msgstr "Abstand zwischen Buchstaben (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1762 +#: ../src/widgets/text-toolbar.cpp:1554 msgid "Kerning" msgstr "Unterschneidung" #. label -#: ../src/widgets/text-toolbar.cpp:1763 +#: ../src/widgets/text-toolbar.cpp:1555 msgid "Kern:" msgstr "Kern:" #. short label -#: ../src/widgets/text-toolbar.cpp:1764 +#: ../src/widgets/text-toolbar.cpp:1556 msgid "Horizontal kerning (px)" msgstr "Horizontale Unterschneidung (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1793 +#: ../src/widgets/text-toolbar.cpp:1585 msgid "Vertical Shift" msgstr "Vertikaler Versatz" #. label -#: ../src/widgets/text-toolbar.cpp:1794 +#: ../src/widgets/text-toolbar.cpp:1586 msgid "Vert:" msgstr "Vert:" #. short label -#: ../src/widgets/text-toolbar.cpp:1795 +#: ../src/widgets/text-toolbar.cpp:1587 msgid "Vertical shift (px)" msgstr "Vertikaler Versatz (px)" #. name -#: ../src/widgets/text-toolbar.cpp:1824 +#: ../src/widgets/text-toolbar.cpp:1616 msgid "Letter rotation" msgstr "Buchstabenrotation" #. label -#: ../src/widgets/text-toolbar.cpp:1825 +#: ../src/widgets/text-toolbar.cpp:1617 msgid "Rot:" msgstr "Rotation:" #. short label -#: ../src/widgets/text-toolbar.cpp:1826 +#: ../src/widgets/text-toolbar.cpp:1618 msgid "Character rotation (degrees)" msgstr "Zeichenrotation [Grad]" @@ -28017,42 +28051,42 @@ msgid "Cleans the cruft out of Adobe Illustrator SVGs before opening" msgstr "Räumt Adobe-Illustrator-SVGs vor dem Öffnen auf" #: ../share/extensions/ccx_input.inx.h:1 -msgid "Corel DRAW Compressed Exchange files input" -msgstr "Corel DRAW Compressed Exchange Datei einlesen" +msgid "Corel DRAW Compressed Exchange files input (UC)" +msgstr "Corel DRAW Compressed Exchange Datei einlesen (UC)" #: ../share/extensions/ccx_input.inx.h:2 -msgid "Corel DRAW Compressed Exchange files (.ccx)" -msgstr "Corel DRAW Komprimierte Exchange Datei (.ccx)" +msgid "Corel DRAW Compressed Exchange files (UC) (.ccx)" +msgstr "Corel DRAW Komprimierte Exchange Datei (UC) (.ccx)" #: ../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 "" "Öffnen einer komprimierten Exchange Datei, die in Corel DRAW gespeichert " -"wurde" +"wurde (UC)" #: ../share/extensions/cdr_input.inx.h:1 -msgid "Corel DRAW Input" -msgstr "Corel DRAW einlesen" +msgid "Corel DRAW Input (UC)" +msgstr "Corel DRAW (UC) einlesen" #: ../share/extensions/cdr_input.inx.h:2 -msgid "Corel DRAW 7-X4 files (*.cdr)" -msgstr "Corel DRAW 7-X4 Dateien (*.cdr)" +msgid "Corel DRAW 7-X4 files (UC) (*.cdr)" +msgstr "Corel DRAW 7-X4 (UC) Dateien (*.cdr)" #: ../share/extensions/cdr_input.inx.h:3 -msgid "Open files saved in Corel DRAW 7-X4" -msgstr "In Corel DRAW 7-X4 gespeicherte Dateien öffnen" +msgid "Open files saved in Corel DRAW 7-X4 (UC)" +msgstr "In Corel DRAW 7-X4 (UC) gespeicherte Dateien öffnen" #: ../share/extensions/cdt_input.inx.h:1 -msgid "Corel DRAW templates input" -msgstr "Corel DRAW Vorlagen einlesen" +msgid "Corel DRAW templates input (UC)" +msgstr "Corel DRAW Vorlagen einlesen (UC)" #: ../share/extensions/cdt_input.inx.h:2 -msgid "Corel DRAW 7-13 template files (.cdt)" -msgstr "Corel DRAW 7-13 Vorlagendateien (.cdt)" +msgid "Corel DRAW 7-13 template files (UC) (.cdt)" +msgstr "Corel DRAW 7-13 Vorlagendateien (UC) (.cdt)" #: ../share/extensions/cdt_input.inx.h:3 -msgid "Open files saved in Corel DRAW 7-13" -msgstr "In Corel DRAW 7-13 gespeicherte Dateien öffnen" +msgid "Open files saved in Corel DRAW 7-13 (UC)" +msgstr "In Corel DRAW 7-13 gespeicherte Dateien öffnen (UC)" #: ../share/extensions/cgm_input.inx.h:1 msgid "Computer Graphics Metafile files input" @@ -28067,17 +28101,18 @@ msgid "Open Computer Graphics Metafile files" msgstr "Computer Graphics Metafile Dateien öffnen" #: ../share/extensions/cmx_input.inx.h:1 -msgid "Corel DRAW Presentation Exchange files input" -msgstr "Corel DRAW Presentations Exchange Datei einlesen" +msgid "Corel DRAW Presentation Exchange files input (UC)" +msgstr "Corel DRAW Presentations Exchange Datei einlesen (UC)" #: ../share/extensions/cmx_input.inx.h:2 -msgid "Corel DRAW Presentation Exchange files (.cmx)" -msgstr "Corel DRAW Presentations Exchange Datei (.cmx)" +msgid "Corel DRAW Presentation Exchange files (UC) (.cmx)" +msgstr "Corel DRAW Presentations Exchange Datei (UC) (.cmx)" #: ../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 "" -"Öffnen einer Presentation Exchange Datei, die in Corel DRAW gespeichert wurde" +"Öffnen einer Presentation Exchange Datei, die in Corel DRAW gespeichert " +"wurde (UC)" #: ../share/extensions/color_blackandwhite.inx.h:1 msgid "Black and White" @@ -30142,38 +30177,191 @@ msgid "HPGL Output" msgstr "HPGL-Ausgabe" #: ../share/extensions/hpgl_output.inx.h:2 -msgid "hpgl output flatness" -msgstr "hpgl Ausgabe-Flachheit" +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." #: ../share/extensions/hpgl_output.inx.h:3 -msgid "Mirror Y-axis" -msgstr "Y-Spiegelachse" +msgid "Resolution (dpi)" +msgstr "Auflösung (Punkte pro Zoll)" #: ../share/extensions/hpgl_output.inx.h:4 -msgid "X-origin (px)" -msgstr "X-Ursprung [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 "" +"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')" #: ../share/extensions/hpgl_output.inx.h:5 -msgid "Y-origin (px)" -msgstr "Y-Ursprung [px]" - -#: ../share/extensions/hpgl_output.inx.h:6 -msgid "Resolution (dpi)" -msgstr "Auflösung (Punkte pro Zoll)" - -#: ../share/extensions/hpgl_output.inx.h:7 msgid "Pen number" msgstr "Stiftnummer" +#: ../share/extensions/hpgl_output.inx.h:6 +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')" + #: ../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 "" +"Ausrichtung des Plots, ändern Sie dies wenn Ihr Plotter horizontal statt " +"vertikal plottet (Standard: '-90 °')" + +#: ../share/extensions/hpgl_output.inx.h:9 +msgid "Mirror Y-axis" +msgstr "Y-Spiegelachse" + +#: ../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 "" +"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')" + +#: ../share/extensions/hpgl_output.inx.h:11 +msgid "Curve flatness (mm)" +msgstr "Kurven-Ebenheit (mm)" + +#: ../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 "" +"Kurven werden in Zeilen aufgeteilt, dies ist die ungefähre Länge einer " +"einzelnen Zeile in mm (Standard: '0.50')" + +#: ../share/extensions/hpgl_output.inx.h:13 +msgid "Use Overcut" +msgstr "Überschnitt nutzen" + +#: ../share/extensions/hpgl_output.inx.h:14 +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')" + +#: ../share/extensions/hpgl_output.inx.h:15 +msgid "Overcut (mm)" +msgstr "Überschnitt (mm)" + +#: ../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 "" +"Der Abstand in mm, mit dem über den Ausgangspunkt des Pfades geschnitten " +"wird, um offene Pfade zu schützen (Standard: '1.00')" + +#: ../share/extensions/hpgl_output.inx.h:17 +msgid "Correct tool offset" +msgstr "Werkzeugversatz korrigieren" + +#: ../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 "" +"Prüfen, ob der Werkzeugversatz behoben werden sollte. Wenn nicht, sind " +"'Werkzeugversatz' und 'Return-Faktor' -Parameter unbenutzt (Standard: 'Ein')" + +#: ../share/extensions/hpgl_output.inx.h:19 +msgid "Tool offset (mm)" +msgstr "Werkzeugversatz (mm)" + +#: ../share/extensions/hpgl_output.inx.h:20 +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')" + +#: ../share/extensions/hpgl_output.inx.h:21 +msgid "Return Factor" +msgstr "Return-Faktor" + +#: ../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 "" +"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')" + +#: ../share/extensions/hpgl_output.inx.h:23 +msgid "X offset (mm)" +msgstr "X Versatz (mm)" + +#: ../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 "" +"Der Versatz, um Ihren Plot vom Null-Punkt weg zu verschieben in mm " +"(Standard: '0.00')" + +#: ../share/extensions/hpgl_output.inx.h:25 +msgid "Y offset (mm)" +msgstr "Y Versatz (mm)" + +#: ../share/extensions/hpgl_output.inx.h:26 msgid "Plot invisible layers" msgstr "Plotte unsichtbare Ebenen" -#: ../share/extensions/hpgl_output.inx.h:9 +#: ../share/extensions/hpgl_output.inx.h:27 +msgid "Plot invisible layers (Standard: 'False')" +msgstr "Plotte unsichtbare Ebenen (Standard: \"Aus')" + +#: ../share/extensions/hpgl_output.inx.h:28 +msgid "Send to Plotter also" +msgstr "Auch zum Plotter schicken" + +#: ../share/extensions/hpgl_output.inx.h:29 +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')" + +#: ../share/extensions/hpgl_output.inx.h:30 +msgid "Serial Port" +msgstr "Serieller Port" + +#: ../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 "" +"Der Anschluss Ihrer seriellen Verbindung ist unter Windows so etwas wie " +"'COM1', unter Linux so etwas wie: '/dev/ttyUSB0' (Standard: 'COM1')" + +#: ../share/extensions/hpgl_output.inx.h:32 +msgid "Baud Rate" +msgstr "Baudrate" + +#: ../share/extensions/hpgl_output.inx.h:33 +msgid "The Baud rate of your serial connection (Standard: '9600')" +msgstr "Die Baudrate ihrer Serial-Verbindung (Standard '9600')" + +#: ../share/extensions/hpgl_output.inx.h:34 msgid "HP Graphics Language file (*.hpgl)" msgstr "HP Graphics Language Datei (*.hpgl)" -#: ../share/extensions/hpgl_output.inx.h:10 +#: ../share/extensions/hpgl_output.inx.h:35 msgid "Export to an HP Graphics Language file" msgstr "Export in eine HP Graphic Language Datei" @@ -31356,13 +31544,13 @@ msgstr "Band" #: ../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 "" -"Dieser Effekt biegt ein Muster entlang eines beliebigen \"Gerüst-\"Pfades. " -"Das Muster ist das oberste Objekt in einer Auswahl (Gruppierungen von Pfaden/" -"Formen/Klonen... sind erlaubt)." +"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." #: ../share/extensions/pathscatter.inx.h:3 msgid "Follow path orientation" @@ -33197,6 +33385,39 @@ msgstr "Ein beliebtes Dateiformat für Clipart" msgid "XAML Input" msgstr "XAML einlesen" +#~ 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." +#~ msgstr "" +#~ "Die Filterbausteine DiffuseBeleuchtung und <b>Punktlichtbeleuchtung</b> " +#~ "erzeugen \"geprägte\" Schattierungen. Der Alphakanal des Eingangs wird " +#~ "verwendet, um Höheninformationen zu erhalten: opakere Gebiete werden " +#~ "angehoben, weniger opake abgesenkt." + +# !! +#~ msgid "Failed to find font matching: %s\n" +#~ msgstr "Fehler bei Schriftartübereinstimmung: %s\n" + +#~ msgid "hpgl output flatness" +#~ msgstr "hpgl Ausgabe-Flachheit" + +#~ msgid "X-origin (px)" +#~ msgstr "X-Ursprung [px]" + +#~ msgid "Y-origin (px)" +#~ msgstr "Y-Ursprung [px]" + +#~ 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)." +#~ msgstr "" +#~ "Dieser Effekt biegt ein Muster entlang eines beliebigen \"Gerüst-" +#~ "\"Pfades. Das Muster ist das oberste Objekt in einer Auswahl " +#~ "(Gruppierungen von Pfaden/Formen/Klonen... sind erlaubt)." + #~ msgid "Blur type:" #~ msgstr "Unschärfe-Typ:" 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 <defs>." msgid_plural "Removed <b>%i</b> unused definitions in <defs>." msgstr[0] "" msgstr[1] "" -#: ../src/file.cpp:603 +#: ../src/file.cpp:604 msgid "No unused definitions in <defs>." 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 @@ -6,7 +6,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" @@ -756,15 +756,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" @@ -804,15 +804,15 @@ msgstr "Baudu dārzs" #: ../share/filters/filters.svg.h:1 msgid "Phantasmagorical turbulent wisps, like Hieronymus Bosch's Garden of Delights" -msgstr "" +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 "" +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" @@ -876,7 +876,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" @@ -1035,7 +1035,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" @@ -1047,11 +1047,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" @@ -1059,11 +1059,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" @@ -1075,7 +1075,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" @@ -1083,7 +1083,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" @@ -1091,11 +1091,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 "Paint objects with a transparent turbulence which turns around color edges" @@ -1602,7 +1602,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" @@ -1654,7 +1654,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" @@ -1674,11 +1674,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" @@ -2016,7 +2016,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 @@ -2112,7 +2112,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 @@ -2178,7 +2178,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 @@ -2598,7 +2598,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 @@ -3484,7 +3484,7 @@ msgstr "Vai atstarpes starp slejām ir vienādas (1), savirzās (<1), atvirzās #: ../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" @@ -4884,11 +4884,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" @@ -5118,7 +5118,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" @@ -5279,7 +5279,7 @@ msgstr "Moduļu mape (%s) nav pieejama. Ārējie moduļi no šī mapes netiks i #: ../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 @@ -5357,7 +5357,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" @@ -5621,11 +5621,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" @@ -5835,7 +5835,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" @@ -6174,9 +6174,8 @@ 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 pielietošanas" +msgstr "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 msgid "Cross Blur" @@ -6529,11 +6528,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" @@ -6636,7 +6635,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 @@ -6899,7 +6898,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" @@ -6943,11 +6942,11 @@ msgstr "Zilā nobīde" #: ../src/extension/internal/filter/color.h:1215 msgid "Nudge RGB channels separately and blend them to different types of backgrounds" -msgstr "" +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" @@ -6963,7 +6962,7 @@ msgstr "Dzeltenā nobīde" #: ../src/extension/internal/filter/color.h:1327 msgid "Nudge CMY channels separately and blend them to different types of backgrounds" -msgstr "" +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" @@ -7134,7 +7133,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 @@ -7145,7 +7144,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" @@ -7232,7 +7231,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 @@ -7358,7 +7357,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" @@ -7516,11 +7515,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 @@ -7557,11 +7556,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:" @@ -7573,7 +7572,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" @@ -7589,7 +7588,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:" @@ -7944,7 +7943,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" @@ -7965,7 +7964,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 @@ -8128,7 +8127,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 @@ -8275,7 +8274,7 @@ msgstr "Salikts" #: ../src/filter-enums.cpp:24 msgid "Convolve Matrix" -msgstr "" +msgstr "Konvolēt matricu" #: ../src/filter-enums.cpp:25 msgid "Diffuse Lighting" @@ -8325,11 +8324,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" @@ -8486,8 +8485,9 @@ msgstr "" #, c-format msgid "Area filled, path with <b>%d</b> node created and unioned with selection." msgid_plural "Area filled, path with <b>%d</b> nodes created and unioned with selection." -msgstr[0] "" -msgstr[1] "" +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 @@ -8891,28 +8891,28 @@ msgstr "Pēdas" #: ../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." @@ -8973,7 +8973,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" @@ -9371,7 +9371,7 @@ msgstr "" #: ../src/libgdl/gdl-dock-master.c:783 #, c-format msgid "master %p: unable to add object %p[%s] to the hash. There already is an item with that name (%p)." -msgstr "" +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 @@ -9707,7 +9707,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" @@ -10004,7 +10004,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" @@ -10086,7 +10086,7 @@ msgstr "Attālums starp raksta kopijām. Negatīvas vērtības ir pieļaujamas, #: ../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:" @@ -10098,7 +10098,7 @@ msgstr "Nobīdes faktūras izmēru vienībās" #: ../src/live_effects/lpe-patternalongpath.cpp:73 msgid "Spacing, tangential and normal offset are expressed as a ratio of width/height" -msgstr "" +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" @@ -10185,7 +10185,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:" @@ -10242,7 +10242,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:" @@ -10501,7 +10501,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:" @@ -10509,7 +10509,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:" @@ -10549,7 +10549,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:" @@ -10569,11 +10569,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 @@ -10583,7 +10583,7 @@ msgstr "Izmērs:" #: ../src/live_effects/lpe-sketch.cpp:59 msgid "Scale factor relating curvature and length of construction lines (try 5*offset)" -msgstr "" +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:" @@ -10591,7 +10591,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:" @@ -10599,7 +10599,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:" @@ -10607,7 +10607,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:" @@ -10757,7 +10757,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 @@ -10772,7 +10772,7 @@ msgstr "FAILA NOSAUKUMS" #: ../src/main.cpp:289 msgid "Print document(s) to specified output file (use '| program' for pipe)" -msgstr "" +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" @@ -10889,27 +10889,27 @@ msgstr "Eksportējot pārvērst teksta objektus par ceļiem (PS, EPS, PDF, SVG)" #: ../src/main.cpp:398 msgid "Render filtered objects without filters, instead of rasterizing (PS, EPS, PDF)" -msgstr "" +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 msgid "Query the X coordinate 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, X koordināti ar --query-id" #. TRANSLATORS: "--query-id" is an Inkscape command line option; see "inkscape --help" #: ../src/main.cpp:410 msgid "Query the Y coordinate 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, 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" @@ -11033,7 +11033,7 @@ msgstr "Objekts" #: ../src/menus-skeleton.h:190 msgid "Cli_p" -msgstr "" +msgstr "Iz_griezt" #: ../src/menus-skeleton.h:194 msgid "Mas_k" @@ -11282,7 +11282,7 @@ msgstr "" #: ../src/pencil-context.cpp:584 msgid "<b>Sketch mode</b>: holding <b>Alt</b> interpolates between sketched paths. Release <b>Alt</b> to finalize." -msgstr "" +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" @@ -11370,27 +11370,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" @@ -11599,8 +11599,9 @@ msgid "<b>Ctrl</b>: click to select in groups; drag to move hor/vert" msgstr "<b>Ctrl</b>: klikšķiniet, lai atlasītu grupās; velciet, lai pārvietotu 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 "<b>Alt</b>: click to select under; scroll mouse-wheel to cycle-select; drag to move selected or select by touch" @@ -11975,15 +11976,15 @@ 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 "" +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" @@ -11991,11 +11992,11 @@ msgstr "Iestatīt masku" #: ../src/selection-chemistry.cpp:3727 msgid "Select <b>object(s)</b> to remove clippath or mask from." -msgstr "" +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" @@ -12348,12 +12349,12 @@ msgstr "<b>Shift+vilkt</b>, lai pagrieztu, <b>Ctrl+vilkt</b> - lai pārvietotu s #: ../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 @@ -12390,7 +12391,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 @@ -12582,7 +12583,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." @@ -12593,8 +12594,9 @@ 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 "" +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 @@ -12746,7 +12748,7 @@ msgstr "Jūs nevarat izkārtot tekstu gar taisnstūri šajā versijā. Vispirms #: ../src/text-chemistry.cpp:115 msgid "The flowed text(s) must be <b>visible</b> in order to be put on a path." -msgstr "" +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 @@ -12797,7 +12799,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 "" +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" @@ -12813,7 +12815,7 @@ msgstr "<b>Uzklikšķiniet</b>, lai labotu tekstu, <b>velciet</b> - lai atlasīt #: ../src/text-context.cpp:422 msgid "<b>Click</b> to edit the flowed text, <b>drag</b> to select part of the text." -msgstr "" +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" @@ -12929,7 +12931,7 @@ msgstr "Ielīmet tekstu" #: ../src/text-context.cpp:1625 #, c-format msgid "Type or edit flowed text (%d characters%s); <b>Enter</b> to start new paragraph." -msgstr "" +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 @@ -12939,7 +12941,7 @@ msgstr "Ievadiet vai labojiet tekstu (%d rakstzīmes%s); nospiediet <b>Enter</b> #: ../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." -msgstr "" +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" @@ -12963,7 +12965,7 @@ msgstr "<b>Velciet</b>, lai izveidotu taisnstūri. <b>Velciet vadīklas</b>, lai #: ../src/tools-switch.cpp:159 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 "" +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 "<b>Drag</b> to create an ellipse. <b>Drag controls</b> to make an arc or segment. <b>Click</b> to select." @@ -12983,7 +12985,7 @@ msgstr "<b>Velciet</b>, lai izveidotu brīvas rokas līniju. <b>Shift</b> pievie #: ../src/tools-switch.cpp:189 msgid "<b>Click</b> or <b>click and drag</b> to start a path; with <b>Shift</b> to append to selected path. <b>Ctrl+click</b> to create single dots (straight line modes only)." -msgstr "" +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 "<b>Drag</b> to draw a calligraphic stroke; with <b>Ctrl</b> to track a guide path. <b>Arrow keys</b> adjust width (left/right) and angle (up/down)." @@ -12991,11 +12993,11 @@ msgstr "<b>Velciet</b>, lai izveidotu kaligrāfisku vilkumu; ar <b>Ctrl</b> - se #: ../src/tools-switch.cpp:207 msgid "<b>Drag</b> or <b>double click</b> to create a gradient on selected objects, <b>drag handles</b> to adjust gradients." -msgstr "" +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 "" +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 "<b>Click</b> or <b>drag around an area</b> to zoom in, <b>Shift+click</b> to zoom out." @@ -13119,7 +13121,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 @@ -13178,7 +13180,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" @@ -13210,7 +13212,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." @@ -13227,7 +13229,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 @@ -13290,7 +13292,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 @@ -13300,7 +13302,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 @@ -13419,7 +13421,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" @@ -13459,7 +13461,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" @@ -13468,7 +13470,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" @@ -13492,7 +13494,7 @@ msgstr "Izretināt objektus: censties vienādot attālumu starp malām" #: ../src/ui/dialog/align-and-distribute.cpp:1021 msgid "Move objects as little as possible so that their bounding boxes do not overlap" -msgstr "" +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" @@ -13617,7 +13619,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 @@ -13655,7 +13657,7 @@ msgstr "Fo_na krāsa:" #: ../src/ui/dialog/document-properties.cpp:106 msgid "Color of the page background. Note: transparency setting ignored while editing but used when exporting to bitmap." -msgstr "" +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:" @@ -13779,11 +13781,11 @@ msgstr "Ja iestatīts, objekti tiek piesaistīti palīglīnijām tikai tad, ja t #. --------------------------------------------------------------- #: ../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" @@ -14136,35 +14138,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)" @@ -14226,7 +14228,7 @@ msgstr "Vilkuma st_ils" #. TRANSLATORS: this dialog is accessible via menu Filters - Filter editor #: ../src/ui/dialog/filter-effects-dialog.cpp:487 msgid "This matrix determines a linear transform on color space. Each line affects one of the color components. Each column determines how much of each color 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 "" +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" @@ -14305,7 +14307,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 @@ -14362,15 +14364,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:" @@ -14422,7 +14424,7 @@ msgstr "Filtra efektu apgabala augstums" #: ../src/ui/dialog/filter-effects-dialog.cpp:2523 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 convenience shortcuts to allow commonly used color operations to be performed without specifying a complete matrix." -msgstr "" +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):" @@ -14462,11 +14464,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: @@ -14477,11 +14479,11 @@ msgstr "Mērķis:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2547 msgid "X coordinate of the target point in the convolve matrix. The convolution is applied to pixels around this point." -msgstr "" +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 "" +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 @@ -14490,7 +14492,7 @@ msgstr "Kodols:" #: ../src/ui/dialog/filter-effects-dialog.cpp:2549 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 arrangements of values in this matrix result in various possible visual effects. An identity matrix would lead to a motion blur effect (parallel to the matrix diagonal) while a matrix filled with a constant non-zero value would lead to a common blur effect." -msgstr "" +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:" @@ -14502,7 +14504,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 "This value is added to each component. This is useful to define a constant value as the zero response of the filter." @@ -14510,7 +14512,7 @@ msgstr "Šī vērtība tiek pievienota katram komponentam. Ir lietderīgi noteik #: ../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 "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." @@ -14522,7 +14524,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 @@ -14582,7 +14584,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." @@ -14638,11 +14640,11 @@ msgstr "" #: ../src/ui/dialog/filter-effects-dialog.cpp:2602 msgid "Indicates whether the filter primitive should perform a noise or turbulence function." -msgstr "" +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:" @@ -14658,15 +14660,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 "" +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 "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 "" +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 "The <b>feComponentTransfer</b> filter primitive manipulates the input's color components (red, green, blue, and alpha) according to particular transfer functions, allowing operations like brightness and contrast adjustment, color balance, and thresholding." @@ -14676,9 +14681,11 @@ msgstr "" 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 standard. Porter-Duff blending modes are essentially logical operations 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 the image. Common effects created using convolution matrices are blur, sharpening, embossing and edge detection. Note that while gaussian blur can be created using this filter primitive, the special gaussian blur primitive is faster and resolution-independent." -msgstr "" +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 "The <b>feDiffuseLighting</b> and feSpecularLighting 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." @@ -14726,11 +14733,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:" @@ -15019,7 +15026,7 @@ msgstr "Gurmuku" #: ../src/ui/dialog/glyphs.cpp:71 msgid "Han" -msgstr "" +msgstr "Hanu" #: ../src/ui/dialog/glyphs.cpp:72 msgid "Hangul" @@ -15208,7 +15215,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 @@ -15221,7 +15228,7 @@ msgstr "Senpersiešu" #: ../src/ui/dialog/glyphs.cpp:114 msgid "Kharoshthi" -msgstr "" +msgstr "Karošti" #: ../src/ui/dialog/glyphs.cpp:115 msgid "unassigned" @@ -15291,7 +15298,7 @@ msgstr "Vai" #: ../src/ui/dialog/glyphs.cpp:129 msgid "Carian" -msgstr "" +msgstr "Kariešu" #: ../src/ui/dialog/glyphs.cpp:130 msgid "Lycian" @@ -15535,7 +15542,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" @@ -15711,7 +15718,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" @@ -15794,7 +15801,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" @@ -15814,7 +15821,7 @@ 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 "" +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." @@ -15842,7 +15849,7 @@ msgstr "Šī rīka īpašais stils:" #: ../src/ui/dialog/inkscape-preferences.cpp:273 msgid "Each tool may store its own style to apply to the newly created objects. Use the button below to set it." -msgstr "" +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 @@ -15871,7 +15878,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" @@ -15879,7 +15886,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" @@ -15903,7 +15910,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" @@ -15932,7 +15939,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" @@ -15940,7 +15947,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" @@ -15964,7 +15971,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 @@ -16009,11 +16016,11 @@ msgstr "Atsvaidzināt aprises velkot vai pārveidojot ceļus; ja tas ir izslēgt #: ../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 "" +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" @@ -16045,11 +16052,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" @@ -16087,7 +16094,7 @@ msgstr "Neņemt vērā pirmo un pēdējo punktu" #: ../src/ui/dialog/inkscape-preferences.cpp:384 msgid "The start and end of the measurement tool's control line will not be considered for calculating lengths. Only lengths between actual curve intersections will be displayed." -msgstr "" +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 @@ -16100,7 +16107,7 @@ msgstr "Skices režīms" #: ../src/ui/dialog/inkscape-preferences.cpp:421 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 "" +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 @@ -16115,11 +16122,11 @@ msgstr "Kaligrāfija" #: ../src/ui/dialog/inkscape-preferences.cpp:434 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 "" +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 "" +msgstr "Ja ieslēgts, tiks atlasīts katrs jaunizveidotais objekts (atceļot iepriekšējo atlasi)" #. Text #: ../src/ui/dialog/inkscape-preferences.cpp:439 @@ -16130,11 +16137,11 @@ 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 "" +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" @@ -16142,7 +16149,7 @@ msgstr "Rādīt fontu aizvietošanas brīdinājuma dialoglodziņu" #: ../src/ui/dialog/inkscape-preferences.cpp:448 msgid "Show font substitution warning dialog when requested fonts are not available on the system" -msgstr "" +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 @@ -16156,15 +16163,15 @@ 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 "" +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 "" +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 @@ -16194,7 +16201,7 @@ msgstr "Novērst krāsu pāreju definīciju koplietošanu" #: ../src/ui/dialog/inkscape-preferences.cpp:482 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 "" +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" @@ -16202,7 +16209,7 @@ msgstr "Lieto vēsturisko krāsu pāreju redaktoru" #: ../src/ui/dialog/inkscape-preferences.cpp:485 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 "" +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:" @@ -16210,7 +16217,7 @@ msgstr "Lineārās krāsu pārej_as leņķis:" #: ../src/ui/dialog/inkscape-preferences.cpp:489 msgid "Default angle of new linear gradients in degrees (clockwise from horizontal)" -msgstr "" +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 @@ -16224,7 +16231,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" @@ -16548,11 +16555,11 @@ msgstr "Iestatiet ikonu lielumu sekundārajās rīkjoslās (nepieciešama pārst #: ../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 "" +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" @@ -16572,7 +16579,7 @@ msgstr "_Tālummaiņas korekcijas faktors (%):" #: ../src/ui/dialog/inkscape-preferences.cpp:592 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 "" +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" @@ -16585,11 +16592,11 @@ 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 "" +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 @@ -16632,7 +16639,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" @@ -16652,7 +16659,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 "Remember and use the last window's geometry (saves geometry to user preferences)" @@ -16704,11 +16711,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:" @@ -16716,7 +16723,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" @@ -16724,7 +16731,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 "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)" @@ -16893,11 +16900,11 @@ msgstr "Izmantot planšetes vai citas spiedienjūtīgas iekārtas iespējas. Ats #: ../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 "" +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" @@ -16918,19 +16925,19 @@ 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 "" +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" @@ -16942,7 +16949,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" @@ -16970,7 +16977,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:860 msgid "The smallest number written to SVG is 10 to the power of this exponent; anything smaller is written as zero" -msgstr "" +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 @@ -17095,15 +17102,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:" @@ -17203,7 +17210,7 @@ msgstr "Mape automātiskai _saglabāšanai:" #: ../src/ui/dialog/inkscape-preferences.cpp:1045 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 "" +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):" @@ -17279,11 +17286,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 @@ -17459,7 +17466,7 @@ msgstr "Ātrum_s:" #: ../src/ui/dialog/inkscape-preferences.cpp:1161 msgid "How fast the canvas autoscrolls when you drag beyond canvas edge (0 to turn autoscroll off)" -msgstr "" +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 @@ -17469,7 +17476,7 @@ msgstr "S_lieksnis:" #: ../src/ui/dialog/inkscape-preferences.cpp:1164 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 "" +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); @@ -17495,7 +17502,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):" @@ -17503,15 +17510,15 @@ msgstr "Aiz_ture (milisekundēs):" #: ../src/ui/dialog/inkscape-preferences.cpp:1182 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 "" +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:" @@ -17519,7 +17526,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1190 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 "" +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" @@ -17561,11 +17568,11 @@ 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 "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 "" +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:" @@ -17577,15 +17584,15 @@ msgstr "grādi" #: ../src/ui/dialog/inkscape-preferences.cpp:1219 msgid "Rotating with Ctrl pressed snaps every that much degrees; also, pressing [ or ] rotates by this amount" -msgstr "" +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 "" +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:" @@ -17692,7 +17699,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" @@ -17704,11 +17711,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" @@ -17724,7 +17731,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" @@ -17829,7 +17836,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" @@ -18018,7 +18025,7 @@ msgstr "" #: ../src/ui/dialog/inkscape-preferences.cpp:1812 msgid "Factor by which the event clock is skewed from the actual time (0.9766 on some systems)" -msgstr "" +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" @@ -18214,7 +18221,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:" @@ -18999,7 +19006,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" @@ -19017,7 +19024,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:" @@ -19167,7 +19174,7 @@ msgstr "Palieliniet šo, lai samazinātu mezglu skaitu vektorizētajā attēlā #: ../src/ui/dialog/tracedialog.cpp:738 msgid "To_lerance:" -msgstr "" +msgstr "Pie_laide:" #. ## end option page #: ../src/ui/dialog/tracedialog.cpp:752 @@ -19301,7 +19308,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 "Add the specified relative displacement to the current position; otherwise, edit the current absolute position directly" @@ -19329,7 +19336,7 @@ msgstr "Labot pašreizējo matric_u" #: ../src/ui/dialog/transformation.cpp:99 msgid "Edit the current transform= matrix; otherwise, post-multiply transform= by this matrix" -msgstr "" +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" @@ -19349,7 +19356,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" @@ -19382,7 +19389,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" @@ -19611,7 +19618,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 @@ -20037,7 +20044,7 @@ msgstr "Pārstartēt gadījuma skaitļu ģeneratoru; tiks izveidota atšķirīga #: ../src/ui/widget/rendering-options.cpp:31 msgid "Backend" -msgstr "" +msgstr "Aizmugure" #: ../src/ui/widget/rendering-options.cpp:32 msgid "Vector" @@ -20344,7 +20351,7 @@ msgstr "Pieskaņot alfa" #: ../src/ui/widget/selected-style.cpp:1329 #, c-format msgid "Adjusting <b>alpha</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</b> to adjust lightness, with <b>Shift</b> to adjust saturation, without modifiers to adjust hue" -msgstr "" +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" @@ -20353,7 +20360,7 @@ msgstr "Pieskaņot piesātinājumu" #: ../src/ui/widget/selected-style.cpp:1335 #, c-format msgid "Adjusting <b>saturation</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Ctrl</b> to adjust lightness, with <b>Alt</b> to adjust alpha, without modifiers to adjust hue" -msgstr "" +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" @@ -20362,7 +20369,7 @@ msgstr "Pieskaņot gaišumu" #: ../src/ui/widget/selected-style.cpp:1341 #, c-format msgid "Adjusting <b>lightness</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, without modifiers to adjust hue" -msgstr "" +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" @@ -20371,7 +20378,7 @@ msgstr "Pieskaņot toni" #: ../src/ui/widget/selected-style.cpp:1347 #, c-format msgid "Adjusting <b>hue</b>: was %.3g, now <b>%.3g</b> (diff %.3g); with <b>Shift</b> to adjust saturation, with <b>Alt</b> to adjust alpha, with <b>Ctrl</b> to adjust lightness" -msgstr "" +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 @@ -20381,7 +20388,7 @@ msgstr "Pielāgot vilkuma platumu" #: ../src/ui/widget/selected-style.cpp:1468 #, c-format msgid "Adjusting <b>stroke width</b>: was %.3g, now <b>%.3g</b> (diff %.3g)" -msgstr "" +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 @@ -20729,7 +20736,7 @@ msgstr "Uzkopt dokumentu" #: ../src/verbs.cpp:2318 msgid "Remove unused definitions (such as gradients or clipping paths) from the <defs> of the document" -msgstr "" +msgstr "Aizvākt neizmantotos iestatījumus (piemēram, krāsu pārejas vai izgriešanas ceļus) no dokumenta <defs>" #: ../src/verbs.cpp:2320 msgid "_Import..." @@ -20802,7 +20809,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" @@ -20810,7 +20817,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" @@ -20878,7 +20885,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" @@ -20974,7 +20981,7 @@ msgstr "Objektus par palīglīn_ijām" #: ../src/verbs.cpp:2385 msgid "Convert selected objects to a collection of guidelines aligned with their edges" -msgstr "" +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" @@ -21218,7 +21225,7 @@ msgstr "I_zņēmums" #: ../src/verbs.cpp:2457 msgid "Create exclusive OR of selected paths (those parts that belong to only one path)" -msgstr "" +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" @@ -21631,15 +21638,15 @@ msgstr "Noņemt maskas no atlasītā" #: ../src/verbs.cpp:2587 msgid "Apply clipping path to selection (using the topmost object as clipping path)" -msgstr "" +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 @@ -23139,7 +23146,7 @@ msgstr "Intervāls:" #: ../src/widgets/connector-toolbar.cpp:377 msgid "The amount of space left around objects by auto-routing connectors" -msgstr "" +msgstr "Atstājamā brīvā vieta ap objektiem, izmantojot automātisko savienotāju izvietošanu" #: ../src/widgets/connector-toolbar.cpp:388 msgid "Graph" @@ -23151,7 +23158,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" @@ -23159,7 +23166,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" @@ -23844,11 +23851,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" @@ -24132,27 +24139,27 @@ 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 "" +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 "" +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 "" +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 "" +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 "" +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 "Now <b>patterns</b> are <b>transformed</b> along with their objects when those are transformed (moved, scaled, rotated, or skewed)." @@ -25206,7 +25213,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" @@ -25226,7 +25233,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" @@ -25234,7 +25241,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" @@ -25400,11 +25407,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" @@ -25493,7 +25500,7 @@ msgstr "Zema precizitāte vienkāršo ceļus, augsta precizitāte saglabā ceļa #: ../src/widgets/tweak-toolbar.cpp:392 msgid "Use the pressure of the input device to alter the force of tweak action" -msgstr "" +msgstr "Izmantojiet spiedienu uz ievadierīci, lai mainītu pieskaņošanas darbības spēku" #: ../share/extensions/convert2dashes.py:93 msgid "" @@ -25577,11 +25584,11 @@ 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 "" +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" @@ -25767,7 +25774,7 @@ msgstr "" #: ../share/extensions/gcodetools.py:6668 msgid "Orientation points have not been defined! A default set of orientation points has been automatically added." -msgstr "" +msgstr "Orientācijas punkti nav noteikti! Automātiski pievienota noklusēto orientācijas punktu kopa." #: ../share/extensions/gcodetools.py:6672 msgid "Cutting tool has not been defined! A default tool has been automatically added." @@ -25797,6 +25804,10 @@ 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 @@ -25850,11 +25861,11 @@ 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 "" +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." @@ -25970,6 +25981,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" @@ -26616,7 +26629,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" @@ -26624,7 +26637,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" @@ -26652,7 +26665,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" @@ -26660,7 +26673,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" @@ -26668,7 +26681,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" @@ -26700,11 +26713,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:" @@ -26724,12 +26737,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" @@ -27100,6 +27115,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-axis endpoints.\n" @@ -27110,6 +27126,14 @@ 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 @@ -27243,7 +27267,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 "\"Create area offset\": creates several Inkscape path offsets to fill original path's area up to \"Area radius\" value. Outlines start from \"1/2 D\" up to \"Area width\" total width with \"D\" steps where D is taken from the nearest tool definition (\"Tool diameter\" value). Only one offset will be created if the \"Area width\" is equal to \"1/2 D\"." @@ -27590,7 +27614,7 @@ msgstr "Zīmēt papildu grafiku, lai redzētu gravēšanas ceļu" #: ../share/extensions/gcodetools_engraving.inx.h:6 msgid "This function creates path to engrave letters or any shape with sharp angles. Cutter's depth as a function of radius is defined by the tool. Depth may be any Python expression. For instance: cone....(45 degrees)......................: w cone....(height/diameter=10/3)..: 10*w/3 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 "" +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" @@ -27662,7 +27686,7 @@ msgstr "" #: ../share/extensions/gcodetools_graffiti.inx.h:20 #: ../share/extensions/gcodetools_orientation_points.inx.h:13 msgid "Orientation points are used to calculate transformation (offset,scale,mirror,rotation in XY plane) of the path. 3-points mode only: do not put all three into one line (use 2-points mode instead). You can modify Z surface, Z depth values later using text tool (3rd coordinates). If there are no orientation points inside current layer they are taken from the upper layer. Do not ungroup orientation points! You can select them using double click to enter the group or by Ctrl+Click. Now press apply to create control points (independent set for each layer)." -msgstr "" +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" @@ -27810,7 +27834,7 @@ msgstr "Tikai pārbaudīt rīkus" #: ../share/extensions/gcodetools_tools_library.inx.h:11 msgid "Selected tool type fills appropriate default values. You can change these values using the Text tool later on. The topmost (z order) tool in the 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 "" +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" @@ -27830,6 +27854,9 @@ msgid "" "\n" "If border is zero, the pattern will be discontinuous at the edges. Use a positive border, preferably greater than the cell size, to produce a smooth 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" @@ -28685,7 +28712,7 @@ msgstr "" #: ../share/extensions/jessyInk_masterSlide.inx.h:6 msgid "This extension allows you to change the master slide JessyInk uses. Please see code.google.com/p/jessyink for more details." -msgstr "" +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" @@ -28749,7 +28776,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" @@ -29115,6 +29142,13 @@ msgid "" " * The Scale factor can be used to make measurements in scaled drawings. For example, if 1 cm in the drawing equals 2.5 m in the real world, Scale must be set to 250.\n" " * When calculating area, the result should be precise for polygons and 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" @@ -29251,7 +29285,7 @@ msgstr "Lente" #: ../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)." -msgstr "" +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" @@ -29295,7 +29329,7 @@ msgstr "" #: ../share/extensions/pathscatter.inx.h:19 msgid "This effect scatters a pattern along arbitrary \"skeleton\" paths. The pattern must be the topmost object in the selection. Groups of paths, shapes, clones are allowed." -msgstr "" +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" @@ -29375,7 +29409,7 @@ msgstr "Piesaiste pikselim" #: ../share/extensions/pixelsnap.inx.h:2 msgid "Snap all paths in selection to pixels. Snaps borders to half-points and fills to full points." -msgstr "" +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" @@ -29680,7 +29714,7 @@ msgstr "Izmantot parasto sadalījumu" #: ../share/extensions/radiusrand.inx.h:9 msgid "This effect randomly shifts the nodes (and optionally node handles) of the selected path." -msgstr "" +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" @@ -30544,7 +30578,7 @@ msgstr "Automātiski no izvēlētajiem objektiem" #: ../share/extensions/voronoi2svg.inx.h:12 msgid "Select a set of objects. Their centroids will be used as the sites of the Voronoi diagram. Text objects are not handled." -msgstr "" +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/hpgl_output.inx b/share/extensions/hpgl_output.inx index fc65e7070..b54276911 100644 --- a/share/extensions/hpgl_output.inx +++ b/share/extensions/hpgl_output.inx @@ -5,13 +5,48 @@ <dependency type="extension">org.inkscape.output.svg.inkscape</dependency> <dependency type="executable" location="extensions">hpgl_output.py</dependency> <dependency type="executable" location="extensions">inkex.py</dependency> - <param name="flat" type="float" min="0.001" max="1000" _gui-text="hpgl output flatness">0.2</param> - <param name="mirror" type="boolean" _gui-text="Mirror Y-axis">FALSE</param> - <param name="xOrigin" type="float" min="-100000" max="100000" _gui-text="X-origin (px)">0.0</param> - <param name="yOrigin" type="float" min="-100000" max="100000" _gui-text="Y-origin (px)">0.0</param> - <param name="resolution" type="int" min="90" max="2048" _gui-text="Resolution (dpi)">1016</param> - <param name="pen" type="int" min="1" max="10" _gui-text="Pen number">1</param> - <param name="plotInvisibleLayers" type="boolean" _gui-text="Plot invisible layers">FALSE</param> + <_param name="introduction" type="description">Please make sure that all objects you want to plot are converted to paths. The plot will automatically be aligned to the zero point.</_param> + <param name="horizontal_guide" type="description">—————————————————————————————</param> + <param name="resolution" type="int" min="90" max="2048" _gui-text="Resolution (dpi)" _gui-description="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')">1016</param> + <param name="pen" type="int" min="1" max="10" _gui-text="Pen number" _gui-description="The number of the pen (tool) to use, on most plotters 1 (Standard: '1')">1</param> + <param name="angle" type="optiongroup" appearance="minimal" _gui-text="Orientation" _gui-description="Orientation of the plot, change this if your plotter is plotting horizontal instead of vertical (Standard: '90°')"> + <option value="90">90°</option> + <option value="-90">-90°</option> + <option value="0">0°</option> + <option value="180">180°</option> + </param> + <param name="mirror" type="boolean" _gui-text="Mirror Y-axis" _gui-description="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')">false</param> + <param name="flat" type="float" min="0.1" max="10.0" precision="1" _gui-text="Curve flatness" _gui-description="Curves are divided into lines, this number controls how fine the curves will be reproduced, the smaller the finer (Standard: '1.2')">1.2</param> + <param name="horizontal_guide" type="description">—————————————————————————————</param> + <param name="useOvercut" type="boolean" _gui-text="Use Overcut" _gui-description="Whether the overcut will be used, if not the 'Overcut' parameter is unused (Standard: 'True')">true</param> + <param name="overcut" type="float" min="0.0" max="100.0" precision="2" _gui-text="Overcut (mm)" _gui-description="The distance in mm that will be cut over the starting point of the path to prevent open paths (Standard: '1.00')">1.00</param> + <param name="horizontal_guide" type="description">—————————————————————————————</param> + <param name="correctToolOffset" type="boolean" _gui-text="Correct tool offset" _gui-description="Whether the tool offset should be corrected, if not the 'Tool offset' and 'Return Factor' parameters are unused (Standard: 'True')">true</param> + <param name="toolOffset" type="float" min="0.0" max="100.0" precision="2" _gui-text="Tool offset (mm)" _gui-description="The offset from the tool tip to the tool axis in mm (Standard: '0.25')">0.25</param> + <param name="toolOffsetReturn" type="float" min="1.0" max="10.0" precision="2" _gui-text="Return Factor" _gui-description="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')">2.50</param> + <param name="horizontal_guide" type="description">—————————————————————————————</param> + <param name="xOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="X offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param> + <param name="yOffset" type="float" min="0.0" max="10000.0" precision="2" _gui-text="Y offset (mm)" _gui-description="The offset to move your plot away from the zero point in mm (Standard: '0.00')">0.00</param> + <param name="plotInvisibleLayers" type="boolean" _gui-text="Plot invisible layers" _gui-description="Plot invisible layers (Standard: 'False')">false</param> + <param name="horizontal_guide" type="description">—————————————————————————————</param> + <param name="sendToPlotter" type="boolean" _gui-text="Send to Plotter also" _gui-description="Sends the generated HPGL data also via serial connection to your plotter (Standard: 'False')">false</param> + <param name="port" type="string" _gui-text="Serial Port" _gui-description="The port of your serial connection, on Windows something like 'COM1', on Linux something like: '/dev/ttyUSB0' (Standard: 'COM1')">COM1</param> + <param name="baudRate" type="optiongroup" appearance="minimal" _gui-text="Baud Rate" _gui-description="The Baud rate of your serial connection (Standard: '9600')"> + <option value="110">110</option> + <option value="300">300</option> + <option value="600">600</option> + <option value="1200">1200</option> + <option value="2400">2400</option> + <option value="4800">4800</option> + <option value="9600">9600</option> + <option value="14400">14400</option> + <option value="19200">19200</option> + <option value="28800">28800</option> + <option value="38400">38400</option> + <option value="56000">56000</option> + <option value="57600">57600</option> + <option value="115200">115200</option> + </param> <output> <extension>.hpgl</extension> <mimetype>image/hpgl</mimetype> diff --git a/share/extensions/hpgl_output.py b/share/extensions/hpgl_output.py index bd28e3717..38d95ac09 100755 --- a/share/extensions/hpgl_output.py +++ b/share/extensions/hpgl_output.py @@ -1,6 +1,8 @@ #!/usr/bin/env python +# coding=utf-8 ''' Copyright (C) 2008 Aaron Spike, aaron@ekips.org +Overcut, Tool Offset, Rotation, Serial Com., Many Bugfixes and Improvements: Sebastian Wüst, sebi@timewaster.de, http://www.timewasters-place.com/ 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 @@ -16,27 +18,27 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ''' -import inkex, simpletransform, cubicsuperpath, simplestyle, cspsubdiv +import inkex, simpletransform, cubicsuperpath, simplestyle, sys, math, bezmisc, string, cspsubdiv class MyEffect(inkex.Effect): def __init__(self): inkex.Effect.__init__(self) self.OptionParser.add_option("-f", "--flatness", action="store", type="float", - dest="flat", default=0.2, + dest="flat", default=1.2, help="Minimum flatness of the subdivided curves") self.OptionParser.add_option("-m", "--mirror", action="store", type="inkbool", dest="mirror", default="FALSE", help="Mirror Y-Axis") - self.OptionParser.add_option("-x", "--xOrigin", + self.OptionParser.add_option("-x", "--xOffset", action="store", type="float", - dest="xOrigin", default=0.0, - help="X Origin (pixels)") - self.OptionParser.add_option("-y", "--yOrigin", + dest="xOffset", default=0.0, + help="X offset (mm)") + self.OptionParser.add_option("-y", "--yOffset", action="store", type="float", - dest="yOrigin", default=0.0, - help="Y Origin (pixels)") + dest="yOffset", default=0.0, + help="Y offset (mm)") self.OptionParser.add_option("-r", "--resolution", action="store", type="int", dest="resolution", default=1016, @@ -49,34 +51,102 @@ class MyEffect(inkex.Effect): action="store", type="inkbool", dest="plotInvisibleLayers", default="FALSE", help="Plot invisible layers") - - def output(self): - print ''.join(self.hpgl) - - def process_path(self, node, mat): - d = node.get('d') - if d: - p = cubicsuperpath.parsePath(d) - trans = node.get('transform') - if trans: - mat = simpletransform.composeTransform(mat, simpletransform.parseTransform(trans)) - simpletransform.applyTransformToPath(mat, p) - cspsubdiv.cspsubdiv(p, self.options.flat) - for sp in p: - first = True - for csp in sp: - cmd = 'PD' - if first: - cmd = 'PU' - first = False - self.hpgl.append('%s%d,%d;' % (cmd,csp[1][0],csp[1][1])) + self.OptionParser.add_option("-u", "--useOvercut", + action="store", type="inkbool", + dest="useOvercut", default="TRUE", + help="Use Overcut") + self.OptionParser.add_option("-o", "--overcut", + action="store", type="float", + dest="overcut", default=1.0, + help="Overcut (mm)") + self.OptionParser.add_option("-c", "--correctToolOffset", + action="store", type="inkbool", + dest="correctToolOffset", default="TRUE", + help="Correct tool offset") + self.OptionParser.add_option("-t", "--toolOffset", + action="store", type="float", + dest="toolOffset", default=0.25, + help="Tool offset (mm)") + self.OptionParser.add_option("-w", "--toolOffsetReturn", + action="store", type="float", + dest="toolOffsetReturn", default=2.5, + help="Return Factor") + self.OptionParser.add_option("-a", "--angle", + action="store", type="string", + dest="rotation", default="90", + help="Orientation") + self.OptionParser.add_option("-s", "--sendToPlotter", + action="store", type="inkbool", + dest="sendToPlotter", default="FALSE", + help="Send to Plotter also") + self.OptionParser.add_option("-z", "--port", + action="store", type="string", + dest="port", default="COM1", + help="Serial Port") + self.OptionParser.add_option("-b", "--baudRate", + action="store", type="string", + dest="baudRate", default="9600", + help="Baud Rate") + + def effect(self): + # initiate vars + self.xDivergence = 999999999999.0 + self.yDivergence = 999999999999.0 + scale = float(self.options.resolution) / 90 # dots/inch to dots/pixels + x0 = self.options.xOffset * 3.5433070866 * scale # mm to dots + y0 = self.options.yOffset * 3.5433070866 * scale # mm to dots + self.options.overcut = self.options.overcut * 3.5433070866 * scale # mm to dots + self.options.toolOffset = self.options.toolOffset * 3.5433070866 * scale # mm to dots + self.options.flat = float(self.options.resolution) * self.options.flat / 1000 + doc = self.document.getroot() + mirror = 1.0 + if self.options.mirror: + mirror = -1.0 + # get viewBox parameter to correct scaling + viewBox = doc.get('viewBox') + viewBoxTransformX = 1 + viewBoxTransformY = 1 + if viewBox: + viewBox = string.split(viewBox, ' ') + if viewBox[2] and viewBox[3]: + viewBoxTransformX = float(inkex.unittouu(doc.get('width'))) / float(viewBox[2]) + viewBoxTransformY = float(inkex.unittouu(doc.get('height'))) / float(viewBox[3]) + # dryRun to find edges + self.dryRun = True + self.groupmat = [[[scale*viewBoxTransformX, 0.0, 0.0], [0.0, mirror*scale*viewBoxTransformY, 0.0]]] + self.groupmat[0] = simpletransform.composeTransform(self.groupmat[0], simpletransform.parseTransform('rotate(' + self.options.rotation + ')')) + self.vData = [['', -1.0, -1.0], ['', -1.0, -1.0], ['', -1.0, -1.0], ['', -1.0, -1.0]] + self.process_group(doc) + # life run + self.dryRun = False + self.groupmat = [[[scale*viewBoxTransformX, 0.0, -self.xDivergence + x0], [0.0, mirror*scale*viewBoxTransformY, -self.yDivergence + y0]]] + self.groupmat[0] = simpletransform.composeTransform(self.groupmat[0], simpletransform.parseTransform('rotate(' + self.options.rotation + ')')) + self.vData = [['', -1.0, -1.0], ['', -1.0, -1.0], ['', -1.0, -1.0], ['', -1.0, -1.0]] + self.hpgl = 'IN;SP%d;' % self.options.pen + if self.options.sendToPlotter: + try: + import serial + except ImportError, e: + inkex.errormsg('pySerial is not installed.\n\n1. Download pySerial here: http://pypi.python.org/pypi/pyserial\n2. Extract the "serial" folder from the zip to the following folder: "C:\Program Files (x86)\inkscape\python\Lib"\n3. Restart Inkscape.') + self.options.sendToPlotter = False + if self.options.sendToPlotter: + self.S = serial.Serial(port=self.options.port, baudrate=self.options.baudRate, timeout=0.01, writeTimeout=None) + self.S.write('IN;SP%d;' % self.options.pen) + self.process_group(doc) + self.calcOffset('PU', 0, 0) + self.hpgl += 'PU0,0;' + if self.options.sendToPlotter: + self.S.write('PU0,0;') + self.S.read(2) + self.S.close() def process_group(self, group): + # process groups style = group.get('style') if style: style = simplestyle.parseStyle(style) if style.has_key('display'): - if style['display']=='none': + if style['display'] == 'none': if not self.options.plotInvisibleLayers: return trans = group.get('transform') @@ -90,23 +160,117 @@ class MyEffect(inkex.Effect): if trans: self.groupmat.pop() - def effect(self): - self.hpgl = ['IN;SP%d;' % self.options.pen] - x0 = self.options.xOrigin - y0 = self.options.yOrigin - scale = float(self.options.resolution)/90 - self.options.flat *= scale - mirror = 1.0 - if self.options.mirror: - mirror = -1.0 - if inkex.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0]): - y0 -= float(inkex.unittouu(self.document.getroot().xpath('@height', namespaces=inkex.NSS)[0])) - self.groupmat = [[[scale, 0.0, -x0*scale], [0.0, mirror*scale, -y0*scale]]] - doc = self.document.getroot() - self.process_group(doc) - self.hpgl.append('PU;') + def process_path(self, node, mat): + # process oath + d = node.get('d') + if d: + # transform path + p = cubicsuperpath.parsePath(d) + trans = node.get('transform') + if trans: + mat = simpletransform.composeTransform(mat, simpletransform.parseTransform(trans)) + simpletransform.applyTransformToPath(mat, p) + cspsubdiv.cspsubdiv(p, self.options.flat) + # break path into HPGL commands + xPosOld = -1 + yPosOld = -1 + for sp in p: + cmd = 'PU' + for csp in sp: + xPos = csp[1][0] + yPos = csp[1][1] + if int(xPos) != int(xPosOld) or int(yPos) != int(yPosOld): + self.calcOffset(cmd, xPos, yPos) + cmd = 'PD' + xPosOld = xPos + yPosOld = yPos + # perform overcut + if self.options.useOvercut: + if int(xPos) == int(sp[0][1][0]) and int(yPos) == int(sp[0][1][1]): + for csp in sp: + xPos2 = csp[1][0] + yPos2 = csp[1][1] + if int(xPos) != int(xPos2) or int(yPos) != int(yPos2): + self.calcOffset(cmd, xPos2, yPos2) + if self.options.overcut - self.getLength(xPosOld, yPosOld, xPos2, yPos2) <= 0: + break + xPos = xPos2 + yPos = yPos2 + + def getLength(self, x1, y1, x2, y2, abs = True): + # calc absoulute or relative length of two points + if abs: return math.fabs(math.sqrt((x2 - x1) ** 2.0 + (y2 - y1) ** 2.0)) + else: return math.sqrt((x2 - x1) ** 2.0 + (y2 - y1) ** 2.0) + + def getAlpha(self, x1, y1, x2, y2, x3, y3): + temp1 = (x1-x2)**2 + (y1-y2)**2 + (x3-x2)**2 + (y3-y2)**2 - (x1-x3)**2 - (y1-y3)**2 + temp2 = 2 * math.sqrt((x1-x2)**2 + (y1-y2)**2) * math.sqrt((x3-x2)**2 + (y3-y2)**2) + temp3 = temp1 / temp2 + if temp3 < -1: + temp3 = -1 + return math.acos(temp3) + + def calcOffset(self, cmd, xPos, yPos): + # calculate offset correction (or dont)) + if not self.options.correctToolOffset: + self.storeData(cmd, xPos, yPos) + else: + self.vData.pop(0) + self.vData.insert(3, [cmd, xPos, yPos]) + if self.vData[2][1] != -1.0: + if self.vData[1][1] != -1.0: + if self.vData[2][0] == 'PD' and self.vData[3][0] == 'PD': + if self.getAlpha(self.vData[1][1], self.vData[1][2], self.vData[2][1], self.vData[2][2], self.vData[3][1], self.vData[3][2]) > 2.748893: + self.storeData(self.vData[2][0], self.vData[2][1], self.vData[2][2]) + return + if self.vData[2][0] == 'PD': + self.storeData('PD', + self.changeLengthX(self.vData[1][1], self.vData[1][2], self.vData[2][1], self.vData[2][2], self.options.toolOffset), + self.changeLengthY(self.vData[1][1], self.vData[1][2], self.vData[2][1], self.vData[2][2], self.options.toolOffset)) + elif self.vData[0][1] != -1.0: + self.storeData('PU', + self.vData[2][1] - (self.vData[1][1] - self.changeLengthX(self.vData[0][1], self.vData[0][2], self.vData[1][1], self.vData[1][2], self.options.toolOffset)), + self.vData[2][2] - (self.vData[1][2] - self.changeLengthY(self.vData[0][1], self.vData[0][2], self.vData[1][1], self.vData[1][2], self.options.toolOffset))) + else: + self.storeData('PU', + self.vData[2][1], + self.vData[2][2]) + if self.vData[3][0] == 'PD': + self.storeData('PD', + self.changeLengthX(self.vData[3][1], self.vData[3][2], self.vData[2][1], self.vData[2][2], -(self.options.toolOffset * self.options.toolOffsetReturn)), + self.changeLengthY(self.vData[3][1], self.vData[3][2], self.vData[2][1], self.vData[2][2], -(self.options.toolOffset * self.options.toolOffsetReturn))) + else: + self.storeData(self.vData[2][0], self.vData[2][1], self.vData[2][2]) + + def storeData(self, command, x, y): + if self.dryRun: + if x < self.xDivergence: self.xDivergence = x + if y < self.yDivergence: self.yDivergence = y + else: + if x < 0: x = 0 # only positive values are allowed + if y < 0: y = 0 + self.hpgl += '%s%d,%d;' % (command, x, y) + if self.options.sendToPlotter: + self.S.write('%s%d,%d;' % (command, x, y)) + + def changeLengthX(self, x1, y1, x2, y2, offset): + # change length between two points - x axis + if offset < 0: offset = max(-self.getLength(x1, y1, x2, y2), offset) + return x2 + (x2 - x1) / self.getLength(x1, y1, x2, y2, False) * offset; + + def changeLengthY(self, x1, y1, x2, y2, offset): + # change length between two points - y axis + if offset < 0: offset = max(-self.getLength(x1, y1, x2, y2), offset) + return y2 + (y2 - y1) / self.getLength(x1, y1, x2, y2, False) * offset; + + def output(self): + # print to file + print self.hpgl -if __name__ == '__main__': #pragma: no cover +if __name__ == '__main__': + # Raise recursion limit to avoid exceptions on big documents + sys.setrecursionlimit(20000); + # start calculations e = MyEffect() e.affect() 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/CMakeLists.txt b/src/CMakeLists.txt index 3cc3df1bc..a8925e24f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -188,7 +188,6 @@ set(inkscape_SRC composite-undo-stack-observer.cpp conditions.cpp conn-avoid-ref.cpp - connection-points.cpp connector-context.cpp console-output-undo-observer.cpp context-fns.cpp @@ -332,7 +331,6 @@ set(inkscape_SRC composite-undo-stack-observer.h conditions.h conn-avoid-ref.h - connection-points.h connection-pool.h connector-context.h console-output-undo-observer.h diff --git a/src/Makefile.am b/src/Makefile.am index 2baace5e0..09f2ea8eb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -37,15 +37,13 @@ noinst_LIBRARIES = \ all_libs = \ $(noinst_LIBRARIES) \ $(INKSCAPE_LIBS) \ + $(EXIF_LIBS) \ $(GNOME_VFS_LIBS) \ $(XFT_LIBS) \ $(FREETYPE_LIBS) \ $(kdeldadd) \ $(win32ldflags) \ $(CARBON_LDFLAGS) \ - $(PERL_LIBS) \ - $(PYTHON_LIBS) \ - $(INKBOARD_LIBS) \ $(LIBWPG_LIBS) \ $(LIBVISIO_LIBS) \ $(LIBCDR_LIBS) \ @@ -64,13 +62,12 @@ BUILT_SOURCES = # Extra files to distribute EXTRA_DIST = -INCLUDES = \ - $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ +AM_CPPFLAGS = \ + $(EXIF_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(GNOME_PRINT_CFLAGS) \ $(GNOME_VFS_CFLAGS) \ $(IMAGEMAGICK_CFLAGS) \ - $(INKBOARD_CFLAGS) \ $(LIBWPG_CFLAGS) \ $(LIBVISIO_CFLAGS) \ $(LIBCDR_CFLAGS) \ @@ -86,8 +83,7 @@ INCLUDES = \ $(WIN32_CFLAGS) \ -I$(srcdir)/bind/javainc \ -I$(srcdir)/bind/javainc/linux \ - -I$(builddir)/extension/dbus \ - $(AM_CPPFLAGS) + -I$(builddir)/extension/dbus CXXTEST_TEMPLATE = $(srcdir)/cxxtest-template.tpl CXXTESTGENFLAGS = --root --have-eh --template=$(CXXTEST_TEMPLATE) diff --git a/src/desktop.h b/src/desktop.h index 93cf3201c..27176868f 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -214,16 +214,6 @@ public: return _layer_changed_signal.connect(slot); } - // Whiteboard changes - -#ifdef WITH_INKBOARD - Inkscape::Whiteboard::SessionManager* whiteboard_session_manager() { - return _whiteboard_session_manager; - } - - Inkscape::Whiteboard::SessionManager* _whiteboard_session_manager; -#endif - /** * Return new desktop object. * \pre namedview != NULL. 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/display/cairo-utils.cpp b/src/display/cairo-utils.cpp index 8eeee0277..a55b05fe3 100644 --- a/src/display/cairo-utils.cpp +++ b/src/display/cairo-utils.cpp @@ -26,6 +26,7 @@ #include "color.h" #include "style.h" #include "helper/geom-curves.h" +#include "display/cairo-templates.h" namespace { @@ -633,6 +634,22 @@ static guint32 linear_to_srgb( const guint32 c, const guint32 a ) { return premul_alpha( c2, a ); } +struct SurfaceSrgbToLinear { + + guint32 operator()(guint32 in) { + EXTRACT_ARGB32(in, a,r,g,b) ; // Unneeded semi-colon for indenting + if( a != 0 ) { + r = srgb_to_linear( r, a ); + g = srgb_to_linear( g, a ); + b = srgb_to_linear( b, a ); + } + ASSEMBLE_ARGB32(out, a,r,g,b); + return out; + } +private: + /* None */ +}; + int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface) { cairo_surface_flush(surface); @@ -641,23 +658,41 @@ int ink_cairo_surface_srgb_to_linear(cairo_surface_t *surface) int stride = cairo_image_surface_get_stride(surface); unsigned char *data = cairo_image_surface_get_data(surface); + ink_cairo_surface_filter( surface, surface, SurfaceSrgbToLinear() ); + /* TODO convert this to OpenMP somehow */ - for (int y = 0; y < height; ++y, data += stride) { - for (int x = 0; x < width; ++x) { - guint32 px = *reinterpret_cast<guint32*>(data + 4*x); - EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting - if( a != 0 ) { - r = srgb_to_linear( r, a ); - g = srgb_to_linear( g, a ); - b = srgb_to_linear( b, a ); - } - ASSEMBLE_ARGB32(px2, a,r,g,b); - *reinterpret_cast<guint32*>(data + 4*x) = px2; - } - } + // for (int y = 0; y < height; ++y, data += stride) { + // for (int x = 0; x < width; ++x) { + // guint32 px = *reinterpret_cast<guint32*>(data + 4*x); + // EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting + // if( a != 0 ) { + // r = srgb_to_linear( r, a ); + // g = srgb_to_linear( g, a ); + // b = srgb_to_linear( b, a ); + // } + // ASSEMBLE_ARGB32(px2, a,r,g,b); + // *reinterpret_cast<guint32*>(data + 4*x) = px2; + // } + // } return width * height; } +struct SurfaceLinearToSrgb { + + guint32 operator()(guint32 in) { + EXTRACT_ARGB32(in, a,r,g,b) ; // Unneeded semi-colon for indenting + if( a != 0 ) { + r = linear_to_srgb( r, a ); + g = linear_to_srgb( g, a ); + b = linear_to_srgb( b, a ); + } + ASSEMBLE_ARGB32(out, a,r,g,b); + return out; + } +private: + /* None */ +}; + int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface) { cairo_surface_flush(surface); @@ -666,20 +701,22 @@ int ink_cairo_surface_linear_to_srgb(cairo_surface_t *surface) int stride = cairo_image_surface_get_stride(surface); unsigned char *data = cairo_image_surface_get_data(surface); - /* TODO convert this to OpenMP somehow */ - for (int y = 0; y < height; ++y, data += stride) { - for (int x = 0; x < width; ++x) { - guint32 px = *reinterpret_cast<guint32*>(data + 4*x); - EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting - if( a != 0 ) { - r = linear_to_srgb( r, a ); - g = linear_to_srgb( g, a ); - b = linear_to_srgb( b, a ); - } - ASSEMBLE_ARGB32(px2, a,r,g,b); - *reinterpret_cast<guint32*>(data + 4*x) = px2; - } - } + ink_cairo_surface_filter( surface, surface, SurfaceLinearToSrgb() ); + + // /* TODO convert this to OpenMP somehow */ + // for (int y = 0; y < height; ++y, data += stride) { + // for (int x = 0; x < width; ++x) { + // guint32 px = *reinterpret_cast<guint32*>(data + 4*x); + // EXTRACT_ARGB32(px, a,r,g,b) ; // Unneeded semi-colon for indenting + // if( a != 0 ) { + // r = linear_to_srgb( r, a ); + // g = linear_to_srgb( g, a ); + // b = linear_to_srgb( b, a ); + // } + // ASSEMBLE_ARGB32(px2, a,r,g,b); + // *reinterpret_cast<guint32*>(data + 4*x) = px2; + // } + // } return width * height; } diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index bfc6f27c4..170684328 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -12,11 +12,20 @@ * smaller than 90 degrees (measured from horizontal, 0 degrees being a line extending * to the right). The x-axis will always have an angle between 0 and 90 degrees. */ - + +#if HAVE_CONFIG_H +# include "config.h" +#endif #include <gtkmm/box.h> #include <gtkmm/label.h> -#include <gtkmm/table.h> + +#if WITH_GTKMM_3_0 +# include <gtkmm/grid.h> +#else +# include <gtkmm/table.h> +#endif + #include <glibmm/i18n.h> #include "display/canvas-axonomgrid.h" @@ -83,28 +92,60 @@ namespace Inkscape { #define SPACE_SIZE_X 15 #define SPACE_SIZE_Y 10 static inline void +#if WITH_GTKMM_3_0 +attach_all(Gtk::Grid &table, Gtk::Widget const *const arr[], unsigned size, int start = 0) +#else attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int start = 0) +#endif { for (unsigned i=0, r=start; i<size/sizeof(Gtk::Widget*); i+=2) { if (arr[i] && arr[i+1]) { +#if WITH_GTKMM_3_0 + (const_cast<Gtk::Widget&>(*arr[i])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i]), 1, r, 1, 1); + + (const_cast<Gtk::Widget&>(*arr[i+1])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i+1])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 2, r, 1, 1); +#else table.attach (const_cast<Gtk::Widget&>(*arr[i]), 1, 2, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else { if (arr[i+1]) { +#if WITH_GTKMM_3_0 + (const_cast<Gtk::Widget&>(*arr[i+1])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i+1])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 1, r, 2, 1); +#else table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else if (arr[i]) { Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i])); label.set_alignment (0.0); +#if WITH_GTKMM_3_0 + label.set_hexpand(); + label.set_valign(Gtk::ALIGN_CENTER); + table.attach(label, 0, r, 3, 1); +#else table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else { Gtk::HBox *space = manage (new Gtk::HBox); space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y); +#if WITH_GTKMM_3_0 + space->set_halign(Gtk::ALIGN_CENTER); + space->set_valign(Gtk::ALIGN_CENTER); + table.attach(*space, 0, r, 1, 1); +#else table.attach (*space, 0, 1, r, r+1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0); +#endif } } ++r; @@ -306,14 +347,17 @@ CanvasAxonomGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const * updateWidgets(); } - - - Gtk::Widget * CanvasAxonomGrid::newSpecificWidget() { +#if WITH_GTKMM_3_0 + Gtk::Grid *table = Gtk::manage(new Gtk::Grid()); + table->set_row_spacing(2); + table->set_column_spacing(2); +#else Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) ); table->set_spacings(2); +#endif _wr.setUpdating (true); diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index 5fd38a473..c53890f9f 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -13,10 +13,19 @@ * Don't be shy to correct things. */ +#if HAVE_CONFIG_H +# include "config.h" +#endif + #include <glibmm/i18n.h> #include <gtkmm/box.h> #include <gtkmm/label.h> -#include <gtkmm/table.h> + +#if WITH_GTKMM_3_0 +# include <gtkmm/grid.h> +#else +# include <gtkmm/table.h> +#endif #include "ui/widget/registered-widget.h" #include "desktop.h" @@ -410,29 +419,60 @@ void CanvasGrid::setOrigin(Geom::Point const &origin_px) **/ #define SPACE_SIZE_X 15 #define SPACE_SIZE_Y 10 -static inline void -attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int start = 0) +#if WITH_GTKMM_3_0 +static inline void attach_all(Gtk::Grid &table, Gtk::Widget const *const arr[], unsigned size, int start = 0) +#else +static inline void attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int start = 0) +#endif { for (unsigned i=0, r=start; i<size/sizeof(Gtk::Widget*); i+=2) { if (arr[i] && arr[i+1]) { +#if WITH_GTKMM_3_0 + (const_cast<Gtk::Widget&>(*arr[i])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i]), 1, r, 1, 1); + + (const_cast<Gtk::Widget&>(*arr[i+1])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i+1])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 2, r, 1, 1); +#else table.attach (const_cast<Gtk::Widget&>(*arr[i]), 1, 2, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 2, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else { if (arr[i+1]) { +#if WITH_GTKMM_3_0 + (const_cast<Gtk::Widget&>(*arr[i+1])).set_hexpand(); + (const_cast<Gtk::Widget&>(*arr[i+1])).set_valign(Gtk::ALIGN_CENTER); + table.attach(const_cast<Gtk::Widget&>(*arr[i+1]), 1, r, 2, 1); +#else table.attach (const_cast<Gtk::Widget&>(*arr[i+1]), 1, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else if (arr[i]) { Gtk::Label& label = reinterpret_cast<Gtk::Label&> (const_cast<Gtk::Widget&>(*arr[i])); label.set_alignment (0.0); +#if WITH_GTKMM_3_0 + label.set_hexpand(); + label.set_valign(Gtk::ALIGN_CENTER); + table.attach(label, 0, r, 3, 1); +#else table.attach (label, 0, 3, r, r+1, Gtk::FILL|Gtk::EXPAND, (Gtk::AttachOptions)0,0,0); +#endif } else { Gtk::HBox *space = manage (new Gtk::HBox); space->set_size_request (SPACE_SIZE_X, SPACE_SIZE_Y); +#if WITH_GTKMM_3_0 + space->set_halign(Gtk::ALIGN_CENTER); + space->set_valign(Gtk::ALIGN_CENTER); + table.attach(*space, 0, r, 1, 1); +#else table.attach (*space, 0, 1, r, r+1, (Gtk::AttachOptions)0, (Gtk::AttachOptions)0,0,0); +#endif } } ++r; @@ -688,7 +728,14 @@ CanvasXYGrid::onReprAttrChanged(Inkscape::XML::Node */*repr*/, gchar const */*ke Gtk::Widget * CanvasXYGrid::newSpecificWidget() { +#if WITH_GTKMM_3_0 + Gtk::Grid * table = Gtk::manage( new Gtk::Grid() ); + table->set_row_spacing(2); + table->set_column_spacing(2); +#else Gtk::Table * table = Gtk::manage( new Gtk::Table(1,1) ); + table->set_spacings(2); +#endif Inkscape::UI::Widget::RegisteredUnitMenu *_rumg = Gtk::manage( new Inkscape::UI::Widget::RegisteredUnitMenu( _("Grid _units:"), "units", _wr, repr, doc) ); @@ -715,9 +762,7 @@ CanvasXYGrid::newSpecificWidget() Inkscape::UI::Widget::RegisteredSuffixedInteger *_rsi = Gtk::manage( new Inkscape::UI::Widget::RegisteredSuffixedInteger( _("_Major grid line every:"), "", _("lines"), "empspacing", _wr, repr, doc) ); - table->set_spacings(2); - -_wr.setUpdating (true); + _wr.setUpdating (true); _rsu_ox->setDigits(5); _rsu_ox->setIncrements(0.1, 1.0); @@ -779,7 +824,7 @@ _wr.setUpdating (true); _rsu_ox->setProgrammatically = false; _rsu_oy->setProgrammatically = false; _rsu_sx->setProgrammatically = false; - _rsu_sx->setProgrammatically = false; + _rsu_sy->setProgrammatically = false; return table; } diff --git a/src/display/nr-filter-turbulence.cpp b/src/display/nr-filter-turbulence.cpp index 76b877fbc..333074f55 100644 --- a/src/display/nr-filter-turbulence.cpp +++ b/src/display/nr-filter-turbulence.cpp @@ -283,7 +283,12 @@ private: // other constants static int const BSize = 0x100; static int const BMask = 0xff; + +#if __cplusplus < 201103L static double const PerlinOffset = 4096.0; +#else + static double constexpr PerlinOffset = 4096.0; +#endif Geom::Rect _tile; Geom::Point _baseFreq; diff --git a/src/dom/io/bufferstream.cpp b/src/dom/io/bufferstream.cpp index 7baab4814..3389bd80e 100644 --- a/src/dom/io/bufferstream.cpp +++ b/src/dom/io/bufferstream.cpp @@ -146,7 +146,7 @@ void BufferOutputStream::flush() /** * Writes the specified byte to this output stream. */ -int BufferOutputStream::put(XMLCh ch) +int BufferOutputStream::put(gunichar ch) { if (closed) return -1; diff --git a/src/dom/io/bufferstream.h b/src/dom/io/bufferstream.h index 9a36b30e2..0ac06b362 100644 --- a/src/dom/io/bufferstream.h +++ b/src/dom/io/bufferstream.h @@ -102,7 +102,7 @@ public: virtual void flush(); - virtual int put(XMLCh ch); + virtual int put(gunichar ch); virtual std::vector<unsigned char> &getBuffer() { return buffer; } diff --git a/src/dom/io/domstream.cpp b/src/dom/io/domstream.cpp index de221f855..b9ff7e9d2 100644 --- a/src/dom/io/domstream.cpp +++ b/src/dom/io/domstream.cpp @@ -424,12 +424,11 @@ static int dprintf(Writer &outs, const DOMString &fmt, va_list ap) //# B A S I C I N P U T S T R E A M //######################################################################### - /** * - */ -BasicInputStream::BasicInputStream(const InputStream &sourceStream) - : source((InputStream &)sourceStream) + */ +BasicInputStream::BasicInputStream(InputStream &sourceStream) + : source(sourceStream) { closed = false; } @@ -438,7 +437,7 @@ BasicInputStream::BasicInputStream(const InputStream &sourceStream) * Returns the number of bytes that can be read (or skipped over) from * this input stream without blocking by the next caller of a method for * this input stream. - */ + */ int BasicInputStream::available() { if (closed) @@ -446,11 +445,11 @@ int BasicInputStream::available() return source.available(); } - + /** * Closes this input stream and releases any system resources * associated with the stream. - */ + */ void BasicInputStream::close() { if (closed) @@ -458,10 +457,10 @@ void BasicInputStream::close() source.close(); closed = true; } - + /** * Reads the next byte of data from the input stream. -1 if EOF - */ + */ int BasicInputStream::get() { if (closed) @@ -477,9 +476,9 @@ int BasicInputStream::get() /** * - */ -BasicOutputStream::BasicOutputStream(const OutputStream &destinationStream) - : destination((OutputStream &)destinationStream) + */ +BasicOutputStream::BasicOutputStream(OutputStream &destinationStream) + : destination(destinationStream) { closed = false; } @@ -487,7 +486,7 @@ BasicOutputStream::BasicOutputStream(const OutputStream &destinationStream) /** * Closes this output stream and releases any system resources * associated with this stream. - */ + */ void BasicOutputStream::close() { if (closed) @@ -495,40 +494,33 @@ void BasicOutputStream::close() destination.close(); closed = true; } - + /** * Flushes this output stream and forces any buffered output * bytes to be written out. - */ + */ void BasicOutputStream::flush() { if (closed) return; destination.flush(); } - + /** * Writes the specified byte to this output stream. - */ -int BasicOutputStream::put(XMLCh ch) + */ +int BasicOutputStream::put(gunichar ch) { if (closed) return -1; - if (destination.put(ch) < 0) - return -1; - return 1; + destination.put(ch); + return 1; } - //######################################################################### //# B A S I C R E A D E R //######################################################################### - - -/** - * - */ BasicReader::BasicReader(Reader &sourceReader) { source = &sourceReader; @@ -538,7 +530,7 @@ BasicReader::BasicReader(Reader &sourceReader) * Returns the number of bytes that can be read (or skipped over) from * this reader without blocking by the next caller of a method for * this reader. - */ + */ int BasicReader::available() { if (source) @@ -547,69 +539,65 @@ int BasicReader::available() return 0; } - + /** * Closes this reader and releases any system resources * associated with the reader. - */ + */ void BasicReader::close() { if (source) source->close(); } - + /** * Reads the next byte of data from the reader. - */ -int BasicReader::get() + */ +gunichar BasicReader::get() { if (source) return source->get(); else - return -1; + return (gunichar)-1; } - - - - - + /** * Reads a line of data from the reader. - */ -DOMString BasicReader::readLine() + */ +Glib::ustring BasicReader::readLine() { - DOMString str; + Glib::ustring str; while (available() > 0) { - XMLCh ch = get(); + gunichar ch = get(); if (ch == '\n') break; str.push_back(ch); } return str; } - + /** * Reads a line of data from the reader. - */ -DOMString BasicReader::readWord() + */ +Glib::ustring BasicReader::readWord() { - DOMString str; + Glib::ustring str; while (available() > 0) { - XMLCh ch = get(); - if (uni_is_space(ch)) + gunichar ch = get(); + if (!g_unichar_isprint(ch)) break; str.push_back(ch); } return str; } + - -static bool getLong(DOMString &str, long *val) +static bool getLong(Glib::ustring &str, long *val) { - const char *begin = str.c_str(); + const char *begin = str.raw().c_str(); char *end; long ival = strtol(begin, &end, 10); if (str == end) @@ -618,25 +606,23 @@ static bool getLong(DOMString &str, long *val) return true; } -static bool getULong(const DOMString &str, unsigned long *val) +static bool getULong(Glib::ustring &str, unsigned long *val) { - DOMString tmp = str; - char *begin = (char *)tmp.c_str(); + const char *begin = str.raw().c_str(); char *end; unsigned long ival = strtoul(begin, &end, 10); - if (begin == end) + if (str == end) return false; *val = ival; return true; } -static bool getDouble(const DOMString &str, double *val) +static bool getDouble(Glib::ustring &str, double *val) { - DOMString tmp = str; - const char *begin = tmp.c_str(); + const char *begin = str.raw().c_str(); char *end; double ival = strtod(begin, &end); - if (begin == end) + if (str == end) return false; *val = ival; return true; @@ -644,13 +630,9 @@ static bool getDouble(const DOMString &str, double *val) - -/** - * - */ -Reader &BasicReader::readBool (bool& val ) +const Reader &BasicReader::readBool (bool& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); if (buf == "true") val = true; else @@ -658,96 +640,72 @@ Reader &BasicReader::readBool (bool& val ) return *this; } -/** - * - */ -Reader &BasicReader::readShort (short& val ) +const Reader &BasicReader::readShort (short& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); long ival; if (getLong(buf, &ival)) val = (short) ival; return *this; } -/** - * - */ -Reader &BasicReader::readUnsignedShort (unsigned short& val ) +const Reader &BasicReader::readUnsignedShort (unsigned short& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); unsigned long ival; if (getULong(buf, &ival)) val = (unsigned short) ival; return *this; } -/** - * - */ -Reader &BasicReader::readInt (int& val ) +const Reader &BasicReader::readInt (int& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); long ival; if (getLong(buf, &ival)) val = (int) ival; return *this; } -/** - * - */ -Reader &BasicReader::readUnsignedInt (unsigned int& val ) +const Reader &BasicReader::readUnsignedInt (unsigned int& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); unsigned long ival; if (getULong(buf, &ival)) val = (unsigned int) ival; return *this; } -/** - * - */ -Reader &BasicReader::readLong (long& val ) +const Reader &BasicReader::readLong (long& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); long ival; if (getLong(buf, &ival)) val = ival; return *this; } -/** - * - */ -Reader &BasicReader::readUnsignedLong (unsigned long& val ) +const Reader &BasicReader::readUnsignedLong (unsigned long& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); unsigned long ival; if (getULong(buf, &ival)) val = ival; return *this; } -/** - * - */ -Reader &BasicReader::readFloat (float& val ) +const Reader &BasicReader::readFloat (float& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); double ival; if (getDouble(buf, &ival)) val = (float)ival; return *this; } -/** - * - */ -Reader &BasicReader::readDouble (double& val ) +const Reader &BasicReader::readDouble (double& val ) { - DOMString buf = readWord(); + Glib::ustring buf = readWord(); double ival; if (getDouble(buf, &ival)) val = ival; @@ -761,12 +719,12 @@ Reader &BasicReader::readDouble (double& val ) //######################################################################### -InputStreamReader::InputStreamReader(const InputStream &inputStreamSource) - : inputStream((InputStream &)inputStreamSource) +InputStreamReader::InputStreamReader(InputStream &inputStreamSource) + : inputStream(inputStreamSource) { } - + /** * Close the underlying OutputStream @@ -775,7 +733,7 @@ void InputStreamReader::close() { inputStream.close(); } - + /** * Flush the underlying OutputStream */ @@ -783,15 +741,15 @@ int InputStreamReader::available() { return inputStream.available(); } - + /** * Overloaded to receive its bytes from an InputStream * rather than a Reader */ -int InputStreamReader::get() +gunichar InputStreamReader::get() { //Do we need conversions here? - int ch = (XMLCh)inputStream.get(); + gunichar ch = (gunichar)inputStream.get(); return ch; } @@ -818,7 +776,7 @@ StdReader::~StdReader() delete inputStream; } - + /** * Close the underlying OutputStream @@ -827,7 +785,7 @@ void StdReader::close() { inputStream->close(); } - + /** * Flush the underlying OutputStream */ @@ -835,22 +793,21 @@ int StdReader::available() { return inputStream->available(); } - + /** * Overloaded to receive its bytes from an InputStream * rather than a Reader */ -int StdReader::get() +gunichar StdReader::get() { //Do we need conversions here? - XMLCh ch = (XMLCh)inputStream->get(); + gunichar ch = (gunichar)inputStream->get(); return ch; } - //######################################################################### //# B A S I C W R I T E R //######################################################################### @@ -886,7 +843,7 @@ void BasicWriter::flush() /** * Writes the specified byte to this output writer. */ -int BasicWriter::put(XMLCh ch) +int BasicWriter::put(gunichar ch) { if (destination && destination->put(ch)>=0) return 1; @@ -1079,7 +1036,7 @@ void OutputStreamWriter::flush() * Overloaded to redirect the output chars from the next Writer * in the chain to an OutputStream instead. */ -int OutputStreamWriter::put(XMLCh ch) +int OutputStreamWriter::put(gunichar ch) { //Do we need conversions here? int intCh = (int) ch; @@ -1133,11 +1090,10 @@ void StdWriter::flush() * Overloaded to redirect the output chars from the next Writer * in the chain to an OutputStream instead. */ -int StdWriter::put(XMLCh ch) +int StdWriter::put(gunichar ch) { //Do we need conversions here? - int intCh = (int) ch; - if (outputStream->put(intCh) < 0) + if (outputStream->put(ch) < 0) return -1; return 1; } @@ -1146,13 +1102,6 @@ int StdWriter::put(XMLCh ch) - - - - - - - //############################################### //# O P E R A T O R S //############################################### @@ -1166,31 +1115,31 @@ int StdWriter::put(XMLCh ch) -Reader& operator>> (Reader &reader, bool& val ) +const Reader& operator>> (Reader &reader, bool& val ) { return reader.readBool(val); } -Reader& operator>> (Reader &reader, short &val) +const Reader& operator>> (Reader &reader, short &val) { return reader.readShort(val); } -Reader& operator>> (Reader &reader, unsigned short &val) +const Reader& operator>> (Reader &reader, unsigned short &val) { return reader.readUnsignedShort(val); } -Reader& operator>> (Reader &reader, int &val) +const Reader& operator>> (Reader &reader, int &val) { return reader.readInt(val); } -Reader& operator>> (Reader &reader, unsigned int &val) +const Reader& operator>> (Reader &reader, unsigned int &val) { return reader.readUnsignedInt(val); } -Reader& operator>> (Reader &reader, long &val) +const Reader& operator>> (Reader &reader, long &val) { return reader.readLong(val); } -Reader& operator>> (Reader &reader, unsigned long &val) +const Reader& operator>> (Reader &reader, unsigned long &val) { return reader.readUnsignedLong(val); } -Reader& operator>> (Reader &reader, float &val) +const Reader& operator>> (Reader &reader, float &val) { return reader.readFloat(val); } -Reader& operator>> (Reader &reader, double &val) +const Reader& operator>> (Reader &reader, double &val) { return reader.readDouble(val); } diff --git a/src/dom/io/domstream.h b/src/dom/io/domstream.h index 1a93e73b2..a021676fa 100644 --- a/src/dom/io/domstream.h +++ b/src/dom/io/domstream.h @@ -44,23 +44,21 @@ namespace dom namespace io { - - -class StreamException +class StreamException : public std::exception { public: - StreamException(const DOMString &theReason) throw() - : reason(theReason) - {} + StreamException(const char *theReason) throw() + { reason = theReason; } + StreamException(Glib::ustring &theReason) throw() + { reason = theReason; } virtual ~StreamException() throw() { } - char const *what() + char const *what() const throw() { return reason.c_str(); } - + private: - - DOMString reason; + Glib::ustring reason; }; @@ -95,14 +93,14 @@ public: * to be read */ virtual int available() = 0; - + /** * Do whatever it takes to 'close' this input stream * The most likely implementation of this method will be * for endpoints that use a resource for their data. */ virtual void close() = 0; - + /** * Read one byte from this input stream. This is a blocking * call. If no data is currently available, this call will @@ -113,7 +111,7 @@ public: * This call returns -1 on end-of-file. */ virtual int get() = 0; - + }; // class InputStream @@ -129,22 +127,22 @@ class BasicInputStream : public InputStream public: - BasicInputStream(const InputStream &sourceStream); - + BasicInputStream(InputStream &sourceStream); + virtual ~BasicInputStream() {} - + virtual int available(); - + virtual void close(); - + virtual int get(); - + protected: bool closed; InputStream &source; - + private: @@ -161,10 +159,10 @@ public: int available() { return 0; } - + void close() { /* do nothing */ } - + int get() { return getchar(); } @@ -174,7 +172,6 @@ public: - //######################################################################### //# O U T P U T S T R E A M //######################################################################### @@ -207,18 +204,18 @@ public: * 3. close the destination stream */ virtual void close() = 0; - + /** * This call should push any pending data it might have to * the destination stream. It should NOT call flush() on * the destination stream. */ virtual void flush() = 0; - + /** * Send one byte to the destination stream. */ - virtual int put(XMLCh ch) = 0; + virtual int put(gunichar ch) = 0; }; // class OutputStream @@ -233,15 +230,15 @@ class BasicOutputStream : public OutputStream public: - BasicOutputStream(const OutputStream &destinationStream); - + BasicOutputStream(OutputStream &destinationStream); + virtual ~BasicOutputStream() {} virtual void close(); - + virtual void flush(); - - virtual int put(XMLCh ch); + + virtual int put(gunichar ch); protected: @@ -263,12 +260,12 @@ public: void close() { } - + void flush() { } - - int put(XMLCh ch) - { putchar(ch); return 1; } + + int put(gunichar ch) + { return putchar(ch); } }; @@ -279,7 +276,6 @@ public: //# R E A D E R //######################################################################### - /** * This interface and its descendants are for unicode character-oriented input * @@ -301,33 +297,42 @@ public: virtual int available() = 0; - + virtual void close() = 0; - - virtual int get() = 0; - - virtual DOMString readLine() = 0; - - virtual DOMString readWord() = 0; - + + virtual gunichar get() = 0; + + virtual Glib::ustring readLine() = 0; + + virtual Glib::ustring readWord() = 0; + /* Input formatting */ - virtual Reader& readBool (bool& val ) = 0; - - virtual Reader& readShort (short &val) = 0; - - virtual Reader& readUnsignedShort (unsigned short &val) = 0; - - virtual Reader& readInt (int &val) = 0; - - virtual Reader& readUnsignedInt (unsigned int &val) = 0; - - virtual Reader& readLong (long &val) = 0; - - virtual Reader& readUnsignedLong (unsigned long &val) = 0; - - virtual Reader& readFloat (float &val) = 0; - - virtual Reader& readDouble (double &val) = 0; + virtual const Reader& readBool (bool& val ) = 0; + virtual const Reader& operator>> (bool& val ) = 0; + + virtual const Reader& readShort (short &val) = 0; + virtual const Reader& operator>> (short &val) = 0; + + virtual const Reader& readUnsignedShort (unsigned short &val) = 0; + virtual const Reader& operator>> (unsigned short &val) = 0; + + virtual const Reader& readInt (int &val) = 0; + virtual const Reader& operator>> (int &val) = 0; + + virtual const Reader& readUnsignedInt (unsigned int &val) = 0; + virtual const Reader& operator>> (unsigned int &val) = 0; + + virtual const Reader& readLong (long &val) = 0; + virtual const Reader& operator>> (long &val) = 0; + + virtual const Reader& readUnsignedLong (unsigned long &val) = 0; + virtual const Reader& operator>> (unsigned long &val) = 0; + + virtual const Reader& readFloat (float &val) = 0; + virtual const Reader& operator>> (float &val) = 0; + + virtual const Reader& readDouble (double &val) = 0; + virtual const Reader& operator>> (double &val) = 0; }; // interface Reader @@ -343,37 +348,56 @@ class BasicReader : public Reader public: BasicReader(Reader &sourceStream); - + virtual ~BasicReader() {} virtual int available(); - + virtual void close(); - - virtual int get(); - - virtual DOMString readLine(); - - virtual DOMString readWord(); - + + virtual gunichar get(); + + virtual Glib::ustring readLine(); + + virtual Glib::ustring readWord(); + /* Input formatting */ - virtual Reader& readBool (bool& val ); - - virtual Reader& readShort (short &val) ; - - virtual Reader& readUnsignedShort (unsigned short &val) ; - - virtual Reader& readInt (int &val) ; - - virtual Reader& readUnsignedInt (unsigned int &val) ; - - virtual Reader& readLong (long &val) ; - - virtual Reader& readUnsignedLong (unsigned long &val) ; - - virtual Reader& readFloat (float &val) ; - - virtual Reader& readDouble (double &val) ; + virtual const Reader& readBool (bool& val ); + virtual const Reader& operator>> (bool& val ) + { return readBool(val); } + + virtual const Reader& readShort (short &val); + virtual const Reader& operator>> (short &val) + { return readShort(val); } + + virtual const Reader& readUnsignedShort (unsigned short &val); + virtual const Reader& operator>> (unsigned short &val) + { return readUnsignedShort(val); } + + virtual const Reader& readInt (int &val); + virtual const Reader& operator>> (int &val) + { return readInt(val); } + + virtual const Reader& readUnsignedInt (unsigned int &val); + virtual const Reader& operator>> (unsigned int &val) + { return readUnsignedInt(val); } + + virtual const Reader& readLong (long &val); + virtual const Reader& operator>> (long &val) + { return readLong(val); } + + virtual const Reader& readUnsignedLong (unsigned long &val); + virtual const Reader& operator>> (unsigned long &val) + { return readUnsignedLong(val); } + + virtual const Reader& readFloat (float &val); + virtual const Reader& operator>> (float &val) + { return readFloat(val); } + + virtual const Reader& readDouble (double &val); + virtual const Reader& operator>> (double &val) + { return readDouble(val); } + protected: @@ -388,27 +412,6 @@ private: -Reader& operator>> (Reader &reader, bool& val ); - -Reader& operator>> (Reader &reader, short &val); - -Reader& operator>> (Reader &reader, unsigned short &val); - -Reader& operator>> (Reader &reader, int &val); - -Reader& operator>> (Reader &reader, unsigned int &val); - -Reader& operator>> (Reader &reader, long &val); - -Reader& operator>> (Reader &reader, unsigned long &val); - -Reader& operator>> (Reader &reader, float &val); - -Reader& operator>> (Reader &reader, double &val); - - - - /** * Class for placing a Reader on an open InputStream * @@ -417,14 +420,14 @@ class InputStreamReader : public BasicReader { public: - InputStreamReader(const InputStream &inputStreamSource); - + InputStreamReader(InputStream &inputStreamSource); + /*Overload these 3 for your implementation*/ virtual int available(); - + virtual void close(); - - virtual int get(); + + virtual gunichar get(); private: @@ -445,13 +448,13 @@ public: StdReader(); virtual ~StdReader(); - + /*Overload these 3 for your implementation*/ virtual int available(); - + virtual void close(); - - virtual int get(); + + virtual gunichar get(); private: @@ -463,8 +466,6 @@ private: - - //######################################################################### //# W R I T E R //######################################################################### @@ -492,7 +493,7 @@ public: virtual void flush() = 0; - virtual int put(XMLCh ch) = 0; + virtual int put(gunichar ch) = 0; /* Formatted output */ virtual Writer& printf(const DOMString &fmt, ...) = 0; @@ -542,7 +543,7 @@ public: virtual void flush(); - virtual int put(XMLCh ch); + virtual int put(gunichar ch); @@ -635,7 +636,7 @@ public: virtual void flush(); - virtual int put(XMLCh ch); + virtual int put(gunichar ch); private: @@ -663,7 +664,7 @@ public: virtual void flush(); - virtual int put(XMLCh ch); + virtual int put(gunichar ch); private: diff --git a/src/dom/io/stringstream.cpp b/src/dom/io/stringstream.cpp index c6e47045e..ca058a575 100644 --- a/src/dom/io/stringstream.cpp +++ b/src/dom/io/stringstream.cpp @@ -140,7 +140,7 @@ void StringOutputStream::flush() /** * Writes the specified byte to this output stream. */ -int StringOutputStream::put(XMLCh ch) +int StringOutputStream::put(gunichar ch) { buffer.push_back(ch); return 1; diff --git a/src/dom/io/stringstream.h b/src/dom/io/stringstream.h index f6ed89e65..9ba24fc26 100644 --- a/src/dom/io/stringstream.h +++ b/src/dom/io/stringstream.h @@ -100,7 +100,7 @@ public: virtual void flush(); - virtual int put(XMLCh ch); + virtual int put(gunichar ch); virtual DOMString &getString() { return buffer; } diff --git a/src/dom/io/uristream.cpp b/src/dom/io/uristream.cpp index 09b0ac361..f6172d9e0 100644 --- a/src/dom/io/uristream.cpp +++ b/src/dom/io/uristream.cpp @@ -235,10 +235,10 @@ void UriReader::close() throw(StreamException) /** * */ -int UriReader::get() throw(StreamException) +gunichar UriReader::get() throw(StreamException) { - int ch = (int)inputStream->get(); - return ch; + //int ch = (int)inputStream->get(); + return inputStream->get();//ch; } @@ -372,7 +372,7 @@ void UriOutputStream::flush() throw(StreamException) /** * Writes the specified byte to this output stream. */ -int UriOutputStream::put(XMLCh ch) throw(StreamException) +int UriOutputStream::put(gunichar ch) throw(StreamException) { if (closed) return -1; @@ -440,10 +440,9 @@ void UriWriter::flush() throw(StreamException) /** * */ -int UriWriter::put(XMLCh ch) throw(StreamException) +int UriWriter::put(gunichar ch) throw(StreamException) { - int ich = (int)ch; - if (outputStream->put(ich) < 0) + if (outputStream->put(ch) < 0) return -1; return 1; } diff --git a/src/dom/io/uristream.h b/src/dom/io/uristream.h index 8d60468a5..51227acc9 100644 --- a/src/dom/io/uristream.h +++ b/src/dom/io/uristream.h @@ -111,7 +111,7 @@ public: virtual void close() throw(StreamException); - virtual int get() throw(StreamException); + virtual gunichar get() throw(StreamException); private: @@ -143,7 +143,7 @@ public: virtual void flush() throw(StreamException); - virtual int put(XMLCh ch) throw(StreamException); + virtual int put(gunichar ch) throw(StreamException); private: @@ -181,7 +181,7 @@ public: virtual void flush() throw(StreamException); - virtual int put(XMLCh ch) throw(StreamException); + virtual int put(gunichar ch) throw(StreamException); private: diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index 273067e80..f6311721d 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -36,10 +36,9 @@ set(extension_SRC internal/cairo-render-context.cpp internal/cairo-renderer.cpp internal/cairo-renderer-pdf-out.cpp + internal/cdr-input.cpp internal/emf-inout.cpp internal/emf-print.cpp - internal/wmf-inout.cpp - internal/wmf-print.cpp internal/gdkpixbuf-input.cpp internal/gimpgrad.cpp internal/grid.cpp @@ -54,6 +53,8 @@ set(extension_SRC internal/svg.cpp internal/svgz.cpp internal/vsd-input.cpp + internal/wmf-inout.cpp + internal/wmf-print.cpp internal/filter/filter-all.cpp internal/filter/filter-file.cpp @@ -102,11 +103,10 @@ 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-inout.h internal/emf-print.h - internal/wmf-inout.h - internal/wmf-print.h internal/filter/bevels.h internal/filter/blurs.h internal/filter/bumps.h @@ -138,6 +138,8 @@ set(extension_SRC internal/svg.h internal/svgz.h internal/vsd-input.h + internal/wmf-inout.h + internal/wmf-print.h script/InkscapeScript.h ) diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 2a56f55e8..778295f47 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -56,7 +56,11 @@ ErrorFileNotice::ErrorFileNotice (void) : g_free(ext_error_file); set_message(dialog_text, true); +#if WITH_GTKMM_3_0 + Gtk::Box * vbox = get_content_area(); +#else Gtk::Box * vbox = get_vbox(); +#endif /* This is some filler text, needs to change before relase */ Inkscape::Preferences *prefs = Inkscape::Preferences::get(); diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index 4e2c5b9e4..28f556e75 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -19,12 +19,16 @@ # include "config.h" #endif - #include <glibmm/i18n.h> #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> -#include <gtkmm/table.h> + +#if WITH_GTKMM_3_0 +# include <gtkmm/grid.h> +#else +# include <gtkmm/table.h> +#endif #include "inkscape.h" #include "extension/implementation/implementation.h" @@ -720,7 +724,12 @@ Extension::get_info_widget(void) Gtk::Frame * info = Gtk::manage(new Gtk::Frame("General Extension Information")); retval->pack_start(*info, true, true, 5); +#if WITH_GTKMM_3_0 + Gtk::Grid * table = Gtk::manage(new Gtk::Grid()); +#else Gtk::Table * table = Gtk::manage(new Gtk::Table()); +#endif + info->add(*table); int row = 0; @@ -733,8 +742,11 @@ Extension::get_info_widget(void) return retval; } -void -Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Table * table, int * row) +#if WITH_GTKMM_3_0 +void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Grid * table, int * row) +#else +void Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Table * table, int * row) +#endif { Gtk::Label * label; Gtk::Label * value; @@ -742,8 +754,14 @@ Extension::add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Table * (*row)++; label = Gtk::manage(new Gtk::Label(labelstr)); value = Gtk::manage(new Gtk::Label(valuestr)); + +#if WITH_GTKMM_3_0 + table->attach(*label, 0, (*row) - 1, 1, 1); + table->attach(*value, 1, (*row) - 1, 1, 1); +#else table->attach(*label, 0, 1, (*row) - 1, *row); table->attach(*value, 1, 2, (*row) - 1, *row); +#endif label->show(); value->show(); diff --git a/src/extension/extension.h b/src/extension/extension.h index 78999631a..dcabb3df7 100644 --- a/src/extension/extension.h +++ b/src/extension/extension.h @@ -22,7 +22,12 @@ #include <sigc++/signal.h> namespace Gtk { +#if WITH_GTKMM_3_0 + class Grid; +#else class Table; +#endif + class VBox; class Widget; } @@ -285,8 +290,11 @@ public: Gtk::VBox * get_help_widget(void); Gtk::VBox * get_params_widget(void); protected: +#if WITH_GTKMM_3_0 + inline static void add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Grid * table, int * row); +#else inline static void add_val(Glib::ustring labelstr, Glib::ustring valuestr, Gtk::Table * table, int * row); - +#endif }; diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index d3aeace55..3ac1e06ab 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> @@ -852,7 +854,11 @@ void Script::checkStderr (const Glib::ustring &data, GtkWidget *dlg = GTK_WIDGET(warning.gobj()); sp_transientize(dlg); +#if WITH_GTKMM_3_0 + Gtk::Box * vbox = warning.get_content_area(); +#else Gtk::Box * vbox = warning.get_vbox(); +#endif /* Gtk::TextView * textview = new Gtk::TextView(Gtk::TextBuffer::create()); */ Gtk::TextView * textview = new Gtk::TextView(); @@ -956,7 +962,14 @@ int Script::execute (const std::list<std::string> &in_command, // assemble the rest of argv std::copy(in_params.begin(), in_params.end(), std::back_inserter(argv)); if (!filein.empty()) { - argv.push_back(filein); + if(Glib::path_is_absolute(filein)) + argv.push_back(filein); + else { + std::vector<std::string> buildargs; + buildargs.push_back(Glib::get_current_dir()); + buildargs.push_back(filein); + argv.push_back(Glib::build_filename(buildargs)); + } } int stdout_pipe, stderr_pipe; 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/internal/filter/paint.h b/src/extension/internal/filter/paint.h index ad396e08f..f04dd92f9 100644 --- a/src/extension/internal/filter/paint.h +++ b/src/extension/internal/filter/paint.h @@ -88,7 +88,7 @@ public: "<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"1000\">10</param>\n" "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n" "</page>\n" - "<page name=\"graintab\" _gui-text=\""N_("Grain") "\">\n" + "<page name=\"graintab\" _gui-text=\"" N_("Grain") "\">\n" "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n" "<param name=\"grainxf\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n" "<param name=\"grainyf\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n" diff --git a/src/extension/internal/odf.cpp b/src/extension/internal/odf.cpp index 0639ae8d0..bd74ba47c 100644 --- a/src/extension/internal/odf.cpp +++ b/src/extension/internal/odf.cpp @@ -83,8 +83,8 @@ #include "dom/io/stringstream.h" +#include "inkscape-version.h" #include "document.h" - #include "extension/extension.h" @@ -1240,7 +1240,8 @@ bool OdfOutput::writeMeta(ZipFile &zf) outs.printf("xmlns:anim=\"urn:oasis:names:tc:opendocument:xmlns:animation:1.0\"\n"); outs.printf("office:version=\"1.0\">\n"); outs.printf("<office:meta>\n"); - outs.printf(" <meta:generator>Inkscape.org - 0.45</meta:generator>\n"); + Glib::ustring tmp = Glib::ustring(" <meta:generator>Inkscape.org - ") + Inkscape::version_string + "</meta:generator>\n"; + outs.writeString(tmp); outs.printf(" <meta:initial-creator>%#s</meta:initial-creator>\n", creator.c_str()); outs.printf(" <meta:creation-date>%#s</meta:creation-date>\n", date.c_str()); @@ -1465,7 +1466,7 @@ bool OdfOutput::writeStyle(ZipFile &zf) outs.printf("<!--\n"); outs.printf("*************************************************************************\n"); outs.printf(" E N D O F F I L E\n"); - outs.printf(" Have a nice day - ishmal\n"); + outs.printf(" Have a nice day\n"); outs.printf("*************************************************************************\n"); outs.printf("-->\n"); outs.printf("\n"); @@ -2170,7 +2171,7 @@ bool OdfOutput::writeStyleFooter(Writer &outs) outs.printf("<!--\n"); outs.printf("*************************************************************************\n"); outs.printf(" E N D O F F I L E\n"); - outs.printf(" Have a nice day - ishmal\n"); + outs.printf(" Have a nice day\n"); outs.printf("*************************************************************************\n"); outs.printf("-->\n"); outs.printf("\n"); @@ -2281,7 +2282,7 @@ bool OdfOutput::writeContentFooter(Writer &outs) outs.printf("<!--\n"); outs.printf("*************************************************************************\n"); outs.printf(" E N D O F F I L E\n"); - outs.printf(" Have a nice day - ishmal\n"); + outs.printf(" Have a nice day\n"); outs.printf("*************************************************************************\n"); outs.printf("-->\n"); outs.printf("\n"); @@ -2441,27 +2442,6 @@ OdfOutput::check (Inkscape::Extension::Extension */*module*/) -//######################################################################## -//# I N P U T -//######################################################################## - - - -//####################### -//# L A T E R !!! :-) -//####################### - - - - - - - - - - - - } //namespace Internal } //namespace Extension diff --git a/src/extension/internal/pdf-input-cairo.cpp b/src/extension/internal/pdf-input-cairo.cpp index 0a9dd8399..c83ebad82 100644 --- a/src/extension/internal/pdf-input-cairo.cpp +++ b/src/extension/internal/pdf-input-cairo.cpp @@ -108,7 +108,7 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc) #if WITH_GTKMM_3_0 _fallbackPrecisionSlider_adj = Gtk::Adjustment::create(2, 1, 256, 1, 10, 10); - _fallbackPrecisionSlider = Gtk::manage(new Gtk::HScale(_fallbackPrecisionSlider_adj)); + _fallbackPrecisionSlider = Gtk::manage(new Gtk::Scale(_fallbackPrecisionSlider_adj)); #else _fallbackPrecisionSlider_adj = Gtk::manage(new class Gtk::Adjustment(2, 1, 256, 1, 10, 10)); _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(*_fallbackPrecisionSlider_adj)); @@ -224,9 +224,17 @@ PdfImportCairoDialog::PdfImportCairoDialog(PopplerDocument *doc) vbox1->pack_start(*_importSettingsFrame, Gtk::PACK_EXPAND_PADDING, 0); hbox1->pack_start(*vbox1); hbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 4); + +#if WITH_GTKMM_3_0 + get_content_area()->set_homogeneous(false); + get_content_area()->set_spacing(0); + get_content_area()->pack_start(*hbox1); +#else this->get_vbox()->set_homogeneous(false); this->get_vbox()->set_spacing(0); this->get_vbox()->pack_start(*hbox1); +#endif + this->set_title(_("PDF Import Settings")); this->set_modal(true); sp_transientize(GTK_WIDGET(this->gobj())); //Make transient diff --git a/src/extension/internal/pdf-input-cairo.h b/src/extension/internal/pdf-input-cairo.h index 81e9a8f00..66f1e5e7e 100644 --- a/src/extension/internal/pdf-input-cairo.h +++ b/src/extension/internal/pdf-input-cairo.h @@ -37,6 +37,14 @@ #include "../implementation/implementation.h" +namespace Gtk { +#if WITH_GTKMM_3_0 + class Scale; +#else + class HScale; +#endif +} + namespace Inkscape { namespace UI { @@ -85,10 +93,11 @@ private: class Inkscape::UI::Widget::Frame * _pageSettingsFrame; class Gtk::Label * _labelPrecision; class Gtk::Label * _labelPrecisionWarning; - class Gtk::HScale * _fallbackPrecisionSlider; #if WITH_GTKMM_3_0 + class Gtk::Scale * _fallbackPrecisionSlider; Glib::RefPtr<Gtk::Adjustment> _fallbackPrecisionSlider_adj; #else + class Gtk::HScale * _fallbackPrecisionSlider; class Gtk::Adjustment *_fallbackPrecisionSlider_adj; #endif class Gtk::Label * _labelPrecisionComment; diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index 90d53c6b0..531cda20a 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -124,7 +124,7 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) #if WITH_GTKMM_3_0 _fallbackPrecisionSlider_adj = Gtk::Adjustment::create(2, 1, 256, 1, 10, 10); - _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(_fallbackPrecisionSlider_adj)); + _fallbackPrecisionSlider = Gtk::manage(new class Gtk::Scale(_fallbackPrecisionSlider_adj)); #else _fallbackPrecisionSlider_adj = Gtk::manage(new class Gtk::Adjustment(2, 1, 256, 1, 10, 10)); _fallbackPrecisionSlider = Gtk::manage(new class Gtk::HScale(*_fallbackPrecisionSlider_adj)); @@ -240,9 +240,17 @@ PdfImportDialog::PdfImportDialog(PDFDoc *doc, const gchar */*uri*/) vbox1->pack_start(*_importSettingsFrame, Gtk::PACK_EXPAND_PADDING, 0); hbox1->pack_start(*vbox1); hbox1->pack_start(*_previewArea, Gtk::PACK_EXPAND_WIDGET, 4); + +#if WITH_GTKMM_3_0 + get_content_area()->set_homogeneous(false); + get_content_area()->set_spacing(0); + get_content_area()->pack_start(*hbox1); +#else this->get_vbox()->set_homogeneous(false); this->get_vbox()->set_spacing(0); this->get_vbox()->pack_start(*hbox1); +#endif + this->set_title(_("PDF Import Settings")); this->set_modal(true); sp_transientize(GTK_WIDGET(this->gobj())); //Make transient diff --git a/src/extension/internal/pdfinput/pdf-input.h b/src/extension/internal/pdfinput/pdf-input.h index e9da5b27c..3710e4667 100644 --- a/src/extension/internal/pdfinput/pdf-input.h +++ b/src/extension/internal/pdfinput/pdf-input.h @@ -39,7 +39,11 @@ namespace Gtk { class DrawingArea; class Frame; class HBox; +#if WITH_GTKMM_3_0 + class Scale; +#else class HScale; +#endif class VBox; class Label; } @@ -95,10 +99,11 @@ private: class Inkscape::UI::Widget::Frame * _pageSettingsFrame; class Gtk::Label * _labelPrecision; class Gtk::Label * _labelPrecisionWarning; - class Gtk::HScale * _fallbackPrecisionSlider; #if WITH_GTKMM_3_0 + class Gtk::Scale * _fallbackPrecisionSlider; Glib::RefPtr<Gtk::Adjustment> _fallbackPrecisionSlider_adj; #else + class Gtk::HScale * _fallbackPrecisionSlider; class Gtk::Adjustment *_fallbackPrecisionSlider_adj; #endif class Gtk::Label * _labelPrecisionComment; diff --git a/src/extension/prefdialog.cpp b/src/extension/prefdialog.cpp index 649dc398a..f3c6508af 100644 --- a/src/extension/prefdialog.cpp +++ b/src/extension/prefdialog.cpp @@ -67,7 +67,12 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co hbox->pack_start(*controls, true, true, 6); hbox->show(); + +#if WITH_GTKMM_3_0 + this->get_content_area()->pack_start(*hbox, true, true, 6); +#else this->get_vbox()->pack_start(*hbox, true, true, 6); +#endif /* Gtk::Button * help_button = add_button(Gtk::Stock::HELP, Gtk::RESPONSE_HELP); @@ -95,14 +100,24 @@ PrefDialog::PrefDialog (Glib::ustring name, gchar const * help, Gtk::Widget * co #endif sep->show(); + +#if WITH_GTKMM_3_0 + this->get_content_area()->pack_start(*sep, true, true, 4); +#else this->get_vbox()->pack_start(*sep, true, true, 4); +#endif hbox = Gtk::manage(new Gtk::HBox()); _button_preview = _param_preview->get_widget(NULL, NULL, &_signal_preview); _button_preview->show(); hbox->pack_start(*_button_preview, true, true,6); hbox->show(); + +#if WITH_GTKMM_3_0 + this->get_content_area()->pack_start(*hbox, true, true, 6); +#else this->get_vbox()->pack_start(*hbox, true, true, 6); +#endif Gtk::Box * hbox = dynamic_cast<Gtk::Box *>(_button_preview); if (hbox != NULL) { diff --git a/src/extension/system.cpp b/src/extension/system.cpp index 60cd21d71..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" @@ -69,34 +70,6 @@ static Extension *build_from_reprdoc(Inkscape::XML::Document *doc, Implementatio */ SPDocument *open(Extension *key, gchar const *filename) { - // Convert to absolute pathname to tolerate chdir(). - bool relpath = (filename[0] != '/'); -#ifdef WIN32 - relpath &= (filename[0] != '\\') && !(isalpha(filename[0]) && (filename[1] == ':')); -#endif - - // Do not consider an URI as a relative path. - if (relpath) { - gchar const * cp = filename; - - while (isalpha(*cp) || isdigit(*cp) || *cp == '+' || *cp == '-' || *cp == '.') - cp++; - - relpath = *cp != ':' || cp[1] != '/' || cp[2] != '/'; - } - - if (relpath) { - gchar * curdir = NULL; -#ifndef WIN32 - curdir = getcwd(NULL, 0); -#else - curdir = _getcwd(NULL, 0); -#endif - - filename = g_build_filename(curdir, filename, NULL); - free(curdir); - } - Input *imod = NULL; if (key == NULL) { @@ -138,9 +111,6 @@ SPDocument *open(Extension *key, gchar const *filename) } if (!imod->prefs(filename)) { - if (relpath){ - free((void *) filename); - } return NULL; } @@ -163,9 +133,6 @@ SPDocument *open(Extension *key, gchar const *filename) imod->set_gui(true); } - if (relpath){ - free((void *) filename); - } return doc; } diff --git a/src/file.cpp b/src/file.cpp index 468d02eba..97087c1a1 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -81,10 +81,6 @@ using Inkscape::DocumentUndo; #include "extension/dbus/dbus-init.h" #endif -//#ifdef WITH_INKBOARD -//#include "jabber_whiteboard/session-manager.h" -//#endif - #ifdef WIN32 #include <windows.h> #endif 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..bf497b407 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(>k_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); @@ -1594,14 +1539,16 @@ sp_ui_menu_item_set_name(GtkWidget *data, Glib::ustring const &name) //- a GtkHBox, whose first child is a label displaying name if the menu //item has an accel key //- a GtkLabel if the menu has no accel key - if (GTK_IS_LABEL(child)) { - gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str()); - } else if (GTK_IS_HBOX(child)) { - gtk_label_set_markup_with_mnemonic( - GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), - name.c_str()); - }//else sp_ui_menu_append_item_from_verb has been modified and can set - //a menu item in yet another way... + if (child != NULL){ + if (GTK_IS_LABEL(child)) { + gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str()); + } else if (GTK_IS_HBOX(child)) { + gtk_label_set_markup_with_mnemonic( + GTK_LABEL (gtk_container_get_children(GTK_CONTAINER (child))->data), + name.c_str()); + }//else sp_ui_menu_append_item_from_verb has been modified and can set + //a menu item in yet another way... + } } } @@ -1726,40 +1673,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/io/base64stream.cpp b/src/io/base64stream.cpp index 667487c35..28c819347 100644 --- a/src/io/base64stream.cpp +++ b/src/io/base64stream.cpp @@ -290,12 +290,12 @@ void Base64OutputStream::putCh(int ch) /** * Writes the specified byte to this output stream. */ -void Base64OutputStream::put(int ch) +int Base64OutputStream::put(gunichar ch) { if (closed) { //probably throw an exception here - return; + return -1; } outBuf <<= 8; @@ -322,6 +322,7 @@ void Base64OutputStream::put(int ch) bitCount = 0; outBuf = 0L; } + return 1; } diff --git a/src/io/base64stream.h b/src/io/base64stream.h index 554a92fe2..4bc99acac 100644 --- a/src/io/base64stream.h +++ b/src/io/base64stream.h @@ -88,7 +88,7 @@ public: virtual void flush(); - virtual void put(int ch); + virtual int put(gunichar ch); /** * Sets the maximum line length for base64 output. If diff --git a/src/io/gzipstream.cpp b/src/io/gzipstream.cpp index f9e30de91..8db7155db 100644 --- a/src/io/gzipstream.cpp +++ b/src/io/gzipstream.cpp @@ -433,19 +433,19 @@ void GzipOutputStream::flush() /** * Writes the specified byte to this output stream. */ -void GzipOutputStream::put(int ch) +int GzipOutputStream::put(gunichar ch) { if (closed) { //probably throw an exception here - return; + return -1; } //Add char to buffer inputBuf.push_back(ch); totalIn++; - + return 1; } diff --git a/src/io/gzipstream.h b/src/io/gzipstream.h index 89c5f64f3..390ec1225 100644 --- a/src/io/gzipstream.h +++ b/src/io/gzipstream.h @@ -98,7 +98,7 @@ public: virtual void flush(); - virtual void put(int ch); + virtual int put(gunichar ch); private: diff --git a/src/io/inkscapestream.cpp b/src/io/inkscapestream.cpp index 65f24cf59..4c7fa4d49 100644 --- a/src/io/inkscapestream.cpp +++ b/src/io/inkscapestream.cpp @@ -125,11 +125,12 @@ void BasicOutputStream::flush() /** * Writes the specified byte to this output stream. */ -void BasicOutputStream::put(int ch) +int BasicOutputStream::put(gunichar ch) { if (closed) - return; + return -1; destination.put(ch); + return 1; } @@ -137,8 +138,6 @@ void BasicOutputStream::put(int ch) //######################################################################### //# B A S I C R E A D E R //######################################################################### - - /** * */ @@ -183,10 +182,6 @@ gunichar BasicReader::get() } - - - - /** * Reads a line of data from the reader. */ @@ -255,13 +250,6 @@ static bool getDouble(Glib::ustring &str, double *val) - - - - -/** - * - */ const Reader &BasicReader::readBool (bool& val ) { Glib::ustring buf = readWord(); @@ -272,9 +260,6 @@ const Reader &BasicReader::readBool (bool& val ) return *this; } -/** - * - */ const Reader &BasicReader::readShort (short& val ) { Glib::ustring buf = readWord(); @@ -284,9 +269,6 @@ const Reader &BasicReader::readShort (short& val ) return *this; } -/** - * - */ const Reader &BasicReader::readUnsignedShort (unsigned short& val ) { Glib::ustring buf = readWord(); @@ -296,9 +278,6 @@ const Reader &BasicReader::readUnsignedShort (unsigned short& val ) return *this; } -/** - * - */ const Reader &BasicReader::readInt (int& val ) { Glib::ustring buf = readWord(); @@ -308,9 +287,6 @@ const Reader &BasicReader::readInt (int& val ) return *this; } -/** - * - */ const Reader &BasicReader::readUnsignedInt (unsigned int& val ) { Glib::ustring buf = readWord(); @@ -320,9 +296,6 @@ const Reader &BasicReader::readUnsignedInt (unsigned int& val ) return *this; } -/** - * - */ const Reader &BasicReader::readLong (long& val ) { Glib::ustring buf = readWord(); @@ -332,9 +305,6 @@ const Reader &BasicReader::readLong (long& val ) return *this; } -/** - * - */ const Reader &BasicReader::readUnsignedLong (unsigned long& val ) { Glib::ustring buf = readWord(); @@ -344,9 +314,6 @@ const Reader &BasicReader::readUnsignedLong (unsigned long& val ) return *this; } -/** - * - */ const Reader &BasicReader::readFloat (float& val ) { Glib::ustring buf = readWord(); @@ -356,9 +323,6 @@ const Reader &BasicReader::readFloat (float& val ) return *this; } -/** - * - */ const Reader &BasicReader::readDouble (double& val ) { Glib::ustring buf = readWord(); @@ -775,9 +739,7 @@ void OutputStreamWriter::flush() */ void OutputStreamWriter::put(gunichar ch) { - //Do we need conversions here? - int intCh = (int) ch; - outputStream.put(intCh); + outputStream.put(ch); } //######################################################################### @@ -827,9 +789,7 @@ void StdWriter::flush() */ void StdWriter::put(gunichar ch) { - //Do we need conversions here? - int intCh = (int) ch; - outputStream->put(intCh); + outputStream->put(ch); } diff --git a/src/io/inkscapestream.h b/src/io/inkscapestream.h index 37c41552f..d19dbbe95 100644 --- a/src/io/inkscapestream.h +++ b/src/io/inkscapestream.h @@ -189,7 +189,7 @@ public: /** * Send one byte to the destination stream. */ - virtual void put(int ch) = 0; + virtual int put(gunichar ch) = 0; }; // class OutputStream @@ -212,7 +212,7 @@ public: virtual void flush(); - virtual void put(int ch); + virtual int put(gunichar ch); protected: @@ -238,8 +238,8 @@ public: void flush() { } - void put(int ch) - { putchar(ch); } + int put(gunichar ch) + {return putchar(ch); } }; diff --git a/src/io/stringstream.cpp b/src/io/stringstream.cpp index 44d11dd04..5a76e24a3 100644 --- a/src/io/stringstream.cpp +++ b/src/io/stringstream.cpp @@ -112,10 +112,10 @@ void StringOutputStream::flush() /** * Writes the specified byte to this output stream. */ -void StringOutputStream::put(int ch) +int StringOutputStream::put(gunichar ch) { - gunichar uch = (gunichar)ch; - buffer.push_back(uch); + buffer.push_back(ch); + return 1; } diff --git a/src/io/stringstream.h b/src/io/stringstream.h index 4a05d88a9..939a87455 100644 --- a/src/io/stringstream.h +++ b/src/io/stringstream.h @@ -67,7 +67,7 @@ public: virtual void flush(); - virtual void put(int ch); + virtual int put(gunichar ch); virtual Glib::ustring &getString() { return buffer; } diff --git a/src/io/uristream.cpp b/src/io/uristream.cpp index 19994bc82..37c13ada0 100644 --- a/src/io/uristream.cpp +++ b/src/io/uristream.cpp @@ -402,34 +402,30 @@ void UriOutputStream::flush() throw(StreamException) /** * Writes the specified byte to this output stream. */ -void UriOutputStream::put(int ch) throw(StreamException) +int UriOutputStream::put(gunichar ch) throw(StreamException) { if (closed) - return; + return -1; unsigned char uch; - gunichar gch; switch (scheme) { - case SCHEME_FILE: if (!outf) - return; + return -1; uch = (unsigned char)(ch & 0xff); if (fputc(uch, outf) == EOF) { Glib::ustring err = "ERROR writing to file "; throw StreamException(err); } - //fwrite(uch, 1, 1, outf); - break; + break; case SCHEME_DATA: - gch = (gunichar) ch; - data.push_back(gch); - break; + data.push_back(ch); + break; }//switch - + return 1; } @@ -474,8 +470,7 @@ void UriWriter::flush() throw(StreamException) */ void UriWriter::put(gunichar ch) throw(StreamException) { - int ich = (int)ch; - outputStream->put(ich); + outputStream->put(ch); } diff --git a/src/io/uristream.h b/src/io/uristream.h index 16b1b0894..3080519de 100644 --- a/src/io/uristream.h +++ b/src/io/uristream.h @@ -115,7 +115,7 @@ public: virtual void flush() throw(StreamException); - virtual void put(int ch) throw(StreamException); + virtual int put(gunichar ch) throw(StreamException); private: diff --git a/src/io/xsltstream.cpp b/src/io/xsltstream.cpp index 6b72627d3..7a6632233 100644 --- a/src/io/xsltstream.cpp +++ b/src/io/xsltstream.cpp @@ -230,10 +230,10 @@ void XsltOutputStream::flush() throw (StreamException) /** * Writes the specified byte to this output stream. */ -void XsltOutputStream::put(int ch) throw (StreamException) +int XsltOutputStream::put(gunichar ch) throw (StreamException) { - gunichar uch = (gunichar) ch; - outbuf.push_back(uch); + outbuf.push_back(ch); + return 1; } diff --git a/src/io/xsltstream.h b/src/io/xsltstream.h index cfe9e5124..31ee89e10 100644 --- a/src/io/xsltstream.h +++ b/src/io/xsltstream.h @@ -120,7 +120,7 @@ public: virtual void flush() throw (StreamException); - virtual void put(int ch) throw (StreamException); + virtual int put(gunichar ch) throw (StreamException); private: diff --git a/src/isinf.h b/src/isinf.h index 7799d2876..b4c56f79d 100644 --- a/src/isinf.h +++ b/src/isinf.h @@ -12,6 +12,9 @@ #elif defined(__APPLE__) && __GNUC__ == 3 #define isinf(x) __isinf(x) +#elif __cplusplus >= 201103L +# include <cmath> +# define isinf std::isinf #endif #endif /* __ISINF_H__ */ diff --git a/src/libnrtype/FontFactory.cpp b/src/libnrtype/FontFactory.cpp index a9220d867..a1a9ddc89 100644 --- a/src/libnrtype/FontFactory.cpp +++ b/src/libnrtype/FontFactory.cpp @@ -741,6 +741,11 @@ void font_factory::GetUIFamiliesAndStyles(FamilyToStylesMap *map) continue; } + // Disable synthesized (faux) font faces + if (pango_font_face_is_synthesized(faces[currentFace]) ) { + continue; + } + PangoFontDescription *faceDescr = pango_font_face_describe(faces[currentFace]); if (faceDescr) { Glib::ustring familyUIName = GetUIFamilyString(faceDescr); diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp index 04859185c..1e3ba01e9 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,21 @@ 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); } // Example of how to use "foreach_iter" @@ -70,7 +89,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 +106,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 +142,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 +159,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 +168,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 +239,557 @@ 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 ); + } + + + // Set fontspec. If check is false, best style match will not be done. + void + FontLister::set_fontspec (Glib::ustring new_fontspec, gboolean check) { + + std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( new_fontspec ); + Glib::ustring new_family = ui.first; + Glib::ustring new_style = ui.second; + +#ifdef DEBUG_FONT + std::cout << "FontLister::set_fontspec: family: " << new_family + << " style:" << new_style << std::endl; +#endif + + set_font_family( new_family, false ); + set_font_style( new_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. + 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 = get_best_style_match( new_family, current_style ); + +#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::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 + } + + + // We do this ourselves as we can't rely on FontFactory. + void + FontLister::fill_css( SPCSSAttr *css, Glib::ustring fontspec ) { + + if( fontspec.empty() ) { + fontspec = current_fontspec; + } + std::pair<Glib::ustring,Glib::ustring> ui = ui_from_fontspec( fontspec ); + + Glib::ustring family = ui.first; + + sp_repr_css_set_property (css, "-inkscape-font-specification", fontspec.c_str() ); + sp_repr_css_set_property (css, "font-family", family.c_str() ); //Canonized w/ spaces + + PangoFontDescription *desc = pango_font_description_from_string( 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 +799,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 +809,149 @@ 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 ) ); + } + + Gtk::TreeModel::Row + FontLister::get_row_for_style (Glib::ustring style) + { + Gtk::TreePath path; + + Gtk::TreeModel::iterator iter = style_list_store->get_iter( "0" ); + while( iter != style_list_store->children().end() ) { + + Gtk::TreeModel::Row row = *iter; + + if( style.compare( row[FontStyleList.styles] ) == 0 ) { + return row; + } + + ++iter; + } + + throw STYLE_NOT_FOUND; + } + + static gint + compute_distance (const PangoFontDescription *a, + const PangoFontDescription *b ) { + + // Weight: multiples of 100 + gint distance = abs( pango_font_description_get_weight( a ) - + pango_font_description_get_weight( b ) ); + + distance += 10000 * abs( pango_font_description_get_stretch( a ) - + pango_font_description_get_stretch( b ) ); + + PangoStyle style_a = pango_font_description_get_style( a ); + PangoStyle style_b = pango_font_description_get_style( b ); + if( style_a != style_b ) { + if( (style_a == PANGO_STYLE_OBLIQUE && style_b == PANGO_STYLE_ITALIC) || + (style_b == PANGO_STYLE_OBLIQUE && style_a == PANGO_STYLE_ITALIC) ) { + distance += 1000; // Oblique and italic are almost the same + } else { + distance += 100000; // Normal vs oblique/italic, not so similar + } + } + + // Normal vs small-caps + distance += 1000000 * abs( pango_font_description_get_variant( a ) - + pango_font_description_get_variant( b ) ); + return distance; + } + + // This is inspired by pango_font_description_better_match, but that routine + // always returns false if variant or stretch are different. This means, for + // example, that PT Sans Narrow with style Bold Condensed is never matched + // to another font-family with Bold style. + gboolean + font_description_better_match( PangoFontDescription* target, + PangoFontDescription* old_desc, + PangoFontDescription* new_desc ) { + + if( old_desc == NULL ) return true; + if( new_desc == NULL ) return false; + + int old_distance = compute_distance( target, old_desc ); + int new_distance = compute_distance( target, new_desc ); + //std::cout << "font_description_better_match: old: " << old_distance << std::endl; + //std::cout << " new: " << new_distance << std::endl; + + return (new_distance < old_distance ); + } + + // void + // font_description_dump( PangoFontDescription* target ) { + // std::cout << " Font: " << pango_font_description_to_string( target ) << std::endl; + // std::cout << " style: " << pango_font_description_get_style( target ) << std::endl; + // std::cout << " weight: " << pango_font_description_get_weight( target ) << std::endl; + // std::cout << " variant: " << pango_font_description_get_variant( target ) << std::endl; + // std::cout << " stretch: " << pango_font_description_get_stretch( target ) << std::endl; + // std::cout << " gravity: " << pango_font_description_get_gravity( target ) << std::endl; + // } + + /* 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 fontspec = 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( fontspec.c_str() ); + PangoFontDescription* best = NULL; + + //font_description_dump( target ); + + GList* styles = row[FontList.styles]; + for (GList *l=styles; l; l = l->next) { + Glib::ustring fontspec = family + ", " + (char*)l->data; + PangoFontDescription* candidate = pango_font_description_from_string( fontspec.c_str() ); + //font_description_dump( candidate ); + //std::cout << " " << font_description_better_match( target, best, candidate ) << std::endl; + if( font_description_better_match( target, best, candidate ) ) { + pango_font_description_free( best ); + best = candidate; + //std::cout << " ... better: " << std::endl; + } else { + pango_font_description_free( candidate ); + //std::cout << " ... not better: " << std::endl; + } + } + + Glib::ustring best_style = target_style; + if( best ) { + pango_font_description_unset_fields( best, PANGO_FONT_MASK_FAMILY ); + best_style = pango_font_description_to_string( best ); + } + + if( target ) pango_font_description_free( target ); + if( best ) pango_font_description_free( best ); + + +#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 +961,12 @@ namespace Inkscape { return font_list_store; } + + const Glib::RefPtr<Gtk::ListStore> + FontLister::get_style_list () const + { + return style_list_store; + } } // Helper functions diff --git a/src/libnrtype/font-lister.h b/src/libnrtype/font-lister.h index 751350407..5c48bf7a8 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,23 @@ 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; + + /** 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 +121,12 @@ 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; + /** Updates font list to include fonts in document * */ @@ -96,13 +141,126 @@ 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 (); + + /** Sets current_fontspec, etc. If check is false, won't + * try to find best style match (assumes style in fontspec + * valid for given font-family). + */ + void + set_fontspec (Glib::ustring fontspec, gboolean check=true); + + Glib::ustring + get_fontspec () + { + return current_fontspec; + } + + /** 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; + } + + /** Sets style. Does not validate style for family. + */ + void + set_font_style (Glib::ustring style); + + Glib::ustring + get_font_style () + { + return current_style; + } + + Glib::ustring + fontspec_from_style (SPStyle* style); + + /** Fill css using current_fontspec. + */ + void + fill_css( SPCSSAttr *css, Glib::ustring fontspec = "" ); + + 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 +274,24 @@ namespace Inkscape NRNameList families; Glib::RefPtr<Gtk::ListStore> font_list_store; + Glib::RefPtr<Gtk::ListStore> style_list_store; + + /** 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; + /** If a font-family is not on system, this list of styles is used. + */ + GList *default_styles; }; } @@ -125,7 +300,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/menus-skeleton.h b/src/menus-skeleton.h index fa39dbd3a..868b606a4 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -282,11 +282,6 @@ static char const menus_skeleton[] = " <separator/>\n" " <effects-list/>\n" " </submenu>\n" -#ifdef WITH_INKBOARD -" <submenu name=\"" N_("Whiteboa_rd") "\">\n" -" <verb verb-id=\"DialogXmppClient\" />\n" -" </submenu>\n" -#endif " <submenu name=\"" N_("_Help") "\">\n" " <verb verb-id=\"org.inkscape.help.manual\" />\n" " <verb verb-id=\"org.inkscape.help.keys\" />\n" 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/sp-guide.cpp b/src/sp-guide.cpp index 7445b0b75..48596cbc0 100644 --- a/src/sp-guide.cpp +++ b/src/sp-guide.cpp @@ -280,10 +280,10 @@ sp_guide_create_guides_around_page(SPDesktop *dt) { Geom::Point B(C[Geom::X], 0); Geom::Point D(0, C[Geom::Y]); - pts.push_back(std::make_pair<Geom::Point, Geom::Point>(A, B)); - pts.push_back(std::make_pair<Geom::Point, Geom::Point>(B, C)); - pts.push_back(std::make_pair<Geom::Point, Geom::Point>(C, D)); - pts.push_back(std::make_pair<Geom::Point, Geom::Point>(D, A)); + pts.push_back(std::pair<Geom::Point, Geom::Point>(A, B)); + pts.push_back(std::pair<Geom::Point, Geom::Point>(B, C)); + pts.push_back(std::pair<Geom::Point, Geom::Point>(C, D)); + pts.push_back(std::pair<Geom::Point, Geom::Point>(D, A)); sp_guide_pt_pairs_to_guides(doc, pts); diff --git a/src/splivarot.cpp b/src/splivarot.cpp index c3243930d..f9aaab898 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -460,10 +460,13 @@ sp_selected_path_boolop(SPDesktop *desktop, bool_op bop, const unsigned int verb theShapeB->ConvertToShape(theShape, origWind[curOrig]); - // les elements arrivent en ordre inverse dans la liste - theShape->Booleen(theShapeB, theShapeA, bop); - - { + if (theShapeA->numberOfEdges() == 0) { + Shape *swap = theShapeB; + theShapeB = theShapeA; + theShapeA = swap; + } else if (theShapeB->numberOfEdges() > 0) { + // les elements arrivent en ordre inverse dans la liste + theShape->Booleen(theShapeB, theShapeA, bop); Shape *swap = theShape; theShape = theShapeA; theShapeA = swap; @@ -506,7 +509,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/aboutbox.cpp b/src/ui/dialog/aboutbox.cpp index 0c0027c15..d4928d25d 100644 --- a/src/ui/dialog/aboutbox.cpp +++ b/src/ui/dialog/aboutbox.cpp @@ -97,7 +97,12 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { tabs->append_page(*manage( make_scrolled_text(license_text)), _("_License"), true); +#if WITH_GTKMM_3_0 + get_content_area()->pack_end(*manage(tabs), true, true); +#else get_vbox()->pack_end(*manage(tabs), true, true); +#endif + tabs->show_all(); add_button(Gtk::Stock::CLOSE, Gtk::RESPONSE_CLOSE); @@ -114,7 +119,11 @@ AboutBox::AboutBox() : Gtk::Dialog(_("About Inkscape")) { label->set_selectable(true); label->show(); +#if WITH_GTKMM_3_0 + get_content_area()->pack_start(*manage(label), false, false); +#else get_vbox()->pack_start(*manage(label), false, false); +#endif Gtk::Requisition requisition; #if GTK_CHECK_VERSION(3,0,0) diff --git a/src/ui/dialog/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp index 77a4f4f03..da43763c8 100644 --- a/src/ui/dialog/calligraphic-profile-rename.cpp +++ b/src/ui/dialog/calligraphic-profile-rename.cpp @@ -32,7 +32,12 @@ CalligraphicProfileRename::CalligraphicProfileRename() : { set_title(_("Edit profile")); +#if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); +#else Gtk::Box *mainVBox = get_vbox(); +#endif + _layout_table.set_spacings(4); _layout_table.resize (1, 2); diff --git a/src/ui/dialog/debug.cpp b/src/ui/dialog/debug.cpp index 429ed57bf..e61f8e389 100644 --- a/src/ui/dialog/debug.cpp +++ b/src/ui/dialog/debug.cpp @@ -69,7 +69,11 @@ DebugDialogImpl::DebugDialogImpl() set_title(_("Messages")); set_size_request(300, 400); +#if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); +#else Gtk::Box *mainVBox = get_vbox(); +#endif //## Add a menu for clear() Gtk::MenuItem* item = Gtk::manage(new Gtk::MenuItem(_("_File"), true)); diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 50f30e8f4..fd368ed9f 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -20,6 +20,11 @@ #include "dialog-manager.h" #include <gtkmm/imagemenuitem.h> + +#if GTK_CHECK_VERSION(3,0,0) +# include <gdkmm/devicemanager.h> +#endif + #include "ui/widget/spinbutton.h" #include <glibmm/i18n.h> @@ -1201,7 +1206,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 ) @@ -1785,7 +1789,15 @@ bool FilterEffectsDialog::PrimitiveList::on_draw_signal(const Cairo::RefPtr<Cair // Check mouse state int mx, my; Gdk::ModifierType mask; + +#if GTK_CHECK_VERSION(3,0,0) + Glib::RefPtr<Gdk::Display> display = get_bin_window()->get_display(); + Glib::RefPtr<Gdk::DeviceManager> dm = display->get_device_manager(); + Glib::RefPtr<const Gdk::Device> device = dm->get_client_pointer(); + get_bin_window()->get_device_position(device, mx, my, mask); +#else get_bin_window()->get_pointer(mx, my, mask); +#endif // Outline the bottom of the connection area const int outline_x = x + fheight * (row_count - row_index); @@ -2668,7 +2680,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..d70c5f187 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" @@ -134,7 +135,13 @@ FloatingBehavior::create(Dialog &dialog) inline FloatingBehavior::operator Gtk::Widget &() { return *_d; } inline GtkWidget *FloatingBehavior::gobj() { return GTK_WIDGET(_d->gobj()); } -inline Gtk::Box* FloatingBehavior::get_vbox() { return _d->get_vbox(); } +inline Gtk::Box* FloatingBehavior::get_vbox() { +#if WITH_GTKMM_3_0 + return _d->get_content_area(); +#else + return _d->get_vbox(); +#endif +} inline void FloatingBehavior::present() { _d->present(); } inline void FloatingBehavior::hide() { _d->hide(); } inline void FloatingBehavior::show() { _d->show(); } 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/glyphs.cpp b/src/ui/dialog/glyphs.cpp index eec904ee4..be44794d0 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -1,6 +1,7 @@ /* Authors: * Jon A. Cruz * Abhishek Sharma + * Tavmjong Bah * * Copyright (C) 2010 Jon A. Cruz * Released under GNU GPL, read the file 'COPYING' for more information @@ -343,7 +344,8 @@ GlyphsPanel::GlyphsPanel(gchar const *prefsPath) : GtkWidget *fontsel = sp_font_selector_new(); fsel = SP_FONT_SELECTOR(fontsel); - sp_font_selector_set_font(fsel, sp_font_selector_get_font(fsel), 12.0); + sp_font_selector_set_fontspec( fsel, sp_font_selector_get_fontspec(fsel), 12.0 ); + gtk_widget_set_size_request (fontsel, 0, 150); g_signal_connect( G_OBJECT(fontsel), "font_set", G_CALLBACK(fontChangeCB), this ); @@ -520,6 +522,7 @@ void GlyphsPanel::setTargetDesktop(SPDesktop *desktop) } } +// Append selected glyphs to selected text void GlyphsPanel::insertText() { SPItem *textItem = 0; @@ -611,7 +614,7 @@ void GlyphsPanel::glyphSelectionChanged() calcCanInsert(); } -void GlyphsPanel::fontChangeCB(SPFontSelector * /*fontsel*/, font_instance * /*font*/, GlyphsPanel *self) +void GlyphsPanel::fontChangeCB(SPFontSelector * /*fontsel*/, Glib::ustring /*fontspec*/, GlyphsPanel *self) { if (self) { self->rebuild(); @@ -667,7 +670,13 @@ void GlyphsPanel::readSelection( bool updateStyle, bool /*updateContent*/ ) void GlyphsPanel::rebuild() { - font_instance *font = fsel ? sp_font_selector_get_font(fsel) : 0; + Glib::ustring fontspec = fsel ? sp_font_selector_get_fontspec(fsel) : ""; + + font_instance* font = 0; + if( !fontspec.empty() ) { + font = font_factory::Default()->FaceFromFontSpecification( fontspec.c_str() ); + } + if (font) { //double sp_font_selector_get_size (SPFontSelector *fsel); diff --git a/src/ui/dialog/glyphs.h b/src/ui/dialog/glyphs.h index 162c7b296..6571af0a4 100644 --- a/src/ui/dialog/glyphs.h +++ b/src/ui/dialog/glyphs.h @@ -54,7 +54,7 @@ private: static GlyphColumns *getColumns(); - static void fontChangeCB(SPFontSelector *fontsel, font_instance *font, GlyphsPanel *self); + static void fontChangeCB(SPFontSelector *fontsel, Glib::ustring fontspec, GlyphsPanel *self); void rebuild(); diff --git a/src/ui/dialog/guides.cpp b/src/ui/dialog/guides.cpp index d8bbb5539..06671393d 100644 --- a/src/ui/dialog/guides.cpp +++ b/src/ui/dialog/guides.cpp @@ -166,12 +166,12 @@ void GuidelinePropertiesDialog::_setup() { add_button(Gtk::Stock::DELETE, -12); add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL); - Gtk::Box *mainVBox = get_vbox(); - #if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); _layout_table.set_row_spacing(4); _layout_table.set_column_spacing(4); #else + Gtk::Box *mainVBox = get_vbox(); _layout_table.set_spacings(4); _layout_table.resize (3, 4); #endif diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 57f815730..c63b78c70 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, "", @@ -1476,7 +1477,15 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui scroller->add(_kb_tree); int row = 3; + +#if WITH_GTKMM_3_0 + scroller->set_hexpand(); + scroller->set_vexpand(); + _page_keyshortcuts.attach(*scroller, 0, row, 2, 1); +#else _page_keyshortcuts.attach(*scroller, 0, 2, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL); +#endif + row++; #if WITH_GTKMM_3_0 @@ -1487,7 +1496,13 @@ void InkscapePreferences::initKeyboardShortcuts(Gtk::TreeModel::iterator iter_ui box_buttons->set_layout(Gtk::BUTTONBOX_END); box_buttons->set_spacing(4); + +#if WITH_GTKMM_3_0 + box_buttons->set_hexpand(); + _page_keyshortcuts.attach(*box_buttons, 0, row, 3, 1); +#else _page_keyshortcuts.attach(*box_buttons, 0, 3, row, row+1, Gtk::EXPAND | Gtk::FILL, Gtk::SHRINK); +#endif UI::Widget::Button *kb_reset = manage(new UI::Widget::Button(_("Reset"), _("Remove all your customized keyboard shortcuts, and revert to the shortcuts in the shortcut file listed above"))); box_buttons->pack_start(*kb_reset, true, true, 6); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index b21ab0128..eaf1ffc3d 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -87,6 +87,14 @@ enum { }; +namespace Gtk { +#if WITH_GTKMM_3_0 +class Scale; +#else +class HScale; +#endif +} + namespace Inkscape { namespace UI { namespace Dialog { @@ -188,7 +196,12 @@ protected: UI::Widget::PrefCheckButton _scroll_space; UI::Widget::PrefCheckButton _wheel_zoom; +#if WITH_GTKMM_3_0 + Gtk::Scale *_slider_snapping_delay; +#else Gtk::HScale *_slider_snapping_delay; +#endif + UI::Widget::PrefCheckButton _snap_indicator; UI::Widget::PrefCheckButton _snap_closest_only; UI::Widget::PrefCheckButton _snap_mouse_pointer; diff --git a/src/ui/dialog/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp index 6a1bc829e..3feed2afe 100644 --- a/src/ui/dialog/layer-properties.cpp +++ b/src/ui/dialog/layer-properties.cpp @@ -40,12 +40,12 @@ namespace Dialogs { LayerPropertiesDialog::LayerPropertiesDialog() : _strategy(NULL), _desktop(NULL), _layer(NULL), _position_visible(false) { - Gtk::Box *mainVBox = get_vbox(); - #if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); _layout_table.set_row_spacing(4); _layout_table.set_column_spacing(4); #else + Gtk::Box *mainVBox = get_vbox(); _layout_table.set_spacings(4); _layout_table.resize (1, 2); #endif 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/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index e899dbcfc..b5f51d81d 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -73,7 +73,12 @@ LivePathEffectAdd::LivePathEffectAdd() : add_button.set_use_underline(true); add_button.set_can_default(); +#if WITH_GTKMM_3_0 + Gtk::Box *mainVBox = get_content_area(); +#else Gtk::Box *mainVBox = get_vbox(); +#endif + mainVBox->pack_start(scrolled_window, true, true); add_action_widget(close_button, Gtk::RESPONSE_CLOSE); add_action_widget(add_button, Gtk::RESPONSE_APPLY); diff --git a/src/ui/dialog/svg-fonts-dialog.cpp b/src/ui/dialog/svg-fonts-dialog.cpp index be69635e8..0da39dd73 100644 --- a/src/ui/dialog/svg-fonts-dialog.cpp +++ b/src/ui/dialog/svg-fonts-dialog.cpp @@ -22,6 +22,7 @@ #include "document-undo.h" #include <gtkmm/notebook.h> #include <gtkmm/imagemenuitem.h> +#include <gtkmm/scale.h> #include <gtkmm/stock.h> #include <glibmm/i18n.h> #include <message-stack.h> @@ -191,7 +192,7 @@ void SvgFontsDialog::on_kerning_value_changed(){ //slider values increase from right to left so that they match the kerning pair preview //XML Tree being directly used here while it shouldn't be. - this->kerning_pair->getRepr()->setAttribute("k", Glib::Ascii::dtostr(get_selected_spfont()->horiz_adv_x - kerning_slider.get_value()).c_str()); + this->kerning_pair->getRepr()->setAttribute("k", Glib::Ascii::dtostr(get_selected_spfont()->horiz_adv_x - kerning_slider->get_value()).c_str()); DocumentUndo::maybeDone(document, undokey.c_str(), SP_VERB_DIALOG_SVG_FONTS, _("Adjust kerning value")); //populate_kerning_pairs_box(); @@ -299,7 +300,7 @@ void SvgFontsDialog::on_kerning_pair_selection_changed(){ this->kerning_pair = kern; //slider values increase from right to left so that they match the kerning pair preview - kerning_slider.set_value(get_selected_spfont()->horiz_adv_x - kern->k); + kerning_slider->set_value(get_selected_spfont()->horiz_adv_x - kern->k); } void SvgFontsDialog::update_global_settings_tab(){ @@ -328,9 +329,9 @@ void SvgFontsDialog::on_font_selection_changed(){ double set_width = spfont->horiz_adv_x; setwidth_spin.set_value(set_width); - kerning_slider.set_range(0, set_width); - kerning_slider.set_draw_value(false); - kerning_slider.set_value(0); + kerning_slider->set_range(0, set_width); + kerning_slider->set_draw_value(false); + kerning_slider->set_value(0); update_global_settings_tab(); populate_glyphs_box(); @@ -779,7 +780,7 @@ Gtk::VBox* SvgFontsDialog::kerning_tab(){ add_kernpair_button.set_label(_("Add pair")); add_kernpair_button.signal_clicked().connect(sigc::mem_fun(*this, &SvgFontsDialog::add_kerning_pair)); _KerningPairsList.get_selection()->signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_kerning_pair_selection_changed)); - kerning_slider.signal_value_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_kerning_value_changed)); + kerning_slider->signal_value_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_kerning_value_changed)); kerning_vbox.pack_start(*kerning_selector, false,false); @@ -797,7 +798,7 @@ Gtk::VBox* SvgFontsDialog::kerning_tab(){ Gtk::HBox* kerning_amount_hbox = Gtk::manage(new Gtk::HBox()); kerning_vbox.pack_start(*kerning_amount_hbox, false,false); kerning_amount_hbox->add(*Gtk::manage(new Gtk::Label(_("Kerning value:")))); - kerning_amount_hbox->add(kerning_slider); + kerning_amount_hbox->add(*kerning_slider); kerning_preview.set_size(300 + 20, 150 + 20); _font_da.set_size(150 + 20, 50 + 20); @@ -884,6 +885,12 @@ void SvgFontsDialog::add_font(){ SvgFontsDialog::SvgFontsDialog() : UI::Widget::Panel("", "/dialogs/svgfonts", SP_VERB_DIALOG_SVG_FONTS), _add(Gtk::Stock::NEW) { +#if WITH_GTKMM_3_0 + kerning_slider = Gtk::manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL)); +#else + kerning_slider = Gtk::manage(new Gtk::HScale); +#endif + _add.signal_clicked().connect(sigc::mem_fun(*this, &SvgFontsDialog::add_font)); Gtk::HBox* hbox = Gtk::manage(new Gtk::HBox()); diff --git a/src/ui/dialog/svg-fonts-dialog.h b/src/ui/dialog/svg-fonts-dialog.h index 910f79d4c..9be984820 100644 --- a/src/ui/dialog/svg-fonts-dialog.h +++ b/src/ui/dialog/svg-fonts-dialog.h @@ -20,13 +20,20 @@ #include <gtkmm/drawingarea.h> #include <gtkmm/entry.h> #include <gtkmm/liststore.h> -#include <gtkmm/scale.h> #include <gtkmm/scrolledwindow.h> #include <gtkmm/treeview.h> #include "attributes.h" #include "xml/helper-observer.h" +namespace Gtk { +#if WITH_GTKMM_3_0 +class Scale; +#else +class HScale; +#endif +} + class SPGlyph; class SPGlyphKerning; class SvgFont; @@ -210,7 +217,12 @@ private: GlyphComboBox first_glyph, second_glyph; SPGlyphKerning* kerning_pair; Inkscape::UI::Widget::SpinButton setwidth_spin; - Gtk::HScale kerning_slider; + +#if WITH_GTKMM_3_0 + Gtk::Scale* kerning_slider; +#else + Gtk::HScale* kerning_slider; +#endif class EntryWidget : public Gtk::HBox { 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/dialog/text-edit.cpp b/src/ui/dialog/text-edit.cpp index 97cd28cdd..a71227861 100644 --- a/src/ui/dialog/text-edit.cpp +++ b/src/ui/dialog/text-edit.cpp @@ -8,8 +8,9 @@ * Johan Engelen <goejendaagh@zonnet.nl> * Abhishek Sharma * John Smith + * Tavmjong Bah * - * Copyright (C) 1999-2012 Authors + * Copyright (C) 1999-2013 Authors * Copyright (C) 2000-2001 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -32,6 +33,7 @@ extern "C" { #include <gtkmm/stock.h> #include <libnrtype/font-instance.h> #include <libnrtype/font-style-to-pos.h> +#include <libnrtype/font-lister.h> #include <xml/repr.h> #include "macros.h" @@ -305,18 +307,20 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ ) // FIXME: process result_family/style == QUERY_STYLE_MULTIPLE_DIFFERENT by showing "Many" in the lists - // Get a font_instance using the font-specification attribute stored in SPStyle if available - font_instance *font = font_factory::Default()->FaceFromStyle(query); + Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); - if (font) { + // This is done for us by text-toolbar. No need to do it twice. + // fontlister->update_font_list( sp_desktop_document( SP_ACTIVE_DESKTOP )); + // fontlister->selection_update(); - Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); - sp_font_selector_set_font (fsel, font, sp_style_css_size_px_to_units(query->font_size.computed, unit) ); - setPreviewText(font, phrase); - font->Unref(); - font=NULL; - } + Glib::ustring fontspec = fontlister->get_fontspec(); + + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); + double size = sp_style_css_size_px_to_units(query->font_size.computed, unit); + sp_font_selector_set_fontspec(fsel, fontspec, size ); + + setPreviewText (fontspec, phrase); if (query->text_anchor.computed == SP_CSS_TEXT_ANCHOR_START) { if (query->text_align.computed == SP_CSS_TEXT_ALIGN_JUSTIFY) { @@ -351,30 +355,31 @@ void TextEdit::onReadSelection ( gboolean dostyle, gboolean /*docontent*/ ) blocked = false; } -void TextEdit::setPreviewText (font_instance *font, Glib::ustring phrase) + +void TextEdit::setPreviewText (Glib::ustring font_spec, Glib::ustring phrase) { - if (!font) { + if (font_spec.empty()) { return; } - char *desc = pango_font_description_to_string(font->descr); + Glib::ustring phrase_escaped = Glib::Markup::escape_text( phrase ); + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * PT_PER_PX; - gchar *const phrase_escaped = g_markup_escape_text(phrase.c_str(), -1); - // Pango font size is in 1024ths of a point - gchar *markup = g_strdup_printf("<span font=\"%s\" size=\"%d\">%s</span>", - desc, (int) (pt_size * PANGO_SCALE ), phrase_escaped); + // C++11: Glib::ustring size = std::to_string( pt_size * PANGO_SCALE ); + std::ostringstream size_st; + size_st << pt_size * PANGO_SCALE; - preview_label.set_markup(markup); + Glib::ustring markup = "<span font=\"" + font_spec + + "\" size=\"" + size_st.str() + "\">" + phrase_escaped + "</span>"; - g_free(desc); - g_free(phrase_escaped); - g_free(markup); + preview_label.set_markup(markup.c_str()); } + SPItem *TextEdit::getSelectedTextItem (void) { if (!SP_ACTIVE_DESKTOP) @@ -430,34 +435,18 @@ void TextEdit::updateObjectText ( SPItem *text ) } } -SPCSSAttr *TextEdit::getTextStyle () +SPCSSAttr *TextEdit::fillTextStyle () { SPCSSAttr *css = sp_repr_css_attr_new (); - // font - font_instance *font = sp_font_selector_get_font (fsel); - - if ( font ) { - Glib::ustring fontName = font_factory::Default()->ConstructFontSpecification(font); - sp_repr_css_set_property (css, "-inkscape-font-specification", fontName.c_str()); - - 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); + Glib::ustring fontspec = sp_font_selector_get_fontspec (fsel); - font->Attribute("style", c, 256); - sp_repr_css_set_property (css, "font-style", c); + if( !fontspec.empty() ) { - 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); + Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance(); + fontlister->fill_css( css, fontspec ); + // TODO, possibly move this to FontLister::set_css to be shared. Inkscape::CSSOStringStream os; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT); @@ -467,9 +456,6 @@ SPCSSAttr *TextEdit::getTextStyle () os << sp_font_selector_get_size (fsel) << sp_style_get_css_unit_string(unit); } sp_repr_css_set_property (css, "font-size", os.str().c_str()); - - font->Unref(); - font=NULL; } // Layout @@ -505,7 +491,7 @@ SPCSSAttr *TextEdit::getTextStyle () void TextEdit::onSetDefault() { - SPCSSAttr *css = getTextStyle (); + SPCSSAttr *css = fillTextStyle (); Inkscape::Preferences *prefs = Inkscape::Preferences::get(); blocked = true; @@ -525,7 +511,7 @@ void TextEdit::onApply() unsigned items = 0; const GSList *item_list = sp_desktop_selection(desktop)->itemList(); - SPCSSAttr *css = getTextStyle (); + SPCSSAttr *css = fillTextStyle (); sp_desktop_set_style(desktop, css, true); for (; item_list != NULL; item_list = item_list->next) { @@ -556,6 +542,13 @@ void TextEdit::onApply() } } + // Update FontLister + Glib::ustring fontspec = sp_font_selector_get_fontspec (fsel); + if( !fontspec.empty() ) { + Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance(); + fontlister->set_fontspec( fontspec, false ); + } + // complete the transaction DocumentUndo::done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_CONTEXT_TEXT, _("Set text style")); @@ -577,11 +570,11 @@ void TextEdit::onTextChange (GtkTextBuffer *text_buffer, TextEdit *self) GtkTextIter end; gtk_text_buffer_get_bounds (text_buffer, &start, &end); gchar *str = gtk_text_buffer_get_text(text_buffer, &start, &end, TRUE); - font_instance *font = sp_font_selector_get_font(self->fsel); + Glib::ustring fontspec = sp_font_selector_get_fontspec(self->fsel); - if (font) { + if( !fontspec.empty() ) { const gchar *phrase = str && *str ? str : self->samplephrase.c_str(); - self->setPreviewText(font, phrase); + self->setPreviewText(fontspec, phrase); } else { self->preview_label.set_markup(""); } @@ -594,7 +587,7 @@ void TextEdit::onTextChange (GtkTextBuffer *text_buffer, TextEdit *self) self->setasdefault_button.set_sensitive ( true); } -void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, font_instance * font, TextEdit *self) +void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, gchar* fontspec, TextEdit *self) { GtkTextIter start, end; gchar *str; @@ -607,9 +600,9 @@ void TextEdit::onFontChange(SPFontSelector * /*fontsel*/, font_instance * font, gtk_text_buffer_get_bounds (self->text_buffer, &start, &end); str = gtk_text_buffer_get_text (self->text_buffer, &start, &end, TRUE); - if (font) { + if (fontspec) { const gchar *phrase = str && *str ? str : self->samplephrase.c_str(); - self->setPreviewText(font, phrase); + self->setPreviewText(fontspec, phrase); } else { self->preview_label.set_markup(""); } diff --git a/src/ui/dialog/text-edit.h b/src/ui/dialog/text-edit.h index bca6cee90..3fdeea05d 100644 --- a/src/ui/dialog/text-edit.h +++ b/src/ui/dialog/text-edit.h @@ -7,8 +7,9 @@ * Johan Engelen <goejendaagh@zonnet.nl> * John Smith * Kris De Gussem <Kris.DeGussem@gmail.com> + * Tavmjong Bah * - * Copyright (C) 1999-2012 Authors + * Copyright (C) 1999-2013 Authors * Copyright (C) 2000-2001 Ximian, Inc. * * Released under GNU GPL, read the file 'COPYING' for more information @@ -100,10 +101,10 @@ protected: * onFontChange updates the dialog UI. The subfunction setPreviewText updates the preview label. * * @param fontsel pointer to SPFontSelector (currently not used). - * @param font pointer to the font instance for the text to be previewed + * @param fontspec for the text to be previewed. * @param self pointer to the current instance of the dialog. */ - static void onFontChange (SPFontSelector *fontsel, font_instance *font, TextEdit *self); + static void onFontChange (SPFontSelector *fontsel, gchar* fontspec, TextEdit *self); /** * Get the selected text off the main canvas. @@ -118,15 +119,15 @@ protected: unsigned getSelectedTextCount (void); /** - * Helper function to create markup from a font definition and display in the preview label. + * Helper function to create markup from a fontspec and display in the preview label. * - * @param font pointer to the font instance for the text to be previewed + * @param fontspec for the text to be previewed * @param phrase text to be shown */ - void setPreviewText (font_instance *font, Glib::ustring phrase); + void setPreviewText (Glib::ustring font_spec, Glib::ustring phrase); void updateObjectText ( SPItem *text ); - SPCSSAttr *getTextStyle (); + SPCSSAttr *fillTextStyle (); /** * Helper function to style radio buttons with icons, tooltips. diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp index 31fb3096c..5585f2db4 100644 --- a/src/ui/widget/color-picker.cpp +++ b/src/ui/widget/color-picker.cpp @@ -56,8 +56,14 @@ void ColorPicker::setupDialog(const Glib::ustring &title) _colorSelectorDialog.set_title (title); _colorSelectorDialog.set_border_width (4); _colorSelector = SP_COLOR_SELECTOR(sp_color_selector_new(SP_TYPE_COLOR_NOTEBOOK)); + +#if WITH_GTKMM_3_0 + _colorSelectorDialog.get_content_area()->pack_start ( + *Glib::wrap(&_colorSelector->vbox), true, true, 0); +#else _colorSelectorDialog.get_vbox()->pack_start ( *Glib::wrap(&_colorSelector->vbox), true, true, 0); +#endif g_signal_connect(G_OBJECT(_colorSelector), "dragged", G_CALLBACK(sp_color_picker_color_mod), (void *)this); 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/ui/widget/dock.cpp b/src/ui/widget/dock.cpp index a38a93fb1..2bfc7e0df 100644 --- a/src/ui/widget/dock.cpp +++ b/src/ui/widget/dock.cpp @@ -54,6 +54,17 @@ Dock::Dock(Gtk::Orientation orientation) { gdl_dock_bar_set_orientation(_gdl_dock_bar, static_cast<GtkOrientation>(orientation)); +#if WITH_GTKMM_3_0 + switch(orientation) { + case Gtk::ORIENTATION_VERTICAL: + _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL)); + break; + case Gtk::ORIENTATION_HORIZONTAL: + _dock_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_VERTICAL)); + } + + _paned = Gtk::manage(new Gtk::Paned(orientation)); +#else switch (orientation) { case Gtk::ORIENTATION_VERTICAL: _dock_box = Gtk::manage(new Gtk::HBox()); @@ -63,6 +74,7 @@ Dock::Dock(Gtk::Orientation orientation) _dock_box = Gtk::manage(new Gtk::VBox()); _paned = Gtk::manage(new Gtk::HPaned()); } +#endif _scrolled_window->add(*_dock_box); _scrolled_window->set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); diff --git a/src/ui/widget/preferences-widget.cpp b/src/ui/widget/preferences-widget.cpp index e5b062ec9..314bf75bf 100644 --- a/src/ui/widget/preferences-widget.cpp +++ b/src/ui/widget/preferences-widget.cpp @@ -21,7 +21,9 @@ #include <gtkmm/box.h> #include <gtkmm/frame.h> #include <gtkmm/alignment.h> +#include <gtkmm/scale.h> #include <gtkmm/stock.h> +#include <gtkmm/table.h> #include "preferences.h" #include "ui/widget/preferences-widget.h" @@ -49,90 +51,139 @@ namespace Widget { DialogPage::DialogPage() { - this->set_border_width(12); - this->set_col_spacings(12); - this->set_row_spacings(6); + set_border_width(12); + +#if WITH_GTKMM_3_0 + set_orientation(Gtk::ORIENTATION_VERTICAL); + set_column_spacing(12); + set_row_spacing(6); +#else + set_col_spacings(12); + set_row_spacings(6); +#endif } -void DialogPage::add_line(bool indent, Glib::ustring const &label, Gtk::Widget &widget, Glib::ustring const &suffix, const Glib::ustring &tip, bool expand_widget, Gtk::Widget *other_widget) +/** + * Add a widget to the bottom row of the dialog page + * + * \param[in] indent Whether the widget should be indented by one column + * \param[in] label The label text for the widget + * \param[in] widget The widget to add to the page + * \param[in] suffix Text for an optional label at the right of the widget + * \param[in] tip Tooltip text for the widget + * \param[in] expand_widget Whether to expand the widget horizontally + * \param[in] other_widget An optional additional widget to display at the right of the first one + */ +void DialogPage::add_line(bool indent, + Glib::ustring const &label, + Gtk::Widget &widget, + Glib::ustring const &suffix, + const Glib::ustring &tip, + bool expand_widget, + Gtk::Widget *other_widget) { - int start_col; - int row = this->property_n_rows(); - Gtk::Widget* w; - if (expand_widget) - { - w = &widget; - } - else - { - Gtk::HBox* hb = Gtk::manage(new Gtk::HBox()); - hb->set_spacing(12); - hb->pack_start(widget,false,false); - if (other_widget) { - hb->pack_start(*other_widget,false,false); - } - - w = (Gtk::Widget*) hb; - } + if (tip != "") + widget.set_tooltip_text (tip); + + Gtk::Alignment* label_alignment = Gtk::manage(new Gtk::Alignment()); + + Gtk::HBox* hb = Gtk::manage(new Gtk::HBox()); + hb->set_spacing(12); + hb->pack_start(widget, expand_widget, expand_widget); + + // Pack an additional widget into a box with the widget if desired + if (other_widget) + hb->pack_start(*other_widget, expand_widget, expand_widget); + + // Pack the widget into an alignment container so that it can + // be indented if desired + Gtk::Alignment* w_alignment = Gtk::manage(new Gtk::Alignment()); + w_alignment->add(*hb); + +#if WITH_GTKMM_3_0 + w_alignment->set_valign(Gtk::ALIGN_CENTER); +#else + guint row = property_n_rows(); +#endif + + // Add a label in the first column if provided if (label != "") { - Gtk::Label* label_widget; - label_widget = Gtk::manage(new Gtk::Label(label , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true)); + Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(label, Gtk::ALIGN_START, + Gtk::ALIGN_CENTER, true)); label_widget->set_mnemonic_widget(widget); + + // Pack the label into an alignment container so that we can indent it + // if necessary + label_alignment->add(*label_widget); + if (indent) - { - Gtk::Alignment* alignment = Gtk::manage(new Gtk::Alignment()); - alignment->set_padding(0, 0, 12, 0); - alignment->add(*label_widget); - this->attach(*alignment , 0, 1, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); - } - else - this->attach(*label_widget , 0, 1, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); - start_col = 1; + label_alignment->set_padding(0, 0, 12, 0); + +#if WITH_GTKMM_3_0 + label_alignment->set_valign(Gtk::ALIGN_CENTER); + add(*label_alignment); + attach_next_to(*w_alignment, *label_alignment, Gtk::POS_RIGHT, 1, 1); +#else + attach(*label_alignment, 0, 1, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); +#endif } - else - start_col = 0; - if (start_col == 0 && indent) //indent this widget + // Now add the widget to the bottom of the dialog +#if WITH_GTKMM_3_0 + if (label == "") { - Gtk::Alignment* alignment = Gtk::manage(new Gtk::Alignment()); - alignment->set_padding(0, 0, 12, 0); - alignment->add(*w); - this->attach(*alignment, start_col, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::AttachOptions(), 0, 0); - } - else - { - this->attach(*w, start_col, 2, row, row + 1, Gtk::FILL | Gtk::EXPAND, Gtk::AttachOptions(), 0, 0); - } + if (indent) + w_alignment->set_padding(0, 0, 12, 0); + + add(*w_alignment); + + GValue width = G_VALUE_INIT; + g_value_init(&width, G_TYPE_INT); + g_value_set_int(&width, 2); + gtk_container_child_set_property(GTK_CONTAINER(gobj()), GTK_WIDGET(w_alignment->gobj()), "width", &width); + } +#else + // The widget should span two columns if there is no label + int w_col_span = 1; + if (label == "") + w_col_span = 2; + + attach(*w_alignment, 2 - w_col_span, 2, row, row + 1, + Gtk::FILL | Gtk::EXPAND, + Gtk::AttachOptions(), + 0, 0); +#endif + // Add a label on the right of the widget if desired if (suffix != "") { Gtk::Label* suffix_widget = Gtk::manage(new Gtk::Label(suffix , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true)); - if (expand_widget) - this->attach(*suffix_widget, 2, 3, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); - else - ((Gtk::HBox*)w)->pack_start(*suffix_widget,false,false); - } - - if (tip != "") - { - widget.set_tooltip_text (tip); + hb->pack_start(*suffix_widget,false,false); } } void DialogPage::add_group_header(Glib::ustring name) { - int row = this->property_n_rows(); if (name != "") { Gtk::Label* label_widget = Gtk::manage(new Gtk::Label(Glib::ustring(/*"<span size='large'>*/"<b>") + name + Glib::ustring("</b>"/*</span>"*/) , Gtk::ALIGN_START , Gtk::ALIGN_CENTER, true)); label_widget->set_use_markup(true); - this->attach(*label_widget , 0, 4, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); + +#if WITH_GTKMM_3_0 + label_widget->set_valign(Gtk::ALIGN_CENTER); + add(*label_widget); +// if (row != 1) + // set_row_spacing(row - 1, 18); +#else + int row = property_n_rows(); + attach(*label_widget , 0, 4, row, row + 1, Gtk::FILL, Gtk::AttachOptions(), 0, 0); if (row != 1) - this->set_row_spacing(row - 1, 18); + set_row_spacing(row - 1, 18); +#endif } } @@ -444,8 +495,8 @@ ZoomCorrRulerSlider::on_slider_value_changed() { freeze = true; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - prefs->setDouble("/options/zoomcorrection/value", _slider.get_value() / 100.0); - _sb.set_value(_slider.get_value()); + prefs->setDouble("/options/zoomcorrection/value", _slider->get_value() / 100.0); + _sb.set_value(_slider->get_value()); _ruler.queue_draw(); freeze = false; } @@ -459,7 +510,7 @@ ZoomCorrRulerSlider::on_spinbutton_value_changed() freeze = true; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setDouble("/options/zoomcorrection/value", _sb.get_value() / 100.0); - _slider.set_value(_sb.get_value()); + _slider->set_value(_sb.get_value()); _ruler.queue_draw(); freeze = false; } @@ -498,13 +549,19 @@ ZoomCorrRulerSlider::init(int ruler_width, int ruler_height, double lower, doubl _ruler.set_size(ruler_width, ruler_height); - _slider.set_size_request(_ruler.width(), -1); - _slider.set_range (lower, upper); - _slider.set_increments (step_increment, page_increment); - _slider.set_value (value); - _slider.set_digits(2); +#if WITH_GTKMM_3_0 + _slider = Gtk::manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL)); +#else + _slider = Gtk::manage(new Gtk::HScale()); +#endif + + _slider->set_size_request(_ruler.width(), -1); + _slider->set_range (lower, upper); + _slider->set_increments (step_increment, page_increment); + _slider->set_value (value); + _slider->set_digits(2); - _slider.signal_value_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_slider_value_changed)); + _slider->signal_value_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_slider_value_changed)); _sb.signal_value_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_spinbutton_value_changed)); _unit.signal_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_unit_changed)); @@ -518,18 +575,28 @@ ZoomCorrRulerSlider::init(int ruler_width, int ruler_height, double lower, doubl _unit.set_data("sensitive", GINT_TO_POINTER(1)); _unit.setUnit(prefs->getString("/options/zoomcorrection/unit")); - Gtk::Table *table = Gtk::manage(new Gtk::Table()); Gtk::Alignment *alignment1 = Gtk::manage(new Gtk::Alignment(0.5,1,0,0)); Gtk::Alignment *alignment2 = Gtk::manage(new Gtk::Alignment(0.5,1,0,0)); alignment1->add(_sb); alignment2->add(_unit); - table->attach(_slider, 0, 1, 0, 1); +#if WITH_GTKMM_3_0 + Gtk::Grid *table = Gtk::manage(new Gtk::Grid()); + table->attach(*_slider, 0, 0, 1, 1); + alignment1->set_halign(Gtk::ALIGN_CENTER); + table->attach(*alignment1, 1, 0, 1, 1); + table->attach(_ruler, 0, 1, 1, 1); + alignment2->set_halign(Gtk::ALIGN_CENTER); + table->attach(*alignment2, 1, 1, 1, 1); +#else + Gtk::Table *table = Gtk::manage(new Gtk::Table()); + table->attach(*_slider, 0, 1, 0, 1); table->attach(*alignment1, 1, 2, 0, 1, static_cast<Gtk::AttachOptions>(0)); table->attach(_ruler, 0, 1, 1, 2); table->attach(*alignment2, 1, 2, 1, 2, static_cast<Gtk::AttachOptions>(0)); +#endif - this->pack_start(*table, Gtk::PACK_EXPAND_WIDGET); + pack_start(*table, Gtk::PACK_SHRINK); } void @@ -539,8 +606,8 @@ PrefSlider::on_slider_value_changed() { freeze = true; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - prefs->setDouble(_prefs_path, _slider.get_value()); - _sb.set_value(_slider.get_value()); + prefs->setDouble(_prefs_path, _slider->get_value()); + _sb.set_value(_slider->get_value()); freeze = false; } } @@ -553,7 +620,7 @@ PrefSlider::on_spinbutton_value_changed() freeze = true; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); prefs->setDouble(_prefs_path, _sb.get_value()); - _slider.set_value(_sb.get_value()); + _slider->set_value(_sb.get_value()); freeze = false; } } @@ -574,11 +641,17 @@ PrefSlider::init(Glib::ustring const &prefs_path, freeze = false; - _slider.set_range (lower, upper); - _slider.set_increments (step_increment, page_increment); - _slider.set_value (value); - _slider.set_digits(digits); - _slider.signal_value_changed().connect(sigc::mem_fun(*this, &PrefSlider::on_slider_value_changed)); +#if WITH_GTKMM_3_0 + _slider = Gtk::manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL)); +#else + _slider = Gtk::manage(new Gtk::HScale()); +#endif + + _slider->set_range (lower, upper); + _slider->set_increments (step_increment, page_increment); + _slider->set_value (value); + _slider->set_digits(digits); + _slider->signal_value_changed().connect(sigc::mem_fun(*this, &PrefSlider::on_slider_value_changed)); _sb.signal_value_changed().connect(sigc::mem_fun(*this, &PrefSlider::on_spinbutton_value_changed)); _sb.set_range (lower, upper); @@ -586,12 +659,20 @@ PrefSlider::init(Glib::ustring const &prefs_path, _sb.set_value (value); _sb.set_digits(digits); - Gtk::Table *table = Gtk::manage(new Gtk::Table()); Gtk::Alignment *alignment1 = Gtk::manage(new Gtk::Alignment(0.5,1,0,0)); alignment1->add(_sb); - table->attach(_slider, 0, 1, 0, 1); +#if WITH_GTKMM_3_0 + Gtk::Grid *table = Gtk::manage(new Gtk::Grid()); + _slider->set_hexpand(); + table->attach(*_slider, 0, 0, 1, 1); + alignment1->set_halign(Gtk::ALIGN_CENTER); + table->attach(*alignment1, 1, 0, 1, 1); +#else + Gtk::Table *table = Gtk::manage(new Gtk::Table()); + table->attach(*_slider, 0, 1, 0, 1); table->attach(*alignment1, 1, 2, 0, 1, static_cast<Gtk::AttachOptions>(0)); +#endif this->pack_start(*table, Gtk::PACK_EXPAND_WIDGET); } diff --git a/src/ui/widget/preferences-widget.h b/src/ui/widget/preferences-widget.h index 646a8b2fa..e3968045d 100644 --- a/src/ui/widget/preferences-widget.h +++ b/src/ui/widget/preferences-widget.h @@ -25,14 +25,26 @@ #include <gtkmm/radiobutton.h> #include <gtkmm/comboboxtext.h> #include <gtkmm/drawingarea.h> -#include <gtkmm/scale.h> + +#if WITH_GTKMM_3_0 +#include <gtkmm/grid.h> +#else #include <gtkmm/table.h> +#endif #include "ui/widget/color-picker.h" #include "ui/widget/unit-menu.h" #include "ui/widget/spinbutton.h" #include "ui/widget/scalar-unit.h" +namespace Gtk { +#if WITH_GTKMM_3_0 +class Scale; +#else +class HScale; +#endif +} + namespace Inkscape { namespace UI { namespace Widget { @@ -137,7 +149,11 @@ private: Inkscape::UI::Widget::SpinButton _sb; UnitMenu _unit; - Gtk::HScale _slider; +#if WITH_GTKMM_3_0 + Gtk::Scale* _slider; +#else + Gtk::HScale* _slider; +#endif ZoomCorrRuler _ruler; bool freeze; // used to block recursive updates of slider and spinbutton }; @@ -155,7 +171,13 @@ private: Glib::ustring _prefs_path; Inkscape::UI::Widget::SpinButton _sb; - Gtk::HScale _slider; + +#if WITH_GTKMM_3_0 + Gtk::Scale* _slider; +#else + Gtk::HScale* _slider; +#endif + bool freeze; // used to block recursive updates of slider and spinbutton }; @@ -251,7 +273,11 @@ protected: void on_changed(); }; +#if WITH_GTKMM_3_0 +class DialogPage : public Gtk::Grid +#else class DialogPage : public Gtk::Table +#endif { public: DialogPage(); diff --git a/src/ui/widget/scalar.cpp b/src/ui/widget/scalar.cpp index 9bbcc80f9..fca8a7974 100644 --- a/src/ui/widget/scalar.cpp +++ b/src/ui/widget/scalar.cpp @@ -142,7 +142,7 @@ void Scalar::update() void Scalar::addSlider() { #if WITH_GTKMM_3_0 - Gtk::HScale *scale = new Gtk::HScale(static_cast<SpinButton*>(_widget)->get_adjustment()); + Gtk::Scale *scale = new Gtk::Scale(static_cast<SpinButton*>(_widget)->get_adjustment()); #else Gtk::HScale *scale = new Gtk::HScale( * static_cast<SpinButton*>(_widget)->get_adjustment() ); #endif diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index 323b1209c..facbf704c 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -116,11 +116,20 @@ Gtk::Adjustment& SpinSlider::get_adjustment() return _adjustment; } +#if WITH_GTKMM_3_0 +const Gtk::Scale& SpinSlider::get_scale() const +#else const Gtk::HScale& SpinSlider::get_scale() const +#endif { return _scale; } + +#if WITH_GTKMM_3_0 +Gtk::Scale& SpinSlider::get_scale() +#else Gtk::HScale& SpinSlider::get_scale() +#endif { return _scale; } diff --git a/src/ui/widget/spin-slider.h b/src/ui/widget/spin-slider.h index f4a62107b..8a45299e5 100644 --- a/src/ui/widget/spin-slider.h +++ b/src/ui/widget/spin-slider.h @@ -41,13 +41,14 @@ public: #if WITH_GTKMM_3_0 const Glib::RefPtr<Gtk::Adjustment> get_adjustment() const; Glib::RefPtr<Gtk::Adjustment> get_adjustment(); + const Gtk::Scale& get_scale() const; + Gtk::Scale& get_scale(); #else const Gtk::Adjustment& get_adjustment() const; Gtk::Adjustment& get_adjustment(); -#endif - const Gtk::HScale& get_scale() const; Gtk::HScale& get_scale(); +#endif const Inkscape::UI::Widget::SpinButton& get_spin_button() const; Inkscape::UI::Widget::SpinButton& get_spin_button(); @@ -57,10 +58,11 @@ public: private: #if WITH_GTKMM_3_0 Glib::RefPtr<Gtk::Adjustment> _adjustment; + Gtk::Scale _scale; #else Gtk::Adjustment _adjustment; -#endif Gtk::HScale _scale; +#endif Inkscape::UI::Widget::SpinButton _spin; }; diff --git a/src/ui/widget/tolerance-slider.cpp b/src/ui/widget/tolerance-slider.cpp index 16558f0ee..f92a08d0a 100644 --- a/src/ui/widget/tolerance-slider.cpp +++ b/src/ui/widget/tolerance-slider.cpp @@ -73,8 +73,15 @@ void ToleranceSlider::init (const Glib::ustring& label1, const Glib::ustring& la theLabel1->set_use_underline(); theLabel1->set_alignment(0, 0.5); // align the label with the checkbox text above by indenting 22 px. - _hbox->pack_start(*theLabel1, Gtk::PACK_EXPAND_WIDGET, 22); + _hbox->pack_start(*theLabel1, Gtk::PACK_EXPAND_WIDGET, 22); + +#if WITH_GTKMM_3_0 + _hscale = manage(new Gtk::Scale(Gtk::ORIENTATION_HORIZONTAL)); + _hscale->set_range(1.0, 51.0); +#else _hscale = manage (new Gtk::HScale (1.0, 51, 1.0)); +#endif + theLabel1->set_mnemonic_widget (*_hscale); _hscale->set_draw_value (true); _hscale->set_value_pos (Gtk::POS_RIGHT); diff --git a/src/ui/widget/tolerance-slider.h b/src/ui/widget/tolerance-slider.h index d0b78e3c1..2184cd52b 100644 --- a/src/ui/widget/tolerance-slider.h +++ b/src/ui/widget/tolerance-slider.h @@ -13,7 +13,12 @@ #include <gtkmm/radiobuttongroup.h> namespace Gtk { - class RadioButton; +class RadioButton; +#if WITH_GTKMM_3_0 +class Scale; +#else +class HScale; +#endif } namespace Inkscape { @@ -55,7 +60,13 @@ protected: void on_toggled(); void update (double val); Gtk::HBox *_hbox; + +#if WITH_GTKMM_3_0 + Gtk::Scale *_hscale; +#else Gtk::HScale *_hscale; +#endif + Gtk::RadioButtonGroup _radio_button_group; Gtk::RadioButton *_button1; Gtk::RadioButton *_button2; diff --git a/src/verbs.cpp b/src/verbs.cpp index bbadb1a25..cdeeab99a 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -89,10 +89,6 @@ using Inkscape::DocumentUndo; using Inkscape::UI::Dialog::ActionAlign; -//#ifdef WITH_INKBOARD -//#include "jabber_whiteboard/session-manager.h" -//#endif - /** * Return the name without underscores and ellipsis, for use in dialog * titles, etc. Allocated memory must be freed by caller. @@ -1972,13 +1968,6 @@ void DialogVerb::perform(SPAction *action, void *data) //sp_item_dialog(); dt->_dlg_mgr->showDialog("ObjectProperties"); break; -/*#ifdef WITH_INKBOARD - case SP_VERB_XMPP_CLIENT: - { - Inkscape::Whiteboard::SessionManager::showClient(); - break; - } -#endif*/ case SP_VERB_DIALOG_INPUT: dt->_dlg_mgr->showDialog("InputDevices"); break; @@ -2796,10 +2785,6 @@ Verb *Verb::_base_verbs[] = { N_("Edit the object attributes..."), INKSCAPE_ICON("dialog-object-attributes")), new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."), N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON("dialog-object-properties")), -/*#ifdef WITH_INKBOARD - new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient", - N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL), -#endif*/ new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."), N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON("dialog-input-devices")), new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."), diff --git a/src/verbs.h b/src/verbs.h index c4a7b67e0..dab524d7a 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -282,9 +282,6 @@ enum { SP_VERB_DIALOG_CLONETILER, SP_VERB_DIALOG_ATTR, SP_VERB_DIALOG_ITEM, -/*#ifdef WITH_INKBOARD - SP_VERB_XMPP_CLIENT, -#endif*/ SP_VERB_DIALOG_INPUT, SP_VERB_DIALOG_EXTENSIONEDITOR, SP_VERB_DIALOG_LAYERS, diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 9e078cabb..b0d8d974e 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -82,11 +82,6 @@ using Inkscape::UI::UXManager; using Inkscape::UI::ToolboxFactory; using ege::AppearTimeTracker; -#ifdef WITH_INKBOARD -#endif - - - enum { ACTIVATE, DEACTIVATE, @@ -775,6 +770,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..453ef683f 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -8,10 +8,11 @@ * Lauris Kaplinski <lauris@kaplinski.com> * bulia byak <buliabyak@users.sf.net> * Johan Engelen <j.b.c.engelen@ewi.utwente.nl> + * Tavmjong Bah <tavmjong@free.fr> * * Copyright (C) 1999-2001 Ximian, Inc. * Copyright (C) 2002 Lauris Kaplinski - * Copyright (C) -2007 Authors + * Copyright (C) -2013 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -51,11 +52,9 @@ struct SPFontSelector NRNameList families; NRStyleList styles; - int familyidx; - int styleidx; gfloat fontsize; bool fontsize_dirty; - font_instance *font; + Glib::ustring *fontspec; }; @@ -63,7 +62,7 @@ struct SPFontSelectorClass { GtkHBoxClass parent_class; - void (* font_set) (SPFontSelector *fsel, font_instance *font); + void (* font_set) (SPFontSelector *fsel, gchar *fontspec); }; enum { @@ -138,6 +137,9 @@ static void sp_font_selector_set_size_tooltip(SPFontSelector *fsel) } +/* + * Create a widget with children for selecting font-family, font-style, and font-size. + */ static void sp_font_selector_init(SPFontSelector *fsel) { gtk_box_set_homogeneous(GTK_BOX(fsel), TRUE); @@ -155,8 +157,6 @@ static void sp_font_selector_init(SPFontSelector *fsel) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); gtk_container_add(GTK_CONTAINER(f), sw); - Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); - fsel->family_treeview = gtk_tree_view_new (); GtkTreeViewColumn *column = gtk_tree_view_column_new (); GtkCellRenderer *cell = gtk_cell_renderer_text_new (); @@ -177,6 +177,7 @@ static void sp_font_selector_init(SPFontSelector *fsel) "widget \"*font_selector_family\" style \"fontfamily-separator-style\""); + Inkscape::FontLister* fontlister = Inkscape::FontLister::get_instance(); Glib::RefPtr<Gtk::ListStore> store = fontlister->get_font_list(); gtk_tree_view_set_model (GTK_TREE_VIEW(fsel->family_treeview), GTK_TREE_MODEL (Glib::unwrap (store))); gtk_container_add(GTK_CONTAINER(sw), fsel->family_treeview); @@ -231,6 +232,7 @@ static void sp_font_selector_init(SPFontSelector *fsel) gtk_widget_show(hb); gtk_box_pack_start(GTK_BOX(vb), hb, FALSE, FALSE, 0); + // Font-size fsel->size = gtk_combo_box_text_new_with_entry (); sp_font_selector_set_size_tooltip(fsel); @@ -246,20 +248,20 @@ static void sp_font_selector_init(SPFontSelector *fsel) gtk_widget_show_all (fsel->size); - fsel->familyidx = 0; - fsel->styleidx = 0; - fsel->fontsize = 10.0; + // Set default size... next two lines must match + gtk_entry_set_text(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(fsel->size))), "18.0"); + fsel->fontsize = 18.0; fsel->fontsize_dirty = false; - fsel->font = NULL; + + fsel->fontspec = new Glib::ustring; } static void sp_font_selector_dispose(GObject *object) { SPFontSelector *fsel = SP_FONT_SELECTOR (object); - if (fsel->font) { - fsel->font->Unref(); - fsel->font = NULL; + if (fsel->fontspec) { + delete fsel->fontspec; } if (fsel->families.length > 0) { @@ -277,49 +279,62 @@ static void sp_font_selector_dispose(GObject *object) } } +// Callback when family changed, updates style list for new family. static void sp_font_selector_family_select_row(GtkTreeSelection *selection, SPFontSelector *fsel) { - GtkTreeIter iter; - GtkTreeModel *model; - GtkListStore *store; - GtkTreePath *path; - GList *list=0; + // We need our own copy of the style list store since the font-family + // may not be the same in the font-selector as stored in the font-lister + // TODO: use font-lister class for this by modifying new_font_family to accept an optional style list + // TODO: add store to SPFontSelector struct and reuse. + + // Start by getting iterator to selected font + GtkTreeModel *model; + GtkTreeIter iter; if (!gtk_tree_selection_get_selected (selection, &model, &iter)) return; - 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; + // Next get family name with its style list + gchar *family; + GList *list=0; + gtk_tree_model_get (model, &iter, 0, &family, 1, &list, -1); - store = gtk_list_store_new (1, G_TYPE_STRING); + // Find best style match for selected family with current style (e.g. of selected text). + Inkscape::FontLister *fontlister = Inkscape::FontLister::get_instance(); + Glib::ustring style = fontlister->get_font_style(); + Glib::ustring best = fontlister->get_best_style_match (family, style); + // Create our own store of styles for selected font-family and find index of best style match + int path_index = 0; + int index = 0; + GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING); // Where is this deleted? for ( ; list ; list = list->next ) { gtk_list_store_append (store, &iter); - gtk_list_store_set (store, &iter, 0, static_cast<char*>(list->data), -1); + gtk_list_store_set (store, &iter, 0, (char*)list->data, -1); + + if( best.compare( (char*)list->data ) == 0 ) { + path_index = index; + } + ++index; } + // Attach store to tree view. Can trigger style changed signal (but not FONT_SET): gtk_tree_view_set_model (GTK_TREE_VIEW (fsel->style_treeview), GTK_TREE_MODEL (store)); - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, 0); + + // Get path to best style + GtkTreePath *path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, path_index); + + // Highlight best style. Triggers style changed signal: gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->style_treeview)), path); gtk_tree_path_free (path); } +// Callback when row changed static void sp_font_selector_style_select_row (GtkTreeSelection *selection, SPFontSelector *fsel) { - GtkTreeModel *model; - GtkTreePath *path; - GtkTreeIter iter; - - 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) { sp_font_selector_emit_set (fsel); @@ -329,6 +344,7 @@ static void sp_font_selector_style_select_row (GtkTreeSelection *selection, /* * Set the default list of font sizes, scaled to the users preferred unit + * TODO: This routine occurs both here and in text-toolbar. Move to font-lister? */ static void sp_font_selector_set_sizes( SPFontSelector *fsel ) { @@ -355,6 +371,7 @@ static void sp_font_selector_set_sizes( SPFontSelector *fsel ) } +// Callback when size changed static void sp_font_selector_size_changed( GtkComboBox */*cbox*/, SPFontSelector *fsel ) { char *text = NULL; @@ -388,9 +405,13 @@ static void sp_font_selector_size_changed( GtkComboBox */*cbox*/, SPFontSelector sp_font_selector_emit_set (fsel); } + +// Called from sp_font_selector_style_select_row +// Called from sp_font_selector_size_changed +// Called indirectly for sp_font_selector_family_select_row (since style changes). +// Emits FONT_SET signal (handled by TextEdit::onFontChange, GlyphsPanel::fontChangeCB). static void sp_font_selector_emit_set (SPFontSelector *fsel) { - font_instance *font; GtkTreeSelection *selection_family; GtkTreeSelection *selection_style; @@ -405,41 +426,27 @@ static void sp_font_selector_emit_set (SPFontSelector *fsel) model_family = gtk_tree_view_get_model (GTK_TREE_VIEW (fsel->family_treeview)); if (!model_family) return; - model_style = gtk_tree_view_get_model (GTK_TREE_VIEW (fsel->style_treeview)); - if (!model_style) return; + model_style = gtk_tree_view_get_model (GTK_TREE_VIEW (fsel->style_treeview)); + if (!model_style ) return; selection_family = gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->family_treeview)); - selection_style = gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->style_treeview)); + selection_style = gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->style_treeview )); if (!gtk_tree_selection_get_selected (selection_family, NULL, &iter_family)) return; - if (!gtk_tree_selection_get_selected (selection_style, NULL, &iter_style)) return; + if (!gtk_tree_selection_get_selected (selection_style, NULL, &iter_style )) return; gtk_tree_model_get (model_family, &iter_family, 0, &family, -1); - gtk_tree_model_get (model_style, &iter_style, 0, &style, -1); + gtk_tree_model_get (model_style, &iter_style, 0, &style, -1); if ((!family) || (!style)) return; - font = (font_factory::Default())->FaceFromUIStrings (family, style); + Glib::ustring fontspec = family; + fontspec += ", "; + fontspec += style; - // FIXME: when a text object uses non-available font, font==NULL and we can't set size - // (and the size shown in the widget is invalid). To fix, here we must always get some - // default font, exactly the same as sptext uses for on-canvas display, so that - // font!=NULL ever. - if (font != fsel->font || ( font && fsel->fontsize_dirty ) ) { - if ( font ) { - font->Ref(); - } - if ( fsel->font ) { - fsel->font->Unref(); - } - fsel->font = font; - g_signal_emit(fsel, fs_signals[FONT_SET], 0, fsel->font); - } - fsel->fontsize_dirty = false; - if (font) { - font->Unref(); - } - font = NULL; + *(fsel->fontspec) = fontspec; + + g_signal_emit(fsel, fs_signals[FONT_SET], 0, fontspec.c_str()); } GtkWidget *sp_font_selector_new() @@ -449,116 +456,53 @@ GtkWidget *sp_font_selector_new() return GTK_WIDGET(fsel); } + /* - * Returns the index of the fonts closest style match from the provided list of styles - * Used in both the Text dialog and the Text toolbar to set the style combo on selection change + * Sets the values displayed in the font-selector from a fontspec. + * It is only called from TextEdit with a new selection and from GlyphsPanel */ -unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list) +void sp_font_selector_set_fontspec (SPFontSelector *fsel, Glib::ustring fontspec, double size) { - if ( !font || !list) { - return 0; - } - - font_instance *tempFont = NULL; - unsigned int currentStyleNumber = 0; - unsigned int bestStyleNumber = 0; - - Glib::ustring family = font_factory::Default()->GetUIFamilyString(font->descr); - - PangoFontDescription *incomingFont = pango_font_description_copy(font->descr); - pango_font_description_unset_fields(incomingFont, PANGO_FONT_MASK_SIZE); - - char *incomingFontString = pango_font_description_to_string(incomingFont); - - tempFont = (font_factory::Default())->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data)); - - PangoFontDescription *bestMatchForFont = NULL; - if (tempFont) { - bestMatchForFont = pango_font_description_copy(tempFont->descr); - tempFont->Unref(); - tempFont = NULL; - } - - if( bestMatchForFont != NULL ) { - pango_font_description_unset_fields(bestMatchForFont, PANGO_FONT_MASK_SIZE); - } - - list = list->next; - - while (list) { - currentStyleNumber++; - - tempFont = font_factory::Default()->FaceFromUIStrings(family.c_str(), static_cast<char*>(list->data)); - - PangoFontDescription *currentMatchForFont = NULL; - if (tempFont) { - currentMatchForFont = pango_font_description_copy(tempFont->descr); - tempFont->Unref(); - tempFont = NULL; - } - - if (currentMatchForFont) { - pango_font_description_unset_fields(currentMatchForFont, PANGO_FONT_MASK_SIZE); - - char *currentMatchString = pango_font_description_to_string(currentMatchForFont); - - if (!strcmp(incomingFontString, currentMatchString) - || pango_font_description_better_match(incomingFont, bestMatchForFont, currentMatchForFont)) { - // Found a better match for the font we are looking for - pango_font_description_free(bestMatchForFont); - bestMatchForFont = pango_font_description_copy(currentMatchForFont); - bestStyleNumber = currentStyleNumber; - } - - g_free(currentMatchString); - - pango_font_description_free(currentMatchForFont); - } - - list = list->next; - } - - if (bestMatchForFont) - pango_font_description_free(bestMatchForFont); - if (incomingFont) - pango_font_description_free(incomingFont); - g_free(incomingFontString); + if (!fontspec.empty()) + { - return bestStyleNumber; -} + Inkscape::FontLister *font_lister = Inkscape::FontLister::get_instance(); + std::pair<Glib::ustring, Glib::ustring> ui = font_lister->ui_from_fontspec( fontspec ); + Glib::ustring family = ui.first; + Glib::ustring style = ui.second; -void sp_font_selector_set_font (SPFontSelector *fsel, font_instance *font, double size) -{ - if (font) - { Gtk::TreePath path; - - Glib::ustring family = font_factory::Default()->GetUIFamilyString(font->descr); - try { - path = Inkscape::FontLister::get_instance()->get_row_for_font (family); + path = font_lister->get_row_for_font (family); } catch (...) { + g_warning( "Couldn't find row for font-family: %s", family.c_str() ); return; } + // High light selected family and scroll so it is in view. fsel->block_emit = TRUE; gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->family_treeview)), path.gobj()); gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fsel->family_treeview), path.gobj(), NULL, TRUE, 0.5, 0.5); - fsel->block_emit = FALSE; + fsel->block_emit = FALSE; // TODO: Should this be moved to the end? - GList *list = 0; - GtkTreeIter iter; - GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW(fsel->family_treeview)); - gtk_tree_model_get_iter (model, &iter, path.gobj()); - gtk_tree_model_get (model, &iter, 1, &list, -1); - unsigned int bestStyleNumber = sp_font_selector_get_best_style(font, list); + // We don't need to get best style since this is only called on a new + // selection where we already know the "best" style. + // Glib::ustring bestStyle = font_lister->get_best_style_match (family, style); + // std::cout << "Best: " << bestStyle << std::endl; + + // The "trial" style list and the regular list are the same in this case. + Gtk::TreePath path_c; + try { + path_c = font_lister->get_row_for_style( style ); + } catch (...) { + g_warning( "Couldn't find row for style: %s (%s)", style.c_str(), family.c_str() ); + return; + } + + gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->style_treeview)), path_c.gobj()); + gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fsel->style_treeview), path_c.gobj(), NULL, TRUE, 0.5, 0.5); - GtkTreePath *path_c = gtk_tree_path_new (); - gtk_tree_path_append_index (path_c, bestStyleNumber); - gtk_tree_selection_select_path (gtk_tree_view_get_selection (GTK_TREE_VIEW (fsel->style_treeview)), path_c); - gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (fsel->style_treeview), path_c, NULL, TRUE, 0.5, 0.5); - if (size != fsel->fontsize) { gchar s[8]; @@ -572,13 +516,9 @@ void sp_font_selector_set_font (SPFontSelector *fsel, font_instance *font, doubl } -font_instance* sp_font_selector_get_font(SPFontSelector *fsel) +Glib::ustring sp_font_selector_get_fontspec(SPFontSelector *fsel) { - if (fsel->font) { - fsel->font->Ref(); - } - - return fsel->font; + return *(fsel->fontspec); } /* diff --git a/src/widgets/font-selector.h b/src/widgets/font-selector.h index 80e8b1e4d..66715f048 100644 --- a/src/widgets/font-selector.h +++ b/src/widgets/font-selector.h @@ -7,9 +7,11 @@ * Authors: * Chris Lahey <clahey@ximian.com> * Lauris Kaplinski <lauris@kaplinski.com> + * Tavmjong Bah <tavmjong@free.fr> * * Copyright (C) 1999-2001 Ximian, Inc. * Copyright (C) 2002 Lauris Kaplinski + * Copyright (C) 1999-2013 Authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -22,7 +24,24 @@ struct SPFontSelector; #define SP_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), SP_TYPE_FONT_SELECTOR, SPFontSelector)) #define SP_IS_FONT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), SP_TYPE_FONT_SELECTOR)) -class font_instance; +/* + * The routines here create and manage a font selector widget with three parts, + * one each for font-family, font-style, and font-size. + * + * It is used by the TextEdit and Glyphs panel dialogs. The FontLister class is used + * to access the list of font-families and their associated styles for fonts either + * on the system or in the document. The FontLister class is also used by the Text + * toolbar. Fonts are kept track of by their "fontspecs" which are the same as the + * strings that Pango generates. + * + * The main functions are: + * Create the font-seletor widget. + * Update the lists when a new text selection is made. + * Update the Style list when a new font-family is selected, highlighting the + * best match to the original font style (as not all fonts have the same style options). + * Emit a signal when any change is made so that the Text Preview can be updated. + * Provide the currently selected values. + */ /* SPFontSelector */ @@ -30,13 +49,11 @@ GType sp_font_selector_get_type (void); GtkWidget *sp_font_selector_new (void); -void sp_font_selector_set_font (SPFontSelector *fsel, font_instance *font, double size); +void sp_font_selector_set_fontspec (SPFontSelector *fsel, Glib::ustring fontspec, double size); +Glib::ustring sp_font_selector_get_fontspec (SPFontSelector *fsel); -font_instance *sp_font_selector_get_font (SPFontSelector *fsel); double sp_font_selector_get_size (SPFontSelector *fsel); -unsigned int sp_font_selector_get_best_style (font_instance *font, GList *list); - #endif // SP_FONT_SELECTOR_H /* 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..ef7d31d76 100644 --- a/src/widgets/text-toolbar.cpp +++ b/src/widgets/text-toolbar.cpp @@ -18,8 +18,8 @@ * * Copyright (C) 2004 David Turner * Copyright (C) 2003 MenTaLguY - * Copyright (C) 1999-2013 authors * Copyright (C) 2001-2002 Ximian, Inc. + * Copyright (C) 1999-2013 authors * * Released under GNU GPL, read the file 'COPYING' for more information */ @@ -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->fill_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(); - } - } - - SPCSSAttr *css = sp_repr_css_attr_new (); + fontlister->set_font_style( new_style ); + // active text set in sp_text_toolbox_seletion_changed() - Glib::ustring current_style = ink_comboboxentry_action_get_active_text( act ); - Glib::ustring fontFamily = ""; - - 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 ); - } - - 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); - } + SPCSSAttr *css = sp_repr_css_attr_new (); + fontlister->fill_css( css ); - sp_style_unref(query); + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + sp_desktop_set_style (desktop, css, true, true); + sp_repr_css_attr_unref (css); - // 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")); + DocumentUndo::done(sp_desktop_document(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) ); |